Reset develop files (readme, config, oas) to main branch version for resolving merge conflicts #256
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…resolving merge conflicts Fixes #255
kmohr-soprasteria
added a commit
that referenced
this pull request
Oct 30, 2024
… again trying to merge latest changes (#257) * Create .gitignore file * Generate server stub Fixes Generate server side stub #69 * Changes to be committed: modified: server/index.js * Fixed indent yaml openapi file * Integrate Configuration File Fixes #72 * Integrate Application Pattern Package Fixes #75 * Integrate Logging Application Fixes #77 * Integrate Basic Service Fixes #79 * Realign develop branch Fixes #83 * Implement OAM Services Fixes #85 * modified: server/database/load.json modified: server/index.js new file: server/service/individualServices/ElasticsearchPreparation.js * Implement service /v1/provide-mac-table-of-specific-device Fixes #102 * Implement service /v1/provide-mac-table-of-all-devices Fixes #89 * Implement service /v1/provide-list-of-network-element-interfaces-on-path Fixes #104 * Modified services /v1/provide-mac-table-of-all-devices, /v1/provide-mac-table-of-specific-device and /v1/provide-list-of-network-element-interfaces-on-path * Implement callback PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi Fixes #93 * Implement callback PromptForUpdatingMacTableFromDeviceCausesWritingIntoElasticSearch Fixes #96 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesMacTableBeingRetrievedFromDevice Fixes #94 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingAllMacTablesCausesReadingFromElasticSearch Fixes #98 * Implement callback RequestForListOfNetworkElementInterfacesOnPathCausesReadingFromElasticSearch Fixes #100 * refactor /v1/read-current-mac-table-from-device * Fix validation problem on vlanId (must be an integer) * Implement service /v1/read-current-mac-table-from-device Fixes #103 * added docker files * Implement callback EmbeddingCausesRequestForListOfDevicesAtMwdi Fixes #91 and fix load.json path * Fix load.json Path in index Fixes #128 * Fix load.json Path in index Fixes #128 * Implement service to update list of connected devices into elastic search Fixes #131 * add check on readmacaddress * add cutomError * Implement callback EmbeddingCausesCyclicRequestsForUpdatingMacTableFromDeviceAtMatr Fixes #92 * Client name for PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi in Forwarding file.yaml Fixes #138 * FIX "logical-termination-point": "matr-1-0-0-http-c-odl-4-0-2-000" in MacAddressTableRecorder+config.yaml Fixes #140 * Modified original-ltp-name (fake) in original-ltp-name (correct) Fixes #142 * Fix Lint error Fixes #145 * Add original_ltp_name in MacAddressTableRecorder+config.json Fixes #147 and removed load.json from tracked files * Replace Timestamp value with a meaningfull value Fixes #144 * Detail error log Fixes #150 * Fix ElasticSerch error when mountName-list is not present Fixes #152 * Wrong response for service request /v1/provide-mac-table-of-specific-device Fixes #154 * Implement callback EmbeddingCausesRequestForListOfApplicationsAtRo Fixes #90 * Fix Elastic Search error in findNotConnectedElements Fixes #157 * Change operation-name for "uuid": "matr-1-0-0-op-c-is-mwdi-1-0-0-002" Fixes #159 * Add load.json (fake value) Fixes #161 * Return value of /v1/provide-list-of-connected-devices Fixes #163 * Remove comment to performApplicationRegistration Fixes #165 * Error on MATR after first release SIAE version 1.0.0 Fixes #167 * Change mountName-list to mount-name-list in elasticSearch (for MATR application, not only for MIDW) Fixes #168 * Use field "operation-key" in load.json to store authentication data Fixes #171 * Remove pattern "target-mac-address-" from /v1/provide-list-of-network-element-interfaces-on-path response Fixes #173 * Implement service /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #105 * Fix order of parameters for /v1/provide-list-of-connected-devices Fixes #177 * Remove verbose log Fixes #179 * Failed to read response provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #181 * target-mac-address field value is case sensitive for MATR APIs Fixes #184 * To enable Security in the service and OAM layer Fixes #186 * If the list of devices is empty, wait a certain amount of time before asking again. Fixes #190 * Observing error 500 on MATR for the device MAC address table which is empty Fixes #189 * Time period for the synchronization of the MATR cycle Fixes #193 * Add key to auth field in load.json file Fixes #195 * Fix index getAlias Fixes #198 * In tag test_v1.0.4, unable to connect because of configuration is incomplete in load.json Fixes #200 * macAddressData received output on requestor-receive-operation for API:/v1/receive-requested-mac-address-table is not valid Fixes #185 * Remove /v1/test-mac-address-data api from MATR API Fixes #204 * MATR is getting continuously restarted after MWDI new version is deployed * MATR is getting continuously restarted after MWDI new version is deployed Fixes #206 * Observing 500 error with API : http://xx:xx/v1/provide-list-of-network-element-interfaces-on-path Fixes #209 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * "egress-ltp-uuid" is not required as per specification in API:/v1/provide-list-of-network-element-interfaces-on-path response * Observing 500 error while writing entry to ELK Fixes #216 * ELK count not incrementing automatically * ELK count not incrementing automatically Fixes #217 * add refresh function * Unable to retrieve all data using API:/provided-mac-table-of-all-devices Fixes #231 * Specification error found in callback of /v1/read-current-mac-table-from-device for sending answer to requestor Fixes #226 * diagram * Add completeness simu and vali * Kmohr-soprasteria/issue240 (#241) * Update MATR spec to use new AppPattern release Fixes #240 * Kmohr-soprasteria/issue243 (#244) * corrections according to feedback from PR #242 * Update MacAddressTableRecorder+config.json (#247) not yet merged to main official release 1-0-2_spec, but provides a fix for the "," missing there * Correct wrong ro uuids in configFile (#249) Fixes #248 * Update README.md (#251) update readme for v.1.0.2_Spec * Correct releaseNumbers in configFile for v1.2.0 (#253) Fixes #252 * Reset develop files (readme, config, oas) to main branch version for resolving merge conflicts (#256) Fixes #255 --------- Co-authored-by: Valentina Schiavi <[email protected]> Co-authored-by: schiavi-siae <[email protected]> Co-authored-by: salgarello-siae <[email protected]> Co-authored-by: openBackhaul <[email protected]>
kmohr-soprasteria
added a commit
that referenced
this pull request
Oct 30, 2024
* Merge v1.0.2_spec: update to new ApplicationPattern release 2.1.2 (after issue fix) (#245) * Create .gitignore file * Generate server stub Fixes Generate server side stub #69 * Changes to be committed: modified: server/index.js * Fixed indent yaml openapi file * Integrate Configuration File Fixes #72 * Integrate Application Pattern Package Fixes #75 * Integrate Logging Application Fixes #77 * Integrate Basic Service Fixes #79 * Realign develop branch Fixes #83 * Implement OAM Services Fixes #85 * modified: server/database/load.json modified: server/index.js new file: server/service/individualServices/ElasticsearchPreparation.js * Implement service /v1/provide-mac-table-of-specific-device Fixes #102 * Implement service /v1/provide-mac-table-of-all-devices Fixes #89 * Implement service /v1/provide-list-of-network-element-interfaces-on-path Fixes #104 * Modified services /v1/provide-mac-table-of-all-devices, /v1/provide-mac-table-of-specific-device and /v1/provide-list-of-network-element-interfaces-on-path * Implement callback PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi Fixes #93 * Implement callback PromptForUpdatingMacTableFromDeviceCausesWritingIntoElasticSearch Fixes #96 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesMacTableBeingRetrievedFromDevice Fixes #94 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingAllMacTablesCausesReadingFromElasticSearch Fixes #98 * Implement callback RequestForListOfNetworkElementInterfacesOnPathCausesReadingFromElasticSearch Fixes #100 * refactor /v1/read-current-mac-table-from-device * Fix validation problem on vlanId (must be an integer) * Implement service /v1/read-current-mac-table-from-device Fixes #103 * added docker files * Implement callback EmbeddingCausesRequestForListOfDevicesAtMwdi Fixes #91 and fix load.json path * Fix load.json Path in index Fixes #128 * Fix load.json Path in index Fixes #128 * Implement service to update list of connected devices into elastic search Fixes #131 * add check on readmacaddress * add cutomError * Implement callback EmbeddingCausesCyclicRequestsForUpdatingMacTableFromDeviceAtMatr Fixes #92 * Client name for PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi in Forwarding file.yaml Fixes #138 * FIX "logical-termination-point": "matr-1-0-0-http-c-odl-4-0-2-000" in MacAddressTableRecorder+config.yaml Fixes #140 * Modified original-ltp-name (fake) in original-ltp-name (correct) Fixes #142 * Fix Lint error Fixes #145 * Add original_ltp_name in MacAddressTableRecorder+config.json Fixes #147 and removed load.json from tracked files * Replace Timestamp value with a meaningfull value Fixes #144 * Detail error log Fixes #150 * Fix ElasticSerch error when mountName-list is not present Fixes #152 * Wrong response for service request /v1/provide-mac-table-of-specific-device Fixes #154 * Implement callback EmbeddingCausesRequestForListOfApplicationsAtRo Fixes #90 * Fix Elastic Search error in findNotConnectedElements Fixes #157 * Change operation-name for "uuid": "matr-1-0-0-op-c-is-mwdi-1-0-0-002" Fixes #159 * Add load.json (fake value) Fixes #161 * Return value of /v1/provide-list-of-connected-devices Fixes #163 * Remove comment to performApplicationRegistration Fixes #165 * Error on MATR after first release SIAE version 1.0.0 Fixes #167 * Change mountName-list to mount-name-list in elasticSearch (for MATR application, not only for MIDW) Fixes #168 * Use field "operation-key" in load.json to store authentication data Fixes #171 * Remove pattern "target-mac-address-" from /v1/provide-list-of-network-element-interfaces-on-path response Fixes #173 * Implement service /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #105 * Fix order of parameters for /v1/provide-list-of-connected-devices Fixes #177 * Remove verbose log Fixes #179 * Failed to read response provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #181 * target-mac-address field value is case sensitive for MATR APIs Fixes #184 * To enable Security in the service and OAM layer Fixes #186 * If the list of devices is empty, wait a certain amount of time before asking again. Fixes #190 * Observing error 500 on MATR for the device MAC address table which is empty Fixes #189 * Time period for the synchronization of the MATR cycle Fixes #193 * Add key to auth field in load.json file Fixes #195 * Fix index getAlias Fixes #198 * In tag test_v1.0.4, unable to connect because of configuration is incomplete in load.json Fixes #200 * macAddressData received output on requestor-receive-operation for API:/v1/receive-requested-mac-address-table is not valid Fixes #185 * Remove /v1/test-mac-address-data api from MATR API Fixes #204 * MATR is getting continuously restarted after MWDI new version is deployed * MATR is getting continuously restarted after MWDI new version is deployed Fixes #206 * Observing 500 error with API : http://xx:xx/v1/provide-list-of-network-element-interfaces-on-path Fixes #209 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * "egress-ltp-uuid" is not required as per specification in API:/v1/provide-list-of-network-element-interfaces-on-path response * Observing 500 error while writing entry to ELK Fixes #216 * ELK count not incrementing automatically * ELK count not incrementing automatically Fixes #217 * add refresh function * Unable to retrieve all data using API:/provided-mac-table-of-all-devices Fixes #231 * Specification error found in callback of /v1/read-current-mac-table-from-device for sending answer to requestor Fixes #226 * diagram * Add completeness simu and vali * Kmohr-soprasteria/issue240 (#241) * Update MATR spec to use new AppPattern release Fixes #240 * Kmohr-soprasteria/issue243 (#244) * corrections according to feedback from PR #242 --------- Co-authored-by: Valentina Schiavi <[email protected]> Co-authored-by: schiavi-siae <[email protected]> Co-authored-by: salgarello-siae <[email protected]> Co-authored-by: openBackhaul <[email protected]> * Merge "restored" develop branch to main to fix merge conflicts before again trying to merge latest changes (#257) * Create .gitignore file * Generate server stub Fixes Generate server side stub #69 * Changes to be committed: modified: server/index.js * Fixed indent yaml openapi file * Integrate Configuration File Fixes #72 * Integrate Application Pattern Package Fixes #75 * Integrate Logging Application Fixes #77 * Integrate Basic Service Fixes #79 * Realign develop branch Fixes #83 * Implement OAM Services Fixes #85 * modified: server/database/load.json modified: server/index.js new file: server/service/individualServices/ElasticsearchPreparation.js * Implement service /v1/provide-mac-table-of-specific-device Fixes #102 * Implement service /v1/provide-mac-table-of-all-devices Fixes #89 * Implement service /v1/provide-list-of-network-element-interfaces-on-path Fixes #104 * Modified services /v1/provide-mac-table-of-all-devices, /v1/provide-mac-table-of-specific-device and /v1/provide-list-of-network-element-interfaces-on-path * Implement callback PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi Fixes #93 * Implement callback PromptForUpdatingMacTableFromDeviceCausesWritingIntoElasticSearch Fixes #96 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesLtpUuidBeingTranslatedIntoLtpNameBasedOnMwdi Fixes #95 * Implement callback PromptForUpdatingMacTableFromDeviceCausesMacTableBeingRetrievedFromDevice Fixes #94 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingSpecificMacTableCausesReadingFromElasticSearch Fixes #99 * Implement callback PromptForProvidingAllMacTablesCausesReadingFromElasticSearch Fixes #98 * Implement callback RequestForListOfNetworkElementInterfacesOnPathCausesReadingFromElasticSearch Fixes #100 * refactor /v1/read-current-mac-table-from-device * Fix validation problem on vlanId (must be an integer) * Implement service /v1/read-current-mac-table-from-device Fixes #103 * added docker files * Implement callback EmbeddingCausesRequestForListOfDevicesAtMwdi Fixes #91 and fix load.json path * Fix load.json Path in index Fixes #128 * Fix load.json Path in index Fixes #128 * Implement service to update list of connected devices into elastic search Fixes #131 * add check on readmacaddress * add cutomError * Implement callback EmbeddingCausesCyclicRequestsForUpdatingMacTableFromDeviceAtMatr Fixes #92 * Client name for PromptForUpdatingMacTableFromDeviceCausesUuidOfMacFdBeingSearchedAndManagementMacAddressBeingReadFromMwdi in Forwarding file.yaml Fixes #138 * FIX "logical-termination-point": "matr-1-0-0-http-c-odl-4-0-2-000" in MacAddressTableRecorder+config.yaml Fixes #140 * Modified original-ltp-name (fake) in original-ltp-name (correct) Fixes #142 * Fix Lint error Fixes #145 * Add original_ltp_name in MacAddressTableRecorder+config.json Fixes #147 and removed load.json from tracked files * Replace Timestamp value with a meaningfull value Fixes #144 * Detail error log Fixes #150 * Fix ElasticSerch error when mountName-list is not present Fixes #152 * Wrong response for service request /v1/provide-mac-table-of-specific-device Fixes #154 * Implement callback EmbeddingCausesRequestForListOfApplicationsAtRo Fixes #90 * Fix Elastic Search error in findNotConnectedElements Fixes #157 * Change operation-name for "uuid": "matr-1-0-0-op-c-is-mwdi-1-0-0-002" Fixes #159 * Add load.json (fake value) Fixes #161 * Return value of /v1/provide-list-of-connected-devices Fixes #163 * Remove comment to performApplicationRegistration Fixes #165 * Error on MATR after first release SIAE version 1.0.0 Fixes #167 * Change mountName-list to mount-name-list in elasticSearch (for MATR application, not only for MIDW) Fixes #168 * Use field "operation-key" in load.json to store authentication data Fixes #171 * Remove pattern "target-mac-address-" from /v1/provide-list-of-network-element-interfaces-on-path response Fixes #173 * Implement service /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #105 * Fix order of parameters for /v1/provide-list-of-connected-devices Fixes #177 * Remove verbose log Fixes #179 * Failed to read response provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #181 * target-mac-address field value is case sensitive for MATR APIs Fixes #184 * To enable Security in the service and OAM layer Fixes #186 * If the list of devices is empty, wait a certain amount of time before asking again. Fixes #190 * Observing error 500 on MATR for the device MAC address table which is empty Fixes #189 * Time period for the synchronization of the MATR cycle Fixes #193 * Add key to auth field in load.json file Fixes #195 * Fix index getAlias Fixes #198 * In tag test_v1.0.4, unable to connect because of configuration is incomplete in load.json Fixes #200 * macAddressData received output on requestor-receive-operation for API:/v1/receive-requested-mac-address-table is not valid Fixes #185 * Remove /v1/test-mac-address-data api from MATR API Fixes #204 * MATR is getting continuously restarted after MWDI new version is deployed * MATR is getting continuously restarted after MWDI new version is deployed Fixes #206 * Observing 500 error with API : http://xx:xx/v1/provide-list-of-network-element-interfaces-on-path Fixes #209 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * Observing 500 error with API : /v1/provide-list-of-network-element-interfaces-on-path-in-generic-representation Fixes #210 * "egress-ltp-uuid" is not required as per specification in API:/v1/provide-list-of-network-element-interfaces-on-path response * Observing 500 error while writing entry to ELK Fixes #216 * ELK count not incrementing automatically * ELK count not incrementing automatically Fixes #217 * add refresh function * Unable to retrieve all data using API:/provided-mac-table-of-all-devices Fixes #231 * Specification error found in callback of /v1/read-current-mac-table-from-device for sending answer to requestor Fixes #226 * diagram * Add completeness simu and vali * Kmohr-soprasteria/issue240 (#241) * Update MATR spec to use new AppPattern release Fixes #240 * Kmohr-soprasteria/issue243 (#244) * corrections according to feedback from PR #242 * Update MacAddressTableRecorder+config.json (#247) not yet merged to main official release 1-0-2_spec, but provides a fix for the "," missing there * Correct wrong ro uuids in configFile (#249) Fixes #248 * Update README.md (#251) update readme for v.1.0.2_Spec * Correct releaseNumbers in configFile for v1.2.0 (#253) Fixes #252 * Reset develop files (readme, config, oas) to main branch version for resolving merge conflicts (#256) Fixes #255 --------- Co-authored-by: Valentina Schiavi <[email protected]> Co-authored-by: schiavi-siae <[email protected]> Co-authored-by: salgarello-siae <[email protected]> Co-authored-by: openBackhaul <[email protected]> --------- Co-authored-by: Thorsten Heinze <[email protected]> Co-authored-by: Valentina Schiavi <[email protected]> Co-authored-by: schiavi-siae <[email protected]> Co-authored-by: salgarello-siae <[email protected]> Co-authored-by: openBackhaul <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #255