From 125390ba301915c0829ad4c0b7eff0c935b6956c Mon Sep 17 00:00:00 2001 From: efiacor Date: Wed, 6 May 2020 01:14:00 +0100 Subject: [PATCH] Seperating usecase test suite dependencies # Refactoring BulkPM Dataplane test suite Signed-off-by: efiacor Change-Id: I4b2ad0dc5147e10ffc55f4ec210a29f073cd865b Issue-ID: INT-832 Signed-off-by: efiacor --- .gitignore | 1 + .../assets/A20181002.0000-1000-0015-1000_5G.xml.gz | Bin 0 -> 959 bytes .../5G-bulkpm/assets/cbs_sim/cbs-initializer.json | 95 ++++++++ .../assets/cbs_sim/cbs_mockserver.properties | 26 +++ .../5G-bulkpm/assets/dfc}/application.yaml | 0 .../5G-bulkpm/assets/dfc}/datafile_endpoints.json | 6 +- .../assets/dmaap_dr/addDefaultSubscriber.json} | 2 +- .../assets/dmaap_dr/addPmMapperSubscriber.json | 20 ++ .../5G-bulkpm/assets/dmaap_dr}/createFeed.json | 0 .../5G-bulkpm/assets/pm_mapper_certs/cert.jks | Bin 0 -> 4654 bytes .../5G-bulkpm/assets/pm_mapper_certs/jks.pass | 1 + .../5G-bulkpm/assets/pm_mapper_certs/trust.jks | Bin 0 -> 1413 bytes .../5G-bulkpm/assets/pm_mapper_certs/trust.pass | 1 + .../5G-bulkpm/composefile/docker-compose-e2e.yml | 152 +++++++++++++ .../5G-bulkpm/composefile/docker-compose-mr.yml | 77 +++++++ plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh | 119 ++++++++++ plans/usecases-5G-bulkpm/5G-bulkpm/teardown.sh | 15 ++ .../5G-bulkpm/testplan.txt | 2 +- .../config-over-netconf/cds/cds_setup.sh | 0 .../config-over-netconf/cds/docker-compose.yaml | 0 .../config-over-netconf/certs/certs.properties | 0 .../config-over-netconf/certs/keys0.zip | Bin .../config-over-netconf/sdn/docker-compose.yaml | 0 .../config-over-netconf/setup.sh | 2 +- .../config-over-netconf/teardown.sh | 0 .../config-over-netconf/test.properties | 0 .../config-over-netconf}/testplan.txt | 2 +- .../pnf-sw-upgrade/cds/cds_setup.sh | 0 .../pnf-sw-upgrade/cds/cds_teardown.sh | 0 .../pnf-sw-upgrade/cds/docker-compose.yml | 2 +- .../pnf-sw-upgrade/cds/resources/aai.cert | 0 .../cds/resources/application.properties | 0 .../cds/resources/error-messages_en.properties | 0 .../cds/resources/importCerAndStartService.sh | 0 .../pnf-sw-upgrade/sdn/certs/certs.properties | 0 .../pnf-sw-upgrade/sdn/certs/keys0.zip | Bin .../pnf-sw-upgrade/sdn/docker-compose.yml | 3 + .../pnf-sw-upgrade/sdn/sdn_setup.sh | 4 - .../pnf-sw-upgrade/sdn/sdn_teardown.sh | 0 .../pnf-sw-upgrade/setup.sh | 2 +- .../simulators/pnfsim/docker-compose.yml | 6 +- .../simulators/pnfsim/pnf-sw-upgrade/LICENSE | 0 .../pnfsim/pnf-sw-upgrade/pnf-sw-upgrade.yang} | 2 +- .../simulators/pnfsim/pnf-sw-upgrade/startup.xml} | 2 +- .../simulators/pnfsim/pnf-sw-upgrade/subscriber.py | 119 +++++----- .../cloud-esr-system-info.json | 0 .../aai-simulator-populate-data/cloud-region.json | 0 .../aai-simulator-populate-data/customer.json | 0 .../esr-system-info.json | 0 .../aai-simulator-populate-data/esr-vnfm.json | 0 .../line-of-business.json | 0 .../aai-simulator-populate-data/owning-entity.json | 0 .../aai-simulator-populate-data/platform.json | 0 .../config/aai-simulator-populate-data/pnf.json | 0 .../aai-simulator-populate-data/project.json | 0 .../config/aai-simulator-populate-data/tenant.json | 0 .../sorch}/config/apply-workarounds.sh | 0 .../config/certificates/aai-certificate/aai.cert | 0 .../distribution-test-zip/zipped_sdc_csar.tar.gz | Bin .../pnf-sw-upgrade/sorch}/config/env | 2 +- .../api-handler-infra/onapheat/override.yaml | 0 .../bpmn-infra/onapheat/override.yaml | 0 .../catalog-db-adapter/onapheat/override.yaml | 0 .../request-db-adapter/onapheat/override.yaml | 0 .../sdc-controller/onapheat/override.yaml | 0 .../so-monitoring/onapheat/override.yaml | 0 .../so-vnfm-adapter/onapheat/override.yaml | 0 .../vnfm-simulator/onapheat/override.yaml | 0 .../sorch}/config/populate-aai-simulator.sh | 0 .../sorch}/config/wait-for-aai-config-job.sh | 0 .../sorch}/config/wait-for-container.sh | 0 .../sorch}/config/wait-for-workaround-job.sh | 0 .../pnf-sw-upgrade/sorch}/config/wait-for.sh | 0 .../pnf-sw-upgrade/sorch}/docker-compose.local.yml | 0 .../pnf-sw-upgrade/sorch}/docker-compose.yml | 0 .../pnf-sw-upgrade/sorch}/settings.xml | 0 .../sorch}/simulator/aai-simulator/pom.xml | 0 .../so/aaisimulator/AaiSimulatorApplication.java | 0 .../configration/ApplicationConfigration.java | 0 .../configration/WebSecurityConfigImpl.java | 0 .../controller/AaiSimulatorController.java | 0 .../controller/BusinessController.java | 0 .../controller/CloudRegionsController.java | 0 .../controller/ExternalSystemEsrController.java | 0 .../controller/GenericVnfsController.java | 0 .../controller/LinesOfBusinessController.java | 0 .../aaisimulator/controller/NodesController.java | 0 .../controller/OwningEntityController.java | 0 .../controller/PlatformController.java | 0 .../so/aaisimulator/controller/PnfsController.java | 0 .../aaisimulator/controller/ProjectController.java | 0 .../exception/InvalidRestRequestException.java | 0 .../exception/RestProcessingException.java | 0 .../so/aaisimulator/models/CloudRegionKey.java | 0 .../org/onap/so/aaisimulator/models/Format.java | 0 .../aaisimulator/models/NodeServiceInstance.java | 0 .../org/onap/so/aaisimulator/models/Results.java | 0 .../aaisimulator/service/providers/Clearable.java | 0 .../providers/CloudRegionCacheServiceProvider.java | 0 .../CloudRegionCacheServiceProviderImpl.java | 0 .../providers/CustomerCacheServiceProvider.java | 0 .../CustomerCacheServiceProviderImpl.java | 0 .../ExternalSystemCacheServiceProvider.java | 0 .../ExternalSystemCacheServiceProviderImpl.java | 0 .../providers/GenericVnfCacheServiceProvider.java | 0 .../GenericVnfCacheServiceProviderImpl.java | 0 .../service/providers/HttpRestServiceProvider.java | 0 .../providers/HttpRestServiceProviderImpl.java | 0 .../LinesOfBusinessCacheServiceProvider.java | 0 .../LinesOfBusinessCacheServiceProviderImpl.java | 0 .../providers/NodesCacheServiceProvider.java | 0 .../providers/NodesCacheServiceProviderImpl.java | 0 .../providers/OwnEntityCacheServiceProvider.java | 0 .../OwnEntityCacheServiceProviderImpl.java | 0 .../providers/PlatformCacheServiceProvider.java | 0 .../PlatformCacheServiceProviderImpl.java | 0 .../service/providers/PnfCacheServiceProvider.java | 0 .../providers/PnfCacheServiceProviderImpl.java | 0 .../providers/ProjectCacheServiceProvider.java | 0 .../providers/ProjectCacheServiceProviderImpl.java | 0 .../org/onap/so/aaisimulator/utils/CacheName.java | 0 .../org/onap/so/aaisimulator/utils/Constants.java | 0 .../so/aaisimulator/utils/HttpServiceUtils.java | 0 .../onap/so/aaisimulator/utils/RequestError.java | 0 .../so/aaisimulator/utils/RequestErrorBuilder.java | 0 .../utils/RequestErrorResponseUtils.java | 0 .../so/aaisimulator/utils/ServiceException.java | 0 .../so/aaisimulator/utils/ShallowBeanCopy.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/keystore/org.onap.so.p12 | Bin .../resources/truststore/org.onap.so.trust.jks | Bin .../controller/AaiSimulatorControllerTest.java | 0 .../controller/AbstractSpringBootTest.java | 0 .../controller/BusinessControllerTest.java | 0 .../controller/CloudRegionsControllerTest.java | 0 .../ExternalSystemEsrControllerTest.java | 0 .../controller/GenericVnfsControllerTest.java | 0 .../controller/LinesOfBusinessControllerTest.java | 0 .../controller/NodesControllerTest.java | 0 .../controller/OwningEntityControllerTest.java | 0 .../controller/PlatformControllerTest.java | 0 .../controller/PnfsControllerTest.java | 0 .../controller/ProjectControllerTest.java | 0 .../TestRestTemplateConfigration.java | 0 .../onap/so/aaisimulator/utils/TestConstants.java | 0 .../utils/TestRestTemplateService.java | 0 .../org/onap/so/aaisimulator/utils/TestUtils.java | 0 .../resources/test-data/business-customer.json | 0 .../test-data/business-project-relation-ship.json | 0 .../test/resources/test-data/business-project.json | 0 .../test-data/cloud-region-related-link.json | 0 .../src/test/resources/test-data/cloud-region.json | 0 .../test/resources/test-data/esr-system-info.json | 0 .../src/test/resources/test-data/esr-vnfm.json | 0 .../test-data/generic-vnf-orch-status-update.json | 0 .../test-data/generic-vnf-related-link.json | 0 .../test-data/generic-vnf-relationship.json | 0 .../src/test/resources/test-data/generic-vnf.json | 0 .../test-data/line-of-business-related-link.json | 0 .../test/resources/test-data/line-of-business.json | 0 .../test-data/owning-entity-relation-ship.json | 0 .../test/resources/test-data/owning-entity.json | 0 .../resources/test-data/platform-related-link.json | 0 .../src/test/resources/test-data/platform.json | 0 .../src/test/resources/test-data/pnf.json | 0 .../test/resources/test-data/relation-ship.json | 0 .../test-data/service-Instance-relationShip.json | 0 .../service-instance-orch-status-update.json | 0 .../test/resources/test-data/service-instance.json | 0 .../resources/test-data/service-subscription.json | 0 .../resources/test-data/tenant-relationship.json | 0 .../src/test/resources/test-data/tenant.json | 0 .../src/test/resources/test-data/vServer.json | 0 .../pnf-sw-upgrade/sorch}/simulator/common/pom.xml | 0 .../provider/AbstractCacheServiceProvider.java | 0 .../configuration/SimulatorSecurityConfigurer.java | 0 .../java/org/onap/so/simulator/model/User.java | 0 .../onap/so/simulator/model/UserCredentials.java | 0 .../onap/so/simulator/model/PojoClassesTest.java | 0 .../sorch}/simulator/package/docker/pom.xml | 0 .../Dockerfile.so-simulator-base-image | 0 .../Dockerfile.workaround-job-container | 0 .../configs/logging/logback-spring.xml | 0 .../main/docker/docker-files/scripts/start-app.sh | 0 .../sorch}/simulator/package/pom.xml | 0 .../pnf-sw-upgrade/sorch}/simulator/pom.xml | 0 .../pnf-sw-upgrade/sorch}/so_setup.sh | 6 +- .../pnf-sw-upgrade/sorch}/so_teardown.sh | 0 .../pnf-sw-upgrade/teardown.sh | 0 .../pnf-sw-upgrade/test.properties | 6 +- .../pnf-sw-upgrade}/testplan.txt | 2 +- plans/usecases/5G-bulkpm/README.txt | 55 ----- plans/usecases/5G-bulkpm/assets/config.json | 35 --- plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz | Bin 63 -> 0 bytes .../5G-bulkpm/composefile/docker-compose-dfc.yml | 12 -- .../5G-bulkpm/composefile/docker-compose-e2e.yml | 99 --------- .../composefile/docker-compose-pmmapper.yml | 14 -- .../5G-bulkpm/composefile/onap.docker-compose-e2e | 19 -- plans/usecases/5G-bulkpm/onap.teardown.sh | 8 - plans/usecases/5G-bulkpm/setup.sh | 239 --------------------- plans/usecases/5G-bulkpm/teardown.sh | 22 -- .../5G-bulkpm/BulkpmE2E.robot | 22 +- .../5G-bulkpm/__init__.robot | 0 .../assets/json_events/FileExistNotification.json | 2 +- .../5G-bulkpm/assets/metadata.schema.json | 0 .../5G-bulkpm/resources/JsonValidatorLibrary.py | 18 +- .../5G-bulkpm/resources/bulkpm_keywords.robot | 0 .../5G-bulkpm/resources/xNFLibrary.py | 15 +- .../config-over-netconf/__init__.robot | 0 .../config-over-netconf/config_over_netconf.robot | 69 ++++++ .../config-over-netconf/data/blueprint_archive.zip | Bin .../config-over-netconf/data/config-assign.json | 0 .../config-over-netconf/data/config-deploy.json | 0 .../config-over-netconf/data/mount.xml | 0 .../pnf-sw-upgrade/.gitignore | 0 .../pnf-sw-upgrade/__init__.robot | 0 .../pnf-sw-upgrade/data/blueprint_archive.zip | Bin .../data/distributeServiceTemplate.json | 0 .../pnf-sw-upgrade/data/mount.json | 0 .../serviceInstantiationActivationRequest.json | 0 .../data/serviceInstantiationDownloadRequest.json | 0 .../pnf-sw-upgrade/pnf-sw-upgrade.robot | 146 ++++++------- .../config-over-netconf/config_over_netconf.robot | 69 ------ 223 files changed, 762 insertions(+), 759 deletions(-) create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/A20181002.0000-1000-0015-1000_5G.xml.gz create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs-initializer.json create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs_mockserver.properties rename plans/{usecases/5G-bulkpm/assets => usecases-5G-bulkpm/5G-bulkpm/assets/dfc}/application.yaml (100%) rename plans/{usecases/5G-bulkpm/assets => usecases-5G-bulkpm/5G-bulkpm/assets/dfc}/datafile_endpoints.json (81%) rename plans/{usecases/5G-bulkpm/assets/addSubscriber.json => usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addDefaultSubscriber.json} (88%) create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addPmMapperSubscriber.json rename plans/{usecases/5G-bulkpm/assets => usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr}/createFeed.json (100%) create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/cert.jks create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/jks.pass create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/trust.jks create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/trust.pass create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-e2e.yml create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/composefile/docker-compose-mr.yml create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/setup.sh create mode 100644 plans/usecases-5G-bulkpm/5G-bulkpm/teardown.sh rename plans/{usecases => usecases-5G-bulkpm}/5G-bulkpm/testplan.txt (78%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/cds/cds_setup.sh (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/cds/docker-compose.yaml (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/certs/certs.properties (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/certs/keys0.zip (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/sdn/docker-compose.yaml (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/setup.sh (99%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/teardown.sh (100%) rename plans/{usecases => usecases-config-over-netconf}/config-over-netconf/test.properties (100%) rename plans/{usecases/pnf-sw-upgrade => usecases-config-over-netconf/config-over-netconf}/testplan.txt (67%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/cds_setup.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/cds_teardown.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/docker-compose.yml (90%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/resources/aai.cert (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/resources/application.properties (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/resources/error-messages_en.properties (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/cds/resources/importCerAndStartService.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/sdn/certs/certs.properties (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/sdn/certs/keys0.zip (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/sdn/docker-compose.yml (78%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/sdn/sdn_setup.sh (94%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/sdn/sdn_teardown.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/setup.sh (96%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/simulators/pnfsim/docker-compose.yml (67%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/LICENSE (100%) rename plans/{usecases/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/model.yang => usecases-pnf-sw-upgrade/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/pnf-sw-upgrade.yang} (99%) rename plans/{usecases/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/data.xml => usecases-pnf-sw-upgrade/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/startup.xml} (95%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py (67%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/cloud-esr-system-info.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/cloud-region.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/customer.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/esr-system-info.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/esr-vnfm.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/line-of-business.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/owning-entity.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/platform.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/pnf.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/project.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/aai-simulator-populate-data/tenant.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/apply-workarounds.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/certificates/aai-certificate/aai.cert (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/distribution-test-zip/zipped_sdc_csar.tar.gz (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/env (86%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/api-handler-infra/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/bpmn-infra/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/catalog-db-adapter/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/request-db-adapter/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/sdc-controller/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/so-monitoring/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/so-vnfm-adapter/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/override-files/vnfm-simulator/onapheat/override.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/populate-aai-simulator.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/wait-for-aai-config-job.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/wait-for-container.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/wait-for-workaround-job.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/config/wait-for.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/docker-compose.local.yml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/docker-compose.yml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/settings.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/pom.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/resources/application.yaml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/business-customer.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/business-project.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/platform.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/pnf.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/service-instance.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/tenant.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/aai-simulator/src/test/resources/test-data/vServer.json (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/pom.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/src/main/java/org/onap/so/simulator/cache/provider/AbstractCacheServiceProvider.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/src/main/java/org/onap/so/simulator/configuration/SimulatorSecurityConfigurer.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/src/main/java/org/onap/so/simulator/model/User.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/src/main/java/org/onap/so/simulator/model/UserCredentials.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/common/src/test/java/org/onap/so/simulator/model/PojoClassesTest.java (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/docker/pom.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/docker/src/main/docker/docker-files/Dockerfile.workaround-job-container (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/docker/src/main/docker/docker-files/scripts/start-app.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/package/pom.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/simulator/pom.xml (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/so_setup.sh (100%) rename plans/{usecases/pnf-sw-upgrade/so => usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch}/so_teardown.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/teardown.sh (100%) rename plans/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/test.properties (77%) rename plans/{usecases/config-over-netconf => usecases-pnf-sw-upgrade/pnf-sw-upgrade}/testplan.txt (72%) delete mode 100644 plans/usecases/5G-bulkpm/README.txt delete mode 100644 plans/usecases/5G-bulkpm/assets/config.json delete mode 100644 plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz delete mode 100644 plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml delete mode 100644 plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml delete mode 100644 plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml delete mode 100644 plans/usecases/5G-bulkpm/composefile/onap.docker-compose-e2e delete mode 100644 plans/usecases/5G-bulkpm/onap.teardown.sh delete mode 100644 plans/usecases/5G-bulkpm/setup.sh delete mode 100644 plans/usecases/5G-bulkpm/teardown.sh rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/BulkpmE2E.robot (88%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/__init__.robot (100%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/assets/json_events/FileExistNotification.json (95%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/assets/metadata.schema.json (100%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/resources/JsonValidatorLibrary.py (68%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/resources/bulkpm_keywords.robot (100%) rename tests/{usecases => usecases-5G-bulkpm}/5G-bulkpm/resources/xNFLibrary.py (60%) rename tests/{usecases => usecases-config-over-netconf}/config-over-netconf/__init__.robot (100%) create mode 100644 tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot rename tests/{usecases => usecases-config-over-netconf}/config-over-netconf/data/blueprint_archive.zip (100%) rename tests/{usecases => usecases-config-over-netconf}/config-over-netconf/data/config-assign.json (100%) rename tests/{usecases => usecases-config-over-netconf}/config-over-netconf/data/config-deploy.json (100%) rename tests/{usecases => usecases-config-over-netconf}/config-over-netconf/data/mount.xml (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/.gitignore (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/__init__.robot (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/data/blueprint_archive.zip (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/data/distributeServiceTemplate.json (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/data/mount.json (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/data/serviceInstantiationActivationRequest.json (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/data/serviceInstantiationDownloadRequest.json (100%) rename tests/{usecases => usecases-pnf-sw-upgrade}/pnf-sw-upgrade/pnf-sw-upgrade.robot (63%) delete mode 100644 tests/usecases/config-over-netconf/config_over_netconf.robot diff --git a/.gitignore b/.gitignore index 5ba8f9a3..aab016a5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .classpath .settings/ target/ +temp/ autorelease/build/*/ autorelease/dist log.html diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/A20181002.0000-1000-0015-1000_5G.xml.gz b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/A20181002.0000-1000-0015-1000_5G.xml.gz new file mode 100644 index 0000000000000000000000000000000000000000..32865fc16376cad6e412630f42c7067228fd7963 GIT binary patch literal 959 zcmV;w13>&AiwFqAxvg9T06{V^F*q?WFfuMMFfcGJF)%PNEif=KH7zkPFfd;=M=p46 zYyiDiZFAB<5dLg`MJ9eUkav=F2#%s?X9{)-I(~DGWC_u{P3}^tzuwIy7$7OF7G)@N zw|o2Cvv1jS_<9>h!X4x^OcPgB`-&();-!9=1g`jbG3nXj>(K>2)}!n`0=foZ0=v(^ z6&Y-qyrq#StaDho;uHvdM;IBWQ3M`C$UbU0K#ZzNJP9KZ5H6vvxMnQ7l;zE4)7OJ6 z>!*1juUID23_L26+*^ltAnV#U3V8?=SA9b_Up8Rk1xLEv((nLnqjM}xQB?Ws^m^{C zAtt>rp^PLRh!=SNl5*j7>XDM^8OR9FMi56AFNP}&&_^IX{fx zZvse|tCp8nx6ct4Z;voE(L20z&tRMu3Cj^ln!-3u$_j9&@5j9l%b=%9Q<9JX{Pz*W zCFJd_R$x(8q6M!Tl#4RIZ7+CB2*P9$mabshl%AsZ6m_8*mx_YlSBi$e+-fK{5h}NF zU3C@U0fV!;P+-=s$r2*&fUrQ9Fq(HEvfuOODp{qt!QJjYW6xBu;ex#;T23*LHfjA zLwU#Pc@*tqingP)DLRVUridkVOp$wdZi>z^MZ+8%Q{(|_Qyf@!XA~PDEy_nD8?n5A zpxi;wy^g(>PGGVcH=&i(`~6X#eZn_NP}umvU|8y z^(Wb%XjN-aDK(Z}KlLnGyNe=#+lCDeIDJva8 zl?U{71e|XD?_yq&h&I)HcyO<*8%0yxk4_Q&|JLoJQ^fqUF*5kOIb!|gAhG}5B(b|D ziP1Gl^sZ;1b?(P>$0V`4CW+ZKNm|2>dw6b&9h1c9nj}uwB+$z?X00141&)Wb1 literal 0 HcmV?d00001 diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs-initializer.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs-initializer.json new file mode 100644 index 00000000..e1677bab --- /dev/null +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs-initializer.json @@ -0,0 +1,95 @@ +[{ + "httpRequest":{ + "method":"GET", + "path":"/service_component/pmmapper", + "headers":{ + "!X-ONAP-RequestID":[ + "!12345" + ], + "!X-ONAP-InvocationID":[ + "!12345" + ], + "X-ONAP-PartnerName":[ + "pm-mapper" + ], + "User-Agent":[ + "Java/1.8.0_171" + ], + "Host":[ + "!some-random-host:10000" + ], + "Accept":[ + "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2" + ], + "Connection":[ + "keep-alive" + ], + "content-length":[ + "0" + ] + }, + "keepAlive":true, + "secure":false + }, + "httpResponse":{ + "statusCode":200, + "headers":{ + "content-type":[ + "application/json" + ] + }, + "body":{ + "type":"JSON", + "json":{ + "pm-mapper-filter":"{\"filters\": []}", + "key_store_path":"/opt/app/pm-mapper/etc/cert.jks", + "key_store_pass_path":"/opt/app/pm-mapper/etc/jks.pass", + "trust_store_path":"/opt/app/pm-mapper/etc/trust.jks", + "trust_store_pass_path":"/opt/app/pm-mapper/etc/trust.pass", + "dmaap_dr_delete_endpoint":"https://dmaap-dr-node:8443/delete", + "dmaap_dr_feed_name":"1", + "aaf_identity":"aaf_admin@people.osaaf.org", + "aaf_password":"demo123456!", + "enable_http":true, + "streams_publishes":{ + "dmaap_publisher":{ + "type":"message_router", + "dmaap_info":{ + "topic_url":"http://dmaap-message-router:3904/events/org.onap.dmaap.mr.VES_PM", + "client_role":"org.onap.dcae.pmPublisher", + "location":"csit-pmmapper", + "client_id":"1562763644939" + } + } + }, + "streams_subscribes":{ + "dmaap_subscriber":{ + "type":"data_router", + "dmaap_info":{ + "username":"username", + "password":"password", + "location":"csit-pmmapper", + "delivery_url":"http://dcae-pm-mapper:8081/delivery", + "subscriber_id":1 + } + } + } + } + } + } +}, + { + "httpRequest": { + "path": "/health" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": "{}" + } + } +] diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs_mockserver.properties b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs_mockserver.properties new file mode 100644 index 00000000..8c29348a --- /dev/null +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/cbs_sim/cbs_mockserver.properties @@ -0,0 +1,26 @@ +####################################### +# MockServer & Proxy Example Settings # +####################################### + +# Socket & Port Settings + +# socket timeout in milliseconds (default 120000) +mockserver.maxSocketTimeout=120000 + +# Certificate Generation + +# delete KeyStore file on JVM shutdown (default true) +mockserver.deleteGeneratedKeyStoreOnExit=true +# certificate domain name (default "localhost") +mockserver.sslCertificateDomainName=localhost +# comma separated list of domain names for Subject Alternative Name domain names (default empty list) +mockserver.sslSubjectAlternativeNameDomains=cbs-sim,config-binding-service,config-binding-service.onap +# comma separated list of ip addresses for Subject Alternative Name ips (default empty list) +mockserver.sslSubjectAlternativeNameIps=127.0.0.1 + +# CORS + +# enable CORS for MockServer REST API +mockserver.enableCORSForAPI=true +# enable CORS for all responses +mockserver.enableCORSForAllResponses=true diff --git a/plans/usecases/5G-bulkpm/assets/application.yaml b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/application.yaml similarity index 100% rename from plans/usecases/5G-bulkpm/assets/application.yaml rename to plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/application.yaml diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json similarity index 81% rename from plans/usecases/5G-bulkpm/assets/datafile_endpoints.json rename to plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json index cbb7cd53..6abfb566 100644 --- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dfc/datafile_endpoints.json @@ -16,17 +16,17 @@ "dmaap_info": { "username": "dradmin", "location": "san-francisco", - "log_url": "https://dmaapdrhost:8443/feedlog/1", + "log_url": "https://dmaap-dr-prov:8443/feedlog/1", "publisher_id": "972.360gm", "password": "dradmin", - "publish_url": "https://dmaapdrhost:8443/publish/1" + "publish_url": "https://dmaap-dr-prov:8443/publish/1" } } }, "streams_subscribes": { "dmaap_subscriber": { "dmaap_info": { - "topic_url":"http://dradmin:dradmin@dmaapmrhost:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" + "topic_url":"http://dradmin:dradmin@dmaap-message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12" }, "type": "message_router" } diff --git a/plans/usecases/5G-bulkpm/assets/addSubscriber.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addDefaultSubscriber.json similarity index 88% rename from plans/usecases/5G-bulkpm/assets/addSubscriber.json rename to plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addDefaultSubscriber.json index bab63c4d..6a8da842 100644 --- a/plans/usecases/5G-bulkpm/assets/addSubscriber.json +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addDefaultSubscriber.json @@ -1,6 +1,6 @@ { "delivery":{ - "url":"http://fileconsumer:7070", + "url":"http://datarouter-subscriber:7070", "user":"LOGIN", "password":"PASSWORD", "use100":true diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addPmMapperSubscriber.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addPmMapperSubscriber.json new file mode 100644 index 00000000..0666a7d5 --- /dev/null +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/addPmMapperSubscriber.json @@ -0,0 +1,20 @@ +{ + "delivery":{ + "url":"http://dcae-pm-mapper:8081/delivery", + "user":"username", + "password":"password", + "use100":true + }, + "follow_redirect":false, + "metadataOnly":false, + "suspend":false, + "groupid":0, + "links":{ + "self": "https://dmaap-dr-prov/subscribe/1", + "log": "https://dmaap-dr-prov/feedlog/1", + "feed": "https://dmaap-dr-prov/feed/1" + }, + "subscriber":"pmmapper", + "decompress":true, + "privilegedSubscriber": true + } \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/assets/createFeed.json b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/createFeed.json similarity index 100% rename from plans/usecases/5G-bulkpm/assets/createFeed.json rename to plans/usecases-5G-bulkpm/5G-bulkpm/assets/dmaap_dr/createFeed.json diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/cert.jks b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/cert.jks new file mode 100644 index 0000000000000000000000000000000000000000..33dc9a31aa5574aa13620ca9b45b2fd583fef227 GIT binary patch literal 4654 zcmb_ec{tQ-8=lp^WE)FF%5L;SvKEp(vZO>g#u(EujAgPbro}F_h@!}nvgQztLW?!a z#Ia|~lD&}i#5efPxj0SVcYW9O{qdW5@B4Y)`+2wPd7ky@^=S|Y1fhQ5t&h_YjlyVc z{>TyBQ0{UBPb}4h3yvF)27%xZfCO6y*yxyK=)f?rG=u{ThJ#=v*aYwfgze}Qb|PGV z!MB*3@M<61v1T)^u}>7L1Av2HyYND{*<*N0>Uz@-vWN*c@*%ENk~DzDQEOM z;KRW<(5hwS#)@9$81wJsw^kYZ_!sRxEq?4J#t>Q_#xIlv_P)^<5-UFNhLazj(#8~< zGQi=E*S?r4Vfh~3bx=lk%-GVtBC?#D@F(xLl$#oMkKy;a1ggD4MavqyZXhUWUwma% zP4^3uk7%ZUIi2}3GEl3&2T`HuDp{}Io030o`MuP#W+liQI3x5qX!4cwIH%v+1(3j6 zag7m|N!qwRj$6M|{|b7pnf(Q%d4Czjmbq%4vNB)(O57W7R^$>AWF)oU zRe>R*Re8{W-N&5`FSb!;?~73 zvi=*h`LWoMvI}%?_pn{7k`d_%n8=2>*IHxDU!5*IeWuqz;RT><<V}8rI*9F9s)g_Luw{hYDj#W%Q%){ zf7iQ1P*bL4r93<_4%85$bPw~9&MD|ip-~ezB;bH>vf@h-#x;&-rmd$tP;HM+9D}nK>+V zi}}6AC>`>i4esma%+qJ}r3hj!2p!dhL|w~OJF|YbFXOC7Qk90o?Zd-f%GV=61*2!+ z3XpdKOl9NmDY!jreBpUk0#ng(n(d}*fszvrXLO#;JU%vj=X<_+ksPG1#_(oz+tHes z+eE?c<2gu|O3CwMo%fPrUqa5GYddAw)iUGo-2NqZMXcZvWA5ez#zITAfp4S9MFDSH zM4H|0@-|cszqcI;UEDA*(tC?Qzy~L%yi)MPD;A0(K82M*qnZj*Lkz&`hwE9z_92qZ><9h4UVc@s!p3*{3jaBDdwKotaHumVU7<^YLa^$`>ThCmpMZu(93Hw_#BSm_w0 zZy4NIVg-Yl;UGX?o*7`IgIdApxFA-R@~i;!CSYQLoif!nlV<~1HX$<${FJ4(ww^pc zz`Kc|EPHTnM2x2^#u0}iVsx~BQw8?%vdXIhitKWgeFjj6C+V3(pkNUAF$pdN zkl_4Vw=cv6g8(3E{e)Txv4g=IFc=g99{@x)vDhX?0Niv8)Y=M%(?h|3k08M5O^*XG z6Tmo_J7g)*c28MtRNuUX-GnLbkP6xGh&Z$tY5RnCaocKATWUWWeyO|r?6!4xaXWQ?Hqg|?xZ??at{68W@*>L35l=li zUdNxfzjSFEXz5-g;9aRVjd8=`+%QO2tSgbk`!n}%-Cr1J=|ngM zsBKY6+B^+SMx2{Bb^ioUKN8#D!)+0f-I&H?Hg^IZhxYsX@VIv4Z5c5d;%R3e>xNG`srOumG{XGFL2(7btgU@;_^XXlJ()=YnxVhrsq;;OnUbq= zT}-X6x>N@-<>}u3JA&)#u&-%O*KXnu9`ZNV5KiiNr?iB)9D8VZwLI`^@IZ=Fx`OwG z-%sw}XM6JfSII+H=HrZX&6f>s^)7UDsOfViaX%{uTA-H zy+MA9M_XLUi_#vG1HR4DQnx+&;*=Rv4MdHTKO-`IC$b(^F1tt6_P}t*6gplH9xfx@ zUyQnMTXHaTD6YA@(kPNqL|aqy=11Y=$CLcir%F?YMH}1s()GOrljFk&Yg`(p$&E6W zeodVehWJrPk9M!req=(;d+9pmlx!4wQZI;f%ESk%3S#@LW$8(m+l!nLi5s?#_tle` zd0@)SIZXJ@5)sUzo_E};Vr-2xk?mwPH{M$rKcar&c)KT)>Tn(Z-3G}pqYveJhPXZ( z>t__SuX?sYw@waQ#{)L75eJ;$?>BmmAY=cqPQkU(b8Teb=T7z##$w>N`rFJ>EtMl04qTh<0|P)u z{eytPyITzKjqMm>zw9q|KPo5*0tT^jc_xWO=VM>Yh*JD-6iPc0-b4{SRHDI8*21$W zO?ZaX=s(WS?up!IfU5W9NmmcLfUbX7nV6nc>$9p>M=TO%uYPw>y@0u-*T|x@-)-K) zO6v&o+6Xz3Y;Iw^-&mJ5_Kb62n-PwykW`Z?!pZ|l?rQF}v`O%i9S}1=!E^q(U>AHU z^4RLV>V-yB6}Tx?^<9~XQtx_4JF4&2@L7&!LtA>XMKuz)= zffO}nRKR|U{Yt*(C_S$wQK35B<}N!hL8zZ{@DFK<0A5$;oPGbNs+44f_Vl-K0ZJWQ zxcA}Q(c^ENMkadP(!5e{Asg3Om^q_nLgiYIR_mRW?JKuihzlfNHA{$()05awZx`Wm zyR)2UAHy=m3$Ogr1q*-7YN-61mPEUso~hGRqqx>$>>#gbJmBL@ngWZ2o4T5&59(jx zU<%_Ym8sf^DW6Vv1ShjlVbon2Os(J{N-2Zk;T+C6coE6{shgr$eNQrX7 zp->aMPLq~|Q-}_Q)lc2eLMZ&7tR6Q-@I{7Z)1i4ySLJL6G4)Hph7p&?Jkd?0_JtuS pF6Fqkbw6K)&dE`v-#*ma@hbRionC>UZXc%`c1A})f(@9v_b=4(eop`Z literal 0 HcmV?d00001 diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/jks.pass b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/jks.pass new file mode 100644 index 00000000..ae8f7e72 --- /dev/null +++ b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/jks.pass @@ -0,0 +1 @@ +Er1tmip;T4w[%1}YE?x{fN9v \ No newline at end of file diff --git a/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/trust.jks b/plans/usecases-5G-bulkpm/5G-bulkpm/assets/pm_mapper_certs/trust.jks new file mode 100644 index 0000000000000000000000000000000000000000..679c95a5c2c82666c1b78ff3786b5b12fe809d7e GIT binary patch literal 1413 zcmb7DYdF&j9NtyOZA)s_5Tc#skpHaJ6m3@IxP&wlidC2rsU!CXJGKzHNp-a=}&;N(<@> zIg83Y2{`{XBkqF8o-1r>Vg{>?x!MoJ8Msfz5P#NrPJOPxDh=tH{PuRgR=qJyaeF#M z>^10niFzK_-;mRKt8>ODRc1)d_sKGHlP3RhXzXfUU*~E?0NKbXF=HccJ@r0Z) zMdVRtLP&}Cdgg2@ti?|^d9*YuKazOdYpJVGMXM5bUMNC!wK*rxr@7OVpetRu2yc)Q*-9)89BkeeH*cq#5DLo24>V z-WQCMI6y%<4$0Y>H1=t*XRs%S$d8^>r+-1@O9@rc%J&g;1BPlxm0@K~&`6!_0Lc^9 zit0@!hoBfLm8!q-vnXi)7>m(GEZr@*V7w@$wcgrY1CV5vtRChY_So5PTR-O~35{UV zWCD}tQ&~2&!oFyW3$^i&O7({?83AHX!HeF+zqXXk$fbhg&|Ff@RQ{ci(u%b*ShZ@}OHbQ1u?mVn$6V4DTu{20T{ zR&2%)3?l1vGpoZ29csuJKZd!`_;h#Iw##zs8sbDkpgzGwvYI;t%?(w!x~`@~Mr3Ff z#l_fld5JSH^rS1f{7g3WfJb)Q!nz!**Q^`JY+WGdJ6(G*WV&+wV|7RId>_|N?3?rH zF_4xQ-oJ}<)Ixye&&LV83xnQ6q;H6_%|?UWG-@T}5-SyT(IS5&3;%DMh46M%nLE){-aKos`qXVW2wbt&J3UISZ{Pn_VplZcmVLUIJ9lavr2VLP>85wX44TQ(8XP`CU*uAP z^FE)6mQG!NQtsesAWhucd~XeTzl%3Du9ZD!`crxxHQtest_password trial software update - + \ No newline at end of file diff --git a/plans/usecases/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py similarity index 67% rename from plans/usecases/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py index 810fe453..e8a81594 100755 --- a/plans/usecases/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/simulators/pnfsim/pnf-sw-upgrade/subscriber.py @@ -22,14 +22,18 @@ __author__ = "Eliezio Oliveira " __copyright__ = "Copyright (C) 2020 Nordix Foundation" __license__ = "Apache 2.0" +import os import time -from concurrent.futures import ThreadPoolExecutor from threading import Timer import sysrepo as sr +from loguru import logger YANG_MODULE_NAME = 'pnf-sw-upgrade' +XPATH_CTX = sr.Xpath_Ctx() +PAUSE_TO_LOCK = 0.5 + # # ----- BEGIN Finite State Machine definitions ----- # @@ -48,9 +52,10 @@ ST_DOWNLOAD_COMPLETED = 'DOWNLOAD_COMPLETED' ST_ACTIVATION_IN_PROGRESS = 'ACTIVATION_IN_PROGRESS' ST_ACTIVATION_COMPLETED = 'ACTIVATION_COMPLETED' -# Timeout used for timed transitions -TO_DOWNLOAD = 7 -TO_ACTIVATION = 7 +# Timeouts used for timed transitions +SWUG_TIMED_TRANSITION_TO = int(os.environ.get("SWUG_TIMED_TRANSITION_TO", "7")) +TO_DOWNLOAD = SWUG_TIMED_TRANSITION_TO +TO_ACTIVATION = SWUG_TIMED_TRANSITION_TO def timestamper(sess, key_id): @@ -101,6 +106,7 @@ STATE_MACHINE = { } } + # # ----- END Finite State Machine definitions ----- # @@ -117,28 +123,31 @@ def main(): try: print_current_config(sess, YANG_MODULE_NAME) except Exception as e: - print(e) + logger.error(e) sr.global_loop() - print("Application exit requested, exiting.") + logger.info("Application exit requested, exiting.") except Exception as e: - print(e) + logger.error(e) # Function to be called for subscribed client of given session whenever configuration changes. def module_change_cb(sess, module_name, event, private_ctx): - try: - conn = private_ctx - change_path = xpath_of(None, 'action') - it = sess.get_changes_iter(change_path) - while True: - change = sess.get_change_next(it) - if change is None: - break - handle_change(conn, change.oper(), change.old_val(), change.new_val()) - except Exception as e: - print(e) + if event == sr.SR_EV_APPLY: + try: + conn = private_ctx + change_path = xpath_of(None, 'action') + it = sess.get_changes_iter(change_path) + while True: + change = sess.get_change_next(it) + if change is None: + break + op = change.oper() + if op in (sr.SR_OP_CREATED, sr.SR_OP_MODIFIED): + handle_trigger_action(conn, sess, change.new_val()) + except Exception as e: + logger.error(e) return sr.SR_ERR_OK @@ -146,67 +155,55 @@ def module_change_cb(sess, module_name, event, private_ctx): # It does so by loading all the items of a session and printing them out. def print_current_config(session, module_name): select_xpath = f"/{module_name}:*//*" - values = session.get_items(select_xpath) - - if values is not None: - print("========== BEGIN CONFIG ==========") + if values: + logger.info("========== BEGIN CONFIG ==========") for i in range(values.val_cnt()): - print(values.val(i).to_string(), end='') - print("=========== END CONFIG ===========") + logger.info(values.val(i).to_string().strip()) + logger.info("=========== END CONFIG ===========") -def handle_change(conn, op, old_val, new_val): +def handle_trigger_action(conn, sess, action_val): """ Handle individual changes on the model. """ - if op == sr.SR_OP_CREATED: - print("CREATED: %s" % new_val.to_string()) - xpath = new_val.xpath() - last_node = xpath_ctx.last_node(xpath) - # Warning: 'key_value' modifies 'xpath'! - key_id = xpath_ctx.key_value(xpath, 'upgrade-package', 'id') - if key_id and last_node == 'action': - executor.submit(execute_action, conn, key_id, new_val.data().get_enum()) - elif op == sr.SR_OP_DELETED: - print("DELETED: %s" % old_val.to_string()) - elif op == sr.SR_OP_MODIFIED: - print("MODIFIED: %s to %s" % (old_val.to_string(), new_val.to_string())) - elif op == sr.SR_OP_MOVED: - print("MOVED: %s after %s" % (new_val.xpath(), old_val.xpath())) - - -def execute_action(conn, key_id, action): - sess = sr.Session(conn) - try: + logger.info("CREATED/MODIFIED: %s" % action_val.to_string()) + xpath = action_val.xpath() + last_node = XPATH_CTX.last_node(xpath) + # Warning: 'key_value' modifies 'xpath'! + key_id = XPATH_CTX.key_value(xpath, 'upgrade-package', 'id') + if key_id and last_node == 'action': + action = action_val.data().get_enum() cur_state = sess.get_item(xpath_of(key_id, 'current-status')).data().get_enum() next_state_str = STATE_MACHINE[cur_state]['transitions'].get(action, None) if next_state_str: - handle_set_state(conn, key_id, next_state_str) - sess.delete_item(xpath_of(key_id, 'action')) - sess.commit() - finally: - sess.session_stop() + Timer(PAUSE_TO_LOCK, try_change_state, (conn, key_id, next_state_str)).start() -def handle_set_state(conn, key_id, state_str): +def try_change_state(conn, key_id, state_str): sess = sr.Session(conn) try: - state = sr.Val(state_str, sr.SR_ENUM_T) - sess.set_item(xpath_of(key_id, 'current-status'), state) - on_enter = STATE_MACHINE[state_str].get('on_enter', None) - if on_enter: - # noinspection PyCallingNonCallable - on_enter(sess, key_id) - sess.commit() + try: + sess.lock_module(YANG_MODULE_NAME) + except RuntimeError: + logger.warning(f"Retrying after {PAUSE_TO_LOCK}s") + Timer(PAUSE_TO_LOCK, try_change_state, (conn, key_id, state_str)).start() + return + try: + state = sr.Val(state_str, sr.SR_ENUM_T) + sess.set_item(xpath_of(key_id, 'current-status'), state) + on_enter = STATE_MACHINE[state_str].get('on_enter', None) + if callable(on_enter): + on_enter(sess, key_id) + sess.commit() + finally: + sess.unlock_module(YANG_MODULE_NAME) delay, next_state_str = STATE_MACHINE[state_str].get('timed_transition', [0, None]) if delay: - Timer(delay, handle_set_state, (conn, key_id, next_state_str)).start() + Timer(delay, try_change_state, (conn, key_id, next_state_str)).start() finally: sess.session_stop() if __name__ == '__main__': - xpath_ctx = sr.Xpath_Ctx() - executor = ThreadPoolExecutor(max_workers=2) - main() + main() \ No newline at end of file diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/cloud-esr-system-info.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/cloud-esr-system-info.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/cloud-esr-system-info.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/cloud-esr-system-info.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/cloud-region.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/cloud-region.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/cloud-region.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/cloud-region.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/customer.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/customer.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/customer.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/customer.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/esr-system-info.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/esr-system-info.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/esr-system-info.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/esr-system-info.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/esr-vnfm.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/esr-vnfm.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/esr-vnfm.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/esr-vnfm.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/line-of-business.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/line-of-business.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/line-of-business.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/line-of-business.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/owning-entity.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/owning-entity.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/owning-entity.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/owning-entity.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/platform.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/platform.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/platform.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/platform.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/pnf.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/pnf.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/pnf.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/pnf.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/project.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/project.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/project.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/project.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/tenant.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/tenant.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/aai-simulator-populate-data/tenant.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/aai-simulator-populate-data/tenant.json diff --git a/plans/usecases/pnf-sw-upgrade/so/config/apply-workarounds.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/apply-workarounds.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/apply-workarounds.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/apply-workarounds.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/config/certificates/aai-certificate/aai.cert b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/certificates/aai-certificate/aai.cert similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/certificates/aai-certificate/aai.cert rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/certificates/aai-certificate/aai.cert diff --git a/plans/usecases/pnf-sw-upgrade/so/config/distribution-test-zip/zipped_sdc_csar.tar.gz b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/distribution-test-zip/zipped_sdc_csar.tar.gz similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/distribution-test-zip/zipped_sdc_csar.tar.gz rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/distribution-test-zip/zipped_sdc_csar.tar.gz diff --git a/plans/usecases/pnf-sw-upgrade/so/config/env b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env similarity index 86% rename from plans/usecases/pnf-sw-upgrade/so/config/env rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env index 77e3dbf2..2cf20d9b 100644 --- a/plans/usecases/pnf-sw-upgrade/so/config/env +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/env @@ -1,6 +1,6 @@ NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001 DOCKER_ENVIRONMENT=remote -TAG=1.6.0-STAGING-latest +TAG=1.6.1-STAGING-latest TIME_OUT_DEFAULT_VALUE_SEC=1200 PROJECT_NAME=pnfSwU DEFAULT_NETWORK_NAME=pnfswu_default diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/api-handler-infra/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/api-handler-infra/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/api-handler-infra/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/api-handler-infra/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/bpmn-infra/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/bpmn-infra/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/bpmn-infra/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/catalog-db-adapter/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/catalog-db-adapter/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/catalog-db-adapter/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/catalog-db-adapter/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/request-db-adapter/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/request-db-adapter/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/request-db-adapter/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/request-db-adapter/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/sdc-controller/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/sdc-controller/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/sdc-controller/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/sdc-controller/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-monitoring/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/so-monitoring/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/so-monitoring/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/so-monitoring/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/so-vnfm-adapter/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/so-vnfm-adapter/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/so-vnfm-adapter/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/vnfm-simulator/onapheat/override.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/override-files/vnfm-simulator/onapheat/override.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/override-files/vnfm-simulator/onapheat/override.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/config/populate-aai-simulator.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/populate-aai-simulator.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/populate-aai-simulator.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/populate-aai-simulator.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/config/wait-for-aai-config-job.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-aai-config-job.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/wait-for-aai-config-job.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-aai-config-job.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/config/wait-for-container.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-container.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/wait-for-container.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-container.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/config/wait-for-workaround-job.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-workaround-job.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/wait-for-workaround-job.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for-workaround-job.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/config/wait-for.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/config/wait-for.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/config/wait-for.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/docker-compose.local.yml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/docker-compose.local.yml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/docker-compose.local.yml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/docker-compose.local.yml diff --git a/plans/usecases/pnf-sw-upgrade/so/docker-compose.yml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/docker-compose.yml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/docker-compose.yml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/docker-compose.yml diff --git a/plans/usecases/pnf-sw-upgrade/so/settings.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/settings.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/settings.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/settings.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/pom.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/pom.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/pom.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/pom.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/AaiSimulatorApplication.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/ApplicationConfigration.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/configration/WebSecurityConfigImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/AaiSimulatorController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/BusinessController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/CloudRegionsController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/GenericVnfsController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/LinesOfBusinessController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/NodesController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/OwningEntityController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PlatformController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/PnfsController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ProjectController.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/InvalidRestRequestException.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/exception/RestProcessingException.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/CloudRegionKey.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Format.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/NodeServiceInstance.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/models/Results.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/Clearable.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CloudRegionCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/CustomerCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ExternalSystemCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/GenericVnfCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/HttpRestServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/LinesOfBusinessCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/NodesCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/OwnEntityCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PlatformCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/PnfCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/service/providers/ProjectCacheServiceProviderImpl.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/CacheName.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/HttpServiceUtils.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestError.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorBuilder.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/RequestErrorResponseUtils.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ServiceException.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/ShallowBeanCopy.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/application.yaml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/application.yaml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/application.yaml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/application.yaml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/keystore/org.onap.so.p12 diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/main/resources/truststore/org.onap.so.trust.jks diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AaiSimulatorControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/AbstractSpringBootTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/BusinessControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/CloudRegionsControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/GenericVnfsControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/LinesOfBusinessControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/NodesControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/OwningEntityControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PlatformControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/PnfsControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/ProjectControllerTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/controller/configuration/TestRestTemplateConfigration.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestRestTemplateService.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestUtils.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-customer.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-customer.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-project.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/business-project.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/platform.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/platform.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/pnf.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/pnf.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-instance.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-instance.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/tenant.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/tenant.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/vServer.json similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/aai-simulator/src/test/resources/test-data/vServer.json diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/pom.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/pom.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/pom.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/pom.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/cache/provider/AbstractCacheServiceProvider.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/cache/provider/AbstractCacheServiceProvider.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/cache/provider/AbstractCacheServiceProvider.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/cache/provider/AbstractCacheServiceProvider.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/configuration/SimulatorSecurityConfigurer.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/configuration/SimulatorSecurityConfigurer.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/configuration/SimulatorSecurityConfigurer.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/configuration/SimulatorSecurityConfigurer.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/model/User.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/model/User.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/model/User.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/model/User.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/model/UserCredentials.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/model/UserCredentials.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/src/main/java/org/onap/so/simulator/model/UserCredentials.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/main/java/org/onap/so/simulator/model/UserCredentials.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/common/src/test/java/org/onap/so/simulator/model/PojoClassesTest.java b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/test/java/org/onap/so/simulator/model/PojoClassesTest.java similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/common/src/test/java/org/onap/so/simulator/model/PojoClassesTest.java rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/common/src/test/java/org/onap/so/simulator/model/PojoClassesTest.java diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/pom.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/pom.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/pom.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/pom.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/Dockerfile.so-simulator-base-image diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/Dockerfile.workaround-job-container b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/Dockerfile.workaround-job-container similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/Dockerfile.workaround-job-container rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/Dockerfile.workaround-job-container diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/configs/logging/logback-spring.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/scripts/start-app.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/scripts/start-app.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/docker/src/main/docker/docker-files/scripts/start-app.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/docker/src/main/docker/docker-files/scripts/start-app.sh diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/package/pom.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/pom.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/package/pom.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/package/pom.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/pom.xml b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/pom.xml similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/simulator/pom.xml rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/simulator/pom.xml diff --git a/plans/usecases/pnf-sw-upgrade/so/so_setup.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/so_setup.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh index 8c94452f..ed5f6f07 100755 --- a/plans/usecases/pnf-sw-upgrade/so/so_setup.sh +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_setup.sh @@ -140,6 +140,9 @@ git clone http://gerrit.onap.org/r/so/docker-config.git $TEST_LAB_DIR_PATH export TEST_LAB_DIR=$TEST_LAB_DIR_PATH export CONFIG_DIR_PATH=$CONFIG_DIR +echo "updating PNF ip-address in pnf.json" +sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF_PAYLOAD_PATH + if [ "$DOCKER_ENVIRONMENT" == "remote" ]; then echo "Starting docker containers with remote images ..." docker-compose -f $DOCKER_COMPOSE_FILE_PATH -p $PROJECT_NAME up -d mariadb @@ -158,9 +161,6 @@ fi echo "Sleeping for 2m" sleep 2m -echo "updating PNF ip-address in pnf.json" -sed -i "s/pnfaddr/$LOCAL_IP/g" $PNF_PAYLOAD_PATH - echo "Will execute $WAIT_FOR_WORKAROUND_SCRIPT script" $WAIT_FOR_WORKAROUND_SCRIPT diff --git a/plans/usecases/pnf-sw-upgrade/so/so_teardown.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_teardown.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/so/so_teardown.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/sorch/so_teardown.sh diff --git a/plans/usecases/pnf-sw-upgrade/teardown.sh b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/teardown.sh similarity index 100% rename from plans/usecases/pnf-sw-upgrade/teardown.sh rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/teardown.sh diff --git a/plans/usecases/pnf-sw-upgrade/test.properties b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties similarity index 77% rename from plans/usecases/pnf-sw-upgrade/test.properties rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties index 23b45d38..f4890902 100644 --- a/plans/usecases/pnf-sw-upgrade/test.properties +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/test.properties @@ -9,9 +9,9 @@ SDNC_DOCKER_PATH=$TC_PLANS_PATH/sdn PNF_SIM_DOCKER_PATH=$TC_PLANS_PATH/simulators/pnfsim CERT_SUBPATH=$SDNC_DOCKER_PATH/certs APP_CONFIG_HOME=/opt/app/onap/config -SO_DOCKER_PATH=$TC_PLANS_PATH/so +SO_DOCKER_PATH=$TC_PLANS_PATH/sorch PROJECT_NAME=pnfSwU -SDNC_IMAGE_TAG=1.8.0-STAGING-latest -BP_IMAGE_TAG=0.7.0-STAGING-latest +SDNC_IMAGE_TAG=1.8.1 +BP_IMAGE_TAG=0.7.1 NETOPEER_IMAGE_TAG=v2.5.0 \ No newline at end of file diff --git a/plans/usecases/config-over-netconf/testplan.txt b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/testplan.txt similarity index 72% rename from plans/usecases/config-over-netconf/testplan.txt rename to plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/testplan.txt index 9c696094..64661c2d 100644 --- a/plans/usecases/config-over-netconf/testplan.txt +++ b/plans/usecases-pnf-sw-upgrade/pnf-sw-upgrade/testplan.txt @@ -1,4 +1,4 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -usecases/config-over-netconf +usecases-pnf-sw-upgrade/pnf-sw-upgrade diff --git a/plans/usecases/5G-bulkpm/README.txt b/plans/usecases/5G-bulkpm/README.txt deleted file mode 100644 index 5bc82a24..00000000 --- a/plans/usecases/5G-bulkpm/README.txt +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################################################### -By executing the below commands it will change the CSIT test from executing on a docker envirnoment to an ONAP one. -################################################################################################################### - -1) Login to an ONAP instance, switch user and verify that the command kubectl executes before proceeding . -# sudo -s -# kubectl get svc -n onap| grep dcae - -2) Clone the csit repositry -# git clone https://gerrit.onap.org/r/integration/csit - -3) Install docker-compose -# sudo apt-get update -# sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -# sudo chmod +x /usr/local/bin/docker-compose -# docker-compose --version - -4) Install the packages required for the RobotFramework. -# apt install python-pip -# sudo apt install python-pip virtualenv unzip sshuttle netcat libffi-dev libssl-dev -# sudo pip install robotframework -# sudo pip install -U requests -# sudo pip install -U robotframework-requests - -5) Expose the Ves-collector -# kubectl expose svc dcae-ves-collector --type=LoadBalancer --name=vesc -n onap - service "vesc" exposed - -6) Verify the Ves-collector is exposed -# kubectl get svc -n onap | grep vesc - vesc LoadBalancer 10.43.203.47 10.209.63.55 8080:31835/TCP 1m - -7) Modify the file setup.sh and make the below change -# cd csit -# vi plans/usecases/5G-bulkpm/setup.sh -CSIT=TRUE - to -CSIT=FALSE - -8) Excute the Bulk PM e2e csit. -# ./run-csit.sh plans/usecases/5G-bulkpm/ - ---> Troubleshooting --------------------- -If the Test case "Verify Default Feed And File Consumer Subscription On Datarouter" is hanging, quit the test and execute the below -Get the DR-PROV IP address -# kubectl -n onap -o=wide get pods | grep dmaap-dr-prov | awk '{print $6}' - 10.42.123.76 -Make sure there are no feeds -# curl -k https://10.42.123.76:8443/internal/prov - -If there are feeds delete them -curl -X DELETE -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" -k https://10.42.123.76:8443/subs/XX - -Where XX is the number of the feeds in the previous command. diff --git a/plans/usecases/5G-bulkpm/assets/config.json b/plans/usecases/5G-bulkpm/assets/config.json deleted file mode 100644 index 7d2d64ef..00000000 --- a/plans/usecases/5G-bulkpm/assets/config.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "pm-mapper-filter": { "filters":[]}, - "key_store_path": "/opt/app/pm-mapper/etc/cert.jks", - "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass", - "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks", - "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass", - "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", - "dmaap_dr_feed_name": "1", - "aaf_identity": "aaf_admin@people.osaaf.org", - "aaf_password": "demo123456!", - "enable_http": true, - "streams_publishes": { - "dmaap_publisher": { - "type": "message_router", - "dmaap_info": { - "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM", - "client_role": "org.onap.dcae.pmPublisher", - "location": "csit-pmmapper", - "client_id": "1562763644939" - } - } - }, - "streams_subscribes": { - "dmaap_subscriber": { - "type": "data_router", - "dmaap_info": { - "username": "username", - "password": "password", - "location": "csit-pmmapper", - "delivery_url": "http://dcae-pm-mapper:8081/delivery", - "subscriber_id": 1 - } - } - } -} \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz b/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz deleted file mode 100644 index 2f527c2758fc3095af8f21def1437a10f4c6876d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 63 zcmV-F0KoqriwFosK&o2+19(nGE^uuwcx`L|v&qX(Nwur+bF /tmp/dfc_docker.log -cat /tmp/dfc_docker.log -sleep 3 -kill-instance.sh fileconsumer-node -kill-instance.sh sftp \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh deleted file mode 100644 index e0d7b801..00000000 --- a/plans/usecases/5G-bulkpm/setup.sh +++ /dev/null @@ -1,239 +0,0 @@ -#!/bin/bash -# Place the scripts in run order: -source ${SCRIPTS}/common_functions.sh -SFTP_PORT=22 -VESC_PORT=8080 -export VESC_PORT=${VESC_PORT} -export CLI_EXEC_CLI_DFC="docker exec dfc /bin/sh -c \"ls /target | grep .gz\"" - -# Clone DMaaP Message Router repo -mkdir -p $WORKSPACE/archives/dmaapmr -cd $WORKSPACE/archives/dmaapmr -git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master -sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml -cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose -cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/ - -# start DMaaP MR containers with docker compose and configuration from docker-compose.yml -docker login -u docker -p docker nexus3.onap.org:10001 -docker-compose up -d - -ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1") -KAFKA=$(docker ps -a -q --filter="name=kafka_1") -DMAAP=$(docker ps -a -q --filter="name=dmaap_1") - -# Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper -for i in {1..10}; do -if [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ] -then - echo "DMaaP Service Running" - break -else - echo sleep $i - sleep $i -fi -done - -# Get IP address of DMAAP, KAFKA, Zookeeper -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER) -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) - -sleep 2 -# Shutdown DMAAP Container -docker kill $DMAAP - -# Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites -sed -i -e '/config.zk.servers=/ s/=.*/='$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties -sed -i -e '/kafka.metadata.broker.list=/ s/=.*/='$KAFKA_IP':9092/' /var/tmp/MsgRtrApi.properties - -# Start DMaaP MR containers with docker compose and configuration from docker-compose.yml -docker login -u docker -p docker nexus3.onap.org:10001 -docker-compose up -d -sleep 5 - -# Clone DMaaP Data Router repo -mkdir -p $WORKSPACE/archives/dmaapdr -cd $WORKSPACE/archives/dmaapdr -git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master -cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources -mkdir docker-compose -cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose -cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml - -docker login -u docker -p docker nexus3.onap.org:10001 -docker-compose up -d -echo "Disregard the message ERROR: for datarouter-node Container 1234456 is unhealthy, this is expected behaiour at this stage" -docker kill vescollector -docker kill cbs -sleep 10 -CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul ) -sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml -HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $7}') -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -sed -i -e '/DMAAPHOST:/ s/:.*/: '$DMAAP_MR_IP'/' docker-compose.yml -MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb ) -sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties -docker-compose up -d -sleep 5 -# Get IP address of datarrouger-prov, datarouter-node, fileconsumer-node. -DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) -DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) -DR_SUBSCIBER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' fileconsumer-node) -DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) - -echo DR_PROV_IP=${DR_PROV_IP} -echo DR_NODE_IP=${DR_NODE_IP} -echo DR_GATEWAY_IP=${DR_GATEWAY_IP} -echo DR_SUBSCIBER_IP=${DR_SUBSCIBER_IP} - -docker kill datarouter-node -docker kill datarouter-prov -sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml -sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml -docker-compose up -d - -# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb -for i in {1..10}; do - if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] - then - echo "DR Service Running" - break - else - echo sleep $i - sleep $i - fi -done - -sleep 5 - -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP" -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP" -docker exec datarouter-node /bin/sh -c "echo '${DR_SUBSCIBER_IP}' dmaap-dr-subscriber >> /etc/hosts" - - -# Get IP address of DMAAP, KAFKA, Zookeeper -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER) -VESC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vescollector) -SFTP_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sftp) - -export VESC_IP=${VESC_IP} -export HOST_IP=${HOST_IP} -export DMAAP_MR_IP=${DMAAP_MR_IP} - - -# Data File Collector configuration : -sed -i 's/5.5.5.5/'$DR_NODE_IP'/g' docker-compose.yml -cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/ -sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json -sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json -echo data_endpoints.json to be copied onto the DFC containter -cat /tmp/datafile_endpoints.json -docker-compose up -d -sleep 2 -# DFC is now online -docker cp dfc:/opt/app/datafile/config/datafile_endpoints.json /tmp/datafile_endpoints.json.fromcontainer -echo data_endpoints.json from DFC containter -cat /tmp/datafile_endpoints.json.fromcontainer -docker cp /tmp/datafile_endpoints.json dfc:/opt/app/datafile/config/ -docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/application.yaml dfc:/opt/app/datafile/config/ -#Increase Logging -#docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml" -docker restart dfc -sleep 2 - -# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS -for i in {1..10}; do - if [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' cbs) ] - then - echo "Data Router, Consul, Config Binding Service Services Running" - break - else - echo sleep $i - sleep $i - fi -done -sleep 10 - -pip install jsonschema uuid simplejson -# Wait container ready -sleep 2 - -# Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server. -cp $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json -sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json -sed -i 's/sftpport/'${SFTP_PORT}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json -docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/ -docker cp $WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml.gz sftp:/home/admin/ - -# Data Router Configuration: -# Create default feed and create file consumer subscriber on data router -curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 -cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json -sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json -curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 -sleep 10 -curl -k https://$DR_PROV_IP:8443/internal/prov - -# Consul Configuration for PM Mapper -cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json /tmp/cbs.json -sed -i 's/ipaddress/'${CBS_IP}'/g' /tmp/cbs.json -curl --request PUT --data @/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register -curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/usecases/5G-bulkpm/assets/config.json - -# PM Mapper startup and configuration -mkdir /tmp/docker-compose -cd /tmp/docker-compose -cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml -CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs) -sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml -sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml -sed -i 's/4.4.4.4/'$MARIADB'/g' docker-compose.yml -docker-compose up -d - -cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose -PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) -docker kill datarouter-node -docker kill datarouter-prov -sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml -sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml -sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml -docker-compose up -d - -# Setting up PM Mapper certs. -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks pmmapper:opt/app/pm-mapper/etc/ -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass pmmapper:opt/app/pm-mapper/etc/ -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks pmmapper:opt/app/pm-mapper/etc/ -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass pmmapper:opt/app/pm-mapper/etc/ -docker restart pmmapper -sleep 5 - -# Simulation setup for Message Router -docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js mariadb:/ -docker exec mariadb /bin/bash -c "apt update" -sleep 2 -docker exec mariadb /bin/bash -c "apt install nodejs -y" -sleep 10 -docker exec mariadb /bin/bash -c "nodejs mrserver.js &" & - -# Create PM Mapper feed and create PM Mapper subscriber on data router -#curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 -curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 - -# Create PM Mapper tocic in Message Router -PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) -docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log -cat /tmp/pmmapper.log -docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv" -sleep 10 -curl -k https://$DR_PROV_IP:8443/internal/prov - -#Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT} -v DR_SUBSCIBER_IP:${DR_SUBSCIBER_IP} -v SFTP_IP:${SFTP_IP}" \ No newline at end of file diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh deleted file mode 100644 index 73aaf3bd..00000000 --- a/plans/usecases/5G-bulkpm/teardown.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -echo "Starting teardown script" -docker exec dfc /bin/sh -c "less /var/log/ONAP/application.log" > /tmp/dfc_docker.log -echo "===== DFC LOG ========" -cat /tmp/dfc_docker.log -sleep 3 -echo "===== PM MAPPER LOG ========" -cat /tmp/pmmapper_docker.log.robot -sleep 2 -kill-instance.sh $DMAAP -kill-instance.sh $KAFKA -kill-instance.sh $ZOOKEEPER -kill-instance.sh vescollector -kill-instance.sh datarouter-node -kill-instance.sh datarouter-prov -kill-instance.sh fileconsumer-node -kill-instance.sh mariadb -kill-instance.sh dfc -kill-instance.sh sftp -kill-instance.sh cbs -kill-instance.sh consul -kill-instance.sh pmmapper \ No newline at end of file diff --git a/tests/usecases/5G-bulkpm/BulkpmE2E.robot b/tests/usecases-5G-bulkpm/5G-bulkpm/BulkpmE2E.robot similarity index 88% rename from tests/usecases/5G-bulkpm/BulkpmE2E.robot rename to tests/usecases-5G-bulkpm/5G-bulkpm/BulkpmE2E.robot index e89d4d67..fe3b1cec 100644 --- a/tests/usecases/5G-bulkpm/BulkpmE2E.robot +++ b/tests/usecases-5G-bulkpm/5G-bulkpm/BulkpmE2E.robot @@ -5,6 +5,8 @@ Library OperatingSystem Library Collections Library Process Resource resources/bulkpm_keywords.robot +Library resources/JsonValidatorLibrary.py +Library resources/xNFLibrary.py *** Variables *** @@ -12,21 +14,21 @@ ${VESC_URL} http://%{VESC_IP}:%{VESC_PORT} ${GLOBAL_APPLICATION_ID} robot-ves ${VES_ANY_EVENT_PATH} /eventListener/v7 ${HEADER_STRING} content-type=application/json -${EVENT_DATA_FILE} %{WORKSPACE}/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json +${EVENT_DATA_FILE} %{WORKSPACE}/tests/usecases-5G-bulkpm/5G-bulkpm/assets/json_events/FileExistNotification.json ${TARGETURL_TOPICS} http://${DMAAP_MR_IP}:3904/topics ${TARGETURL_SUBSCR} http://${DMAAP_MR_IP}:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12?timeout=1000 ${CLI_EXEC_CLI} curl -k https://${DR_PROV_IP}:8443/internal/prov ${CLI_EXEC_CLI_FILECONSUMER} docker exec fileconsumer-node /bin/sh -c "ls /opt/app/subscriber/delivery | grep .xml" -${CLI_EXEC_CLI_DFC_LOG} docker exec dfc /bin/sh -c "cat /var/log/ONAP/application.log" > /tmp/dfc_docker.log.robot -${CLI_EXEC_CLI_DFC_LOG_GREP} grep "Datafile file published" /tmp/dfc_docker.log.robot +${CLI_EXEC_CLI_DFC_LOG} docker exec dcaegen2-datafile-collector /bin/sh -c "cat /var/log/ONAP/application.log" > %{WORKSPACE}/archives/dfc_docker.log +${CLI_EXEC_CLI_DFC_LOG_GREP} grep "Datafile file published" %{WORKSPACE}/archives/dfc_docker.log ${CLI_EXEC_CLI_FILECONSUMER_CP} docker cp fileconsumer-node:/opt/app/subscriber/delivery/A20181002.0000-1000-0015-1000_5G.xml.M %{WORKSPACE} -${CLI_EXEC_RENAME_METADATA} mv %{WORKSPACE}/A20181002.0000-1000-0015-1000_5G.xml.M %{WORKSPACE}/metadata.json -${CLI_EXEC_CLI_PMMAPPER_LOG} docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper_docker.log.robot -${CLI_EXEC_CLI_PMMAPPER_LOG_GREP} grep "XML validation successful Event" /tmp/pmmapper_docker.log.robot -${CLI_EXEC_CLI_PMMAPPER_LOG_GREP_VES} grep "Successfully published VES events to messagerouter" /tmp/pmmapper_docker.log.robot -${metadataSchemaPath} %{WORKSPACE}/tests/usecases/5G-bulkpm/assets/metadata.schema.json -${metadataJsonPath} %{WORKSPACE}/metadata.json +${CLI_EXEC_RENAME_METADATA} mv %{WORKSPACE}/A20181002.0000-1000-0015-1000_5G.xml.M %{WORKSPACE}/archives/metadata.json +${CLI_EXEC_CLI_PMMAPPER_LOG} docker exec dcaegen2-pm-mapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > %{WORKSPACE}/archives/pmmapper_docker.log +${CLI_EXEC_CLI_PMMAPPER_LOG_GREP} grep "XML validation successful Event" %{WORKSPACE}/archives/pmmapper_docker.log +${CLI_EXEC_CLI_PMMAPPER_LOG_GREP_VES} grep "Successfully published VES events to messagerouter" %{WORKSPACE}/archives/pmmapper_docker.log +${metadataSchemaPath} %{WORKSPACE}/tests/usecases-5G-bulkpm/5G-bulkpm/assets/metadata.schema.json +${metadataJsonPath} %{WORKSPACE}/archives/metadata.json *** Test Cases *** @@ -79,7 +81,7 @@ Verify Default Feed And File Consumer Subscription On Datarouter Log ${cli_cmd_output.stdout} Should Be Equal As Strings ${cli_cmd_output.rc} 0 Should Contain ${cli_cmd_output.stdout} https://dmaap-dr-prov/publish/1 - Should Contain ${cli_cmd_output.stdout} http://${DR_SUBSCIBER_IP}:7070 + Should Contain ${cli_cmd_output.stdout} http://datarouter-subscriber:7070 Verify Fileconsumer Receive PM file from Data Router diff --git a/tests/usecases/5G-bulkpm/__init__.robot b/tests/usecases-5G-bulkpm/5G-bulkpm/__init__.robot similarity index 100% rename from tests/usecases/5G-bulkpm/__init__.robot rename to tests/usecases-5G-bulkpm/5G-bulkpm/__init__.robot diff --git a/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json b/tests/usecases-5G-bulkpm/5G-bulkpm/assets/json_events/FileExistNotification.json similarity index 95% rename from tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json rename to tests/usecases-5G-bulkpm/5G-bulkpm/assets/json_events/FileExistNotification.json index 375dbd80..02f092df 100644 --- a/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json +++ b/tests/usecases-5G-bulkpm/5G-bulkpm/assets/json_events/FileExistNotification.json @@ -21,7 +21,7 @@ "arrayOfNamedHashMap": [ { "name": "A20181002.0000-1000-0015-1000_5G.xml.gz", "hashMap":{ - "location": "sftp://admin:admin@sftpserver:sftpport/A20181002.0000-1000-0015-1000_5G.xml.gz", + "location": "sftp://admin:admin@sftp:22/A20181002.0000-1000-0015-1000_5G.xml.gz", "compression": "gzip", "fileFormatType": "org.3GPP.32.435#measCollec", "fileFormatVersion": "V10" diff --git a/tests/usecases/5G-bulkpm/assets/metadata.schema.json b/tests/usecases-5G-bulkpm/5G-bulkpm/assets/metadata.schema.json similarity index 100% rename from tests/usecases/5G-bulkpm/assets/metadata.schema.json rename to tests/usecases-5G-bulkpm/5G-bulkpm/assets/metadata.schema.json diff --git a/tests/usecases/5G-bulkpm/resources/JsonValidatorLibrary.py b/tests/usecases-5G-bulkpm/5G-bulkpm/resources/JsonValidatorLibrary.py similarity index 68% rename from tests/usecases/5G-bulkpm/resources/JsonValidatorLibrary.py rename to tests/usecases-5G-bulkpm/5G-bulkpm/resources/JsonValidatorLibrary.py index 12d5d856..ed376ff2 100644 --- a/tests/usecases/5G-bulkpm/resources/JsonValidatorLibrary.py +++ b/tests/usecases-5G-bulkpm/5G-bulkpm/resources/JsonValidatorLibrary.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -import sys import logging -from simplejson import load + from jsonschema import validate, ValidationError, SchemaError +from simplejson import load class JsonValidatorLibrary(object): @@ -11,14 +11,15 @@ class JsonValidatorLibrary(object): def __init__(self): pass - def validate(self, schemaPath, jsonPath): - logging.info("Schema path: " + schemaPath) - logging.info("JSON path: " + jsonPath) + @staticmethod + def validate(schema_path, json_path): + logging.info("Schema path: " + schema_path) + logging.info("JSON path: " + json_path) schema = None data = None try: - schema = load(open(schemaPath, 'r')) - data = load(open(jsonPath, 'r')) + schema = load(open(schema_path, 'r')) + data = load(open(json_path, 'r')) except (IOError, ValueError, OSError) as e: logging.error(e.message) return 1 @@ -33,6 +34,7 @@ class JsonValidatorLibrary(object): print("JSON validation successful") return 0 + if __name__ == '__main__': lib = JsonValidatorLibrary() - # sys.exit(JsonValidatorLibrary().validate(sys.argv[1], sys.argv[2])) +# sys.exit(JsonValidatorLibrary().validate(sys.argv[1], sys.argv[2])) diff --git a/tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot b/tests/usecases-5G-bulkpm/5G-bulkpm/resources/bulkpm_keywords.robot similarity index 100% rename from tests/usecases/5G-bulkpm/resources/bulkpm_keywords.robot rename to tests/usecases-5G-bulkpm/5G-bulkpm/resources/bulkpm_keywords.robot diff --git a/tests/usecases/5G-bulkpm/resources/xNFLibrary.py b/tests/usecases-5G-bulkpm/5G-bulkpm/resources/xNFLibrary.py similarity index 60% rename from tests/usecases/5G-bulkpm/resources/xNFLibrary.py rename to tests/usecases-5G-bulkpm/5G-bulkpm/resources/xNFLibrary.py index 01574f77..b70d8095 100644 --- a/tests/usecases/5G-bulkpm/resources/xNFLibrary.py +++ b/tests/usecases-5G-bulkpm/5G-bulkpm/resources/xNFLibrary.py @@ -3,23 +3,28 @@ Created on Aug 18, 2017 @author: sw6830 ''' +import time +import uuid + from robot.api import logger -from Queue import Queue -import uuid, time, json, threading,os, platform, subprocess,paramiko + class xNFLibrary(object): def __init__(self): pass - def create_header_from_string(self, dictStr): + @staticmethod + def create_header_from_string(dict_str): logger.info("Enter create_header_from_string: dictStr") - return dict(u.split("=") for u in dictStr.split(",")) + return dict(u.split("=") for u in dict_str.split(",")) + @staticmethod def Generate_UUID(self): """generate a uuid""" return uuid.uuid4() + if __name__ == '__main__': lib = xNFLibrary() - time.sleep(100000) \ No newline at end of file + time.sleep(100000) diff --git a/tests/usecases/config-over-netconf/__init__.robot b/tests/usecases-config-over-netconf/config-over-netconf/__init__.robot similarity index 100% rename from tests/usecases/config-over-netconf/__init__.robot rename to tests/usecases-config-over-netconf/config-over-netconf/__init__.robot diff --git a/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot b/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot new file mode 100644 index 00000000..21c03c6f --- /dev/null +++ b/tests/usecases-config-over-netconf/config-over-netconf/config_over_netconf.robot @@ -0,0 +1,69 @@ +*** Settings *** +Library Collections +Library RequestsLibrary +Library OperatingSystem +Library json +Library String + +*** Variables *** +${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore +${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator +${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist +${BP_UPLOAD_URL} /api/v1/execution-service/upload +${BP_PROCESS_URL} /api/v1/execution-service/process +${BP_ARCHIVE_PATH} ${CURDIR}/data/blueprint_archive.zip + + +*** Test Cases *** +Test SDNC Keystore + [Documentation] Checking keystore after SDNC installation + Create Session sdnc http://localhost:8282/restconf + &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json + ${resp}= Get Request sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 200 + ${keystoreContent}= Convert To String ${resp.content} + Log to console ************************* + Log to console ${resp.content} + Log to console ************************* + +Test BP-PROC upload blueprint archive + [Documentation] Upload Blueprint archive to BP processor + Create Session blueprint http://localhost:8000 + ${bp_archive}= Get Binary File ${BP_ARCHIVE_PATH} + &{bp_file}= create Dictionary file ${bp_archive} + &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== + ${resp}= Post Request blueprint ${BP_UPLOAD_URL} files=${bp_file} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 200 + +Test BP-PROC CONFIG-ASSIGN + [Documentation] Send config-assign request to BP-Proc + Create Session blueprint http://localhost:8000 + ${config-assign}= Get File ${CURDIR}${/}data${/}config-assign.json + Log to console ${config-assign} + &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json + ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-assign} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 200 + +Test BP-PROC CONFIG-DEPLOY + [Documentation] Send config-deploy request to BP-Proc + Create Session blueprint http://localhost:8000 + ${config-deploy}= Get File ${CURDIR}${/}data${/}config-deploy.json + Log to console ${config-deploy} + &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json + ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-deploy} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 200 + +Test PNF Configuration update + [Documentation] Checking PNF configuration params + Create Session sdnc http://localhost:8282/restconf + ${mount}= Get File ${CURDIR}${/}data${/}mount.xml + Log to console ${mount} + &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/xml Accept=application/xml + ${resp}= Put Request sdnc ${SDNC_MOUNT_PATH} data=${mount} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 201 + Sleep 10 + &{headers1}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json + ${resp1}= Get Request sdnc ${PNFSIM_MOUNT_PATH} headers=${headers1} + Should Be Equal As Strings ${resp1.status_code} 200 + Log to console ${resp1.content} + Should Contain ${resp1.text} {"netconf-id":30,"netconf-param":3000} diff --git a/tests/usecases/config-over-netconf/data/blueprint_archive.zip b/tests/usecases-config-over-netconf/config-over-netconf/data/blueprint_archive.zip similarity index 100% rename from tests/usecases/config-over-netconf/data/blueprint_archive.zip rename to tests/usecases-config-over-netconf/config-over-netconf/data/blueprint_archive.zip diff --git a/tests/usecases/config-over-netconf/data/config-assign.json b/tests/usecases-config-over-netconf/config-over-netconf/data/config-assign.json similarity index 100% rename from tests/usecases/config-over-netconf/data/config-assign.json rename to tests/usecases-config-over-netconf/config-over-netconf/data/config-assign.json diff --git a/tests/usecases/config-over-netconf/data/config-deploy.json b/tests/usecases-config-over-netconf/config-over-netconf/data/config-deploy.json similarity index 100% rename from tests/usecases/config-over-netconf/data/config-deploy.json rename to tests/usecases-config-over-netconf/config-over-netconf/data/config-deploy.json diff --git a/tests/usecases/config-over-netconf/data/mount.xml b/tests/usecases-config-over-netconf/config-over-netconf/data/mount.xml similarity index 100% rename from tests/usecases/config-over-netconf/data/mount.xml rename to tests/usecases-config-over-netconf/config-over-netconf/data/mount.xml diff --git a/tests/usecases/pnf-sw-upgrade/.gitignore b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/.gitignore similarity index 100% rename from tests/usecases/pnf-sw-upgrade/.gitignore rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/.gitignore diff --git a/tests/usecases/pnf-sw-upgrade/__init__.robot b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/__init__.robot similarity index 100% rename from tests/usecases/pnf-sw-upgrade/__init__.robot rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/__init__.robot diff --git a/tests/usecases/pnf-sw-upgrade/data/blueprint_archive.zip b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/blueprint_archive.zip similarity index 100% rename from tests/usecases/pnf-sw-upgrade/data/blueprint_archive.zip rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/blueprint_archive.zip diff --git a/tests/usecases/pnf-sw-upgrade/data/distributeServiceTemplate.json b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/distributeServiceTemplate.json similarity index 100% rename from tests/usecases/pnf-sw-upgrade/data/distributeServiceTemplate.json rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/distributeServiceTemplate.json diff --git a/tests/usecases/pnf-sw-upgrade/data/mount.json b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/mount.json similarity index 100% rename from tests/usecases/pnf-sw-upgrade/data/mount.json rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/mount.json diff --git a/tests/usecases/pnf-sw-upgrade/data/serviceInstantiationActivationRequest.json b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/serviceInstantiationActivationRequest.json similarity index 100% rename from tests/usecases/pnf-sw-upgrade/data/serviceInstantiationActivationRequest.json rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/serviceInstantiationActivationRequest.json diff --git a/tests/usecases/pnf-sw-upgrade/data/serviceInstantiationDownloadRequest.json b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/serviceInstantiationDownloadRequest.json similarity index 100% rename from tests/usecases/pnf-sw-upgrade/data/serviceInstantiationDownloadRequest.json rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/data/serviceInstantiationDownloadRequest.json diff --git a/tests/usecases/pnf-sw-upgrade/pnf-sw-upgrade.robot b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/pnf-sw-upgrade.robot similarity index 63% rename from tests/usecases/pnf-sw-upgrade/pnf-sw-upgrade.robot rename to tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/pnf-sw-upgrade.robot index 70408366..738a4311 100644 --- a/tests/usecases/pnf-sw-upgrade/pnf-sw-upgrade.robot +++ b/tests/usecases-pnf-sw-upgrade/pnf-sw-upgrade/pnf-sw-upgrade.robot @@ -19,21 +19,21 @@ ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}= 20 *** Test Cases *** Test SDNC Keystore - [Documentation] Checking keystore after SDNC installation - Create Session sdnc http://${REPO_IP}:8282 - &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json - ${resp}= Get Request sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - ${keystoreContent}= Convert To String ${resp.content} - Log to console ************************* - Log to console ${resp.content} - Log to console ************************* + [Documentation] Checking keystore after SDNC installation + Create Session sdnc http://${REPO_IP}:8282 + &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json + ${resp}= Get Request sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} + Should Be Equal As Strings ${resp.status_code} 200 + ${keystoreContent}= Convert To String ${resp.content} + Log to console ************************* + Log to console ${resp.content} + Log to console ************************* Test BP-PROC upload blueprint archive [Documentation] Upload Blueprint archive to BP processor Create Session blueprint http://${REPO_IP}:8000 ${bp_archive}= Get Binary File ${BP_ARCHIVE_PATH} - &{bp_file}= create Dictionary file ${bp_archive} + &{bp_file}= create Dictionary file ${bp_archive} &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== ${resp}= Post Request blueprint ${BP_UPLOAD_URL} files=${bp_file} headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 @@ -62,19 +62,18 @@ Get pnf workflow ${activate_workflow_name}= Set Variable "" ${download_workflow_uuid}= Set Variable "" ${download_workflow_name}= Set Variable "" + FOR ${member} IN @{all_wf_members} + ${workflow_uuid}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactUuid] + ${workflow_name}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactName] + Log to console The workflow ${workflow_name} has uuid : ${workflow_uuid} + ${activate_workflow_uuid}= Set Variable If '${workflow_name}' == 'PNFSoftwareUpgrade' ${workflow_uuid} ${activate_workflow_uuid} + ${activate_workflow_name}= Set Variable If '${workflow_name}' == 'PNFSoftwareUpgrade' ${workflow_name} ${activate_workflow_name} + ${download_workflow_uuid}= Set Variable If '${workflow_name}' == 'PNFSWUPDownload' ${workflow_uuid} ${download_workflow_uuid} + ${download_workflow_name}= Set Variable If '${workflow_name}' == 'PNFSWUPDownload' ${workflow_name} ${download_workflow_name} + END - :FOR ${member} IN @{all_wf_members} - \ ${workflow_uuid}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactUuid] - \ ${workflow_name}= Set Variable ${member}[workflowSpecification][artifactInfo][artifactName] - \ Log to console The workflow ${workflow_name} has uuid : ${workflow_uuid} - \ ${activate_workflow_uuid}= Set Variable If '${workflow_name}' == 'PNFSoftwareUpgrade' ${workflow_uuid} ${activate_workflow_uuid} - \ ${activate_workflow_name}= Set Variable If '${workflow_name}' == 'PNFSoftwareUpgrade' ${workflow_name} ${activate_workflow_name} - \ ${download_workflow_uuid}= Set Variable If '${workflow_name}' == 'PNFSWUPDownload' ${workflow_uuid} ${download_workflow_uuid} - \ ${download_workflow_name}= Set Variable If '${workflow_name}' == 'PNFSWUPDownload' ${workflow_name} ${download_workflow_name} - SET GLOBAL VARIABLE ${activate_workflow_uuid} SET GLOBAL VARIABLE ${download_workflow_uuid} - Run Keyword If '${activate_workflow_name}' == 'PNFSoftwareUpgrade' log to console \nexecuted with expected result Run Keyword If '${download_workflow_name}' == 'PNFSWUPDownload' log to console \nexecuted with expected result Should Be Equal As Strings '${activate_workflow_name}' 'PNFSoftwareUpgrade' @@ -90,25 +89,23 @@ Invoke Service Instantiation for pnf software download ${service_instantiation_json_response}= Evaluate json.loads(r"""${service_instantiation_request.content}""", strict=False) json ${request_ID}= Set Variable ${service_instantiation_json_response}[requestReferences][requestId] ${actual_request_state}= Set Variable "" - - : FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} - \ ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID} - \ Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result - \ log to console ${orchestration_status_request.content} - \ ${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json - \ ${actual_request_state}= SET VARIABLE ${orchestration_json_response}[request][requestStatus][requestState] - \ Log To Console Received actual repsonse status:${actual_request_state} - \ RUN KEYWORD IF '${actual_request_state}' == 'COMPLETED' or '${actual_request_state}' == 'FAILED' Exit For Loop - \ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds - \ SLEEP ${SLEEP_INTERVAL_SEC}s - + FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} + ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID} + Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result + log to console ${orchestration_status_request.content} + ${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json + ${actual_request_state}= SET VARIABLE ${orchestration_json_response}[request][requestStatus][requestState] + Log To Console Received actual repsonse status:${actual_request_state} + RUN KEYWORD IF '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED' Exit For Loop + log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds + SLEEP ${SLEEP_INTERVAL_SEC}s + END Log To Console final repsonse status received: ${actual_request_state} - Run Keyword If '${actual_request_state}' == 'COMPLETED' log to console \nexecuted with expected result - Should Be Equal As Strings '${actual_request_state}' 'COMPLETED' + Run Keyword If '${actual_request_state}' == 'COMPLETE' log to console \nexecuted with expected result + Should Be Equal As Strings '${actual_request_state}' 'COMPLETE' Test verify PNF Configuration for software download [Documentation] Checking PNF configuration params - Create Session sdnc http://${REPO_IP}:8282 &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json ${mount}= Get File ${CURDIR}${/}data${/}mount.json @@ -121,13 +118,12 @@ Test verify PNF Configuration for software download Log to console ${pnfsim_software_resp.content} ${pnfsim_software_resp_json}= Evaluate json.loads(r"""${pnfsim_software_resp.content}""", strict=False) json ${all_upgp_members}= Set Variable ${pnfsim_software_resp_json['software-upgrade']['upgrade-package']} - - :FOR ${member} IN @{all_upgp_members} - \ ${soft_ver}= Get From Dictionary ${member} software-version - \ ${soft_status}= Get From Dictionary ${member} current-status - \ Log to console The node ${pnfName} has software version ${soft_ver} : ${soft_status} - \ Run Keyword If '${soft_ver}' == 'pnf_sw_version-2.0.0' Exit For Loop - + FOR ${member} IN @{all_upgp_members} + ${soft_ver}= Get From Dictionary ${member} software-version + ${soft_status}= Get From Dictionary ${member} current-status + Log to console The node ${pnfName} has software version ${soft_ver} : ${soft_status} + Run Keyword If '${soft_ver}' == 'pnf_sw_version-2.0.0' Exit For Loop + END Run Keyword If '${soft_ver}' == 'pnf_sw_version-2.0.0' log to console \nexecuted with expected result Should Be Equal As Strings '${soft_ver}' 'pnf_sw_version-2.0.0' Should Be Equal As Strings '${soft_status}' 'DOWNLOAD_COMPLETED' @@ -142,24 +138,23 @@ Invoke Service Instantiation for pnf software activation ${service_instantiation_json_response}= Evaluate json.loads(r"""${service_instantiation_request.content}""", strict=False) json ${request_ID}= Set Variable ${service_instantiation_json_response}[requestReferences][requestId] ${actual_request_state}= Set Variable "" - : FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} - \ ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID} - \ Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result - \ log to console ${orchestration_status_request.content} - \ ${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json - \ ${actual_request_state}= SET VARIABLE ${orchestration_json_response}[request][requestStatus][requestState] - \ Log To Console Received actual repsonse status:${actual_request_state} - \ RUN KEYWORD IF '${actual_request_state}' == 'COMPLETED' or '${actual_request_state}' == 'FAILED' Exit For Loop - \ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds - \ SLEEP ${SLEEP_INTERVAL_SEC}s - + FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} + ${orchestration_status_request}= Get Request api_handler_session /onap/so/infra/orchestrationRequests/v7/${request_ID} + Run Keyword If '${orchestration_status_request.status_code}' == '200' log to console \nexecuted with expected result + log to console ${orchestration_status_request.content} + ${orchestration_json_response}= Evaluate json.loads(r"""${orchestration_status_request.content}""", strict=False) json + ${actual_request_state}= SET VARIABLE ${orchestration_json_response}[request][requestStatus][requestState] + Log To Console Received actual repsonse status:${actual_request_state} + RUN KEYWORD IF '${actual_request_state}' == 'COMPLETE' or '${actual_request_state}' == 'FAILED' Exit For Loop + log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds + SLEEP ${SLEEP_INTERVAL_SEC}s + END Log To Console final repsonse status received: ${actual_request_state} - Run Keyword If '${actual_request_state}' == 'COMPLETED' log to console \nexecuted with expected result - Should Be Equal As Strings '${actual_request_state}' 'COMPLETED' - -Test verify PNF Configuration for software activate - [Documentation] Checking PNF configuration params + Run Keyword If '${actual_request_state}' == 'COMPLETE' log to console \nexecuted with expected result + Should Be Equal As Strings '${actual_request_state}' 'COMPLETE' +Test verify PNF Configuration for software activate + [Documentation] Checking PNF configuration params Create Session sdnc http://${REPO_IP}:8282 &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json ${mount}= Get File ${CURDIR}${/}data${/}mount.json @@ -172,13 +167,12 @@ Test verify PNF Configuration for software activate Log to console ${pnfsim_software_resp.content} ${pnfsim_software_resp_json}= Evaluate json.loads(r"""${pnfsim_software_resp.content}""", strict=False) json ${all_upgp_members}= Set Variable ${pnfsim_software_resp_json['software-upgrade']['upgrade-package']} - - :FOR ${member} IN @{all_upgp_members} - \ ${soft_ver}= Get From Dictionary ${member} software-version - \ ${soft_status}= Get From Dictionary ${member} current-status - \ Log to console The node ${pnfName} has software version ${soft_ver} : ${soft_status} - \ Run Keyword If '${soft_ver}' == 'pnf_sw_version-3.0.0' Exit For Loop - + FOR ${member} IN @{all_upgp_members} + ${soft_ver}= Get From Dictionary ${member} software-version + ${soft_status}= Get From Dictionary ${member} current-status + Log to console The node ${pnfName} has software version ${soft_ver} : ${soft_status} + Run Keyword If '${soft_ver}' == 'pnf_sw_version-3.0.0' Exit For Loop + END Run Keyword If '${soft_ver}' == 'pnf_sw_version-3.0.0' log to console \nexecuted with expected result Should Be Equal As Strings '${soft_ver}' 'pnf_sw_version-3.0.0' Should Be Equal As Strings '${soft_status}' 'ACTIVATION_COMPLETED' @@ -186,17 +180,17 @@ Test verify PNF Configuration for software activate Test AAI-update for target software version verify Create Session aai_simulator_session https://${REPO_IP}:9993 &{headers}= Create Dictionary Authorization=Basic YWFpOmFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== Content-Type=application/json Accept=application/json verify=False - : FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} - \ ${get_pnf_request}= Get Request aai_simulator_session aai/v11/network/pnfs/pnf/${pnfName} headers=${headers} - \ Run Keyword If '${get_pnf_request.status_code}' == '200' log to console \nexecuted with expected result - \ ${get_pnf_json_response}= Evaluate json.loads(r"""${get_pnf_request.content}""", strict=False) json - \ Log to console ${get_pnf_json_response} - \ ${sw_version}= Set Variable ${get_pnf_json_response}[sw-version] - \ Log to console ${sw_version} - \ Run Keyword If '${sw_version}' == 'pnf_sw_version-3.0.0' Exit For Loop - \ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds - \ SLEEP ${SLEEP_INTERVAL_SEC}s - + FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT} + ${get_pnf_request}= Get Request aai_simulator_session aai/v11/network/pnfs/pnf/${pnfName} headers=${headers} + Run Keyword If '${get_pnf_request.status_code}' == '200' log to console \nexecuted with expected result + ${get_pnf_json_response}= Evaluate json.loads(r"""${get_pnf_request.content}""", strict=False) json + Log to console ${get_pnf_json_response} + ${sw_version}= Set Variable ${get_pnf_json_response}[sw-version] + Log to console ${sw_version} + Run Keyword If '${sw_version}' == 'pnf_sw_version-3.0.0' Exit For Loop + log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds + SLEEP ${SLEEP_INTERVAL_SEC}s + END Log To Console final target software version received: ${sw_version} Run Keyword If '${sw_version}' == 'pnf_sw_version-3.0.0' log to console \nexecuted with expected result Should Be Equal As Strings '${sw_version}' 'pnf_sw_version-3.0.0' diff --git a/tests/usecases/config-over-netconf/config_over_netconf.robot b/tests/usecases/config-over-netconf/config_over_netconf.robot deleted file mode 100644 index 2ba64007..00000000 --- a/tests/usecases/config-over-netconf/config_over_netconf.robot +++ /dev/null @@ -1,69 +0,0 @@ -*** Settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -Library json -Library String - -*** Variables *** -${SDNC_KEYSTORE_CONFIG_PATH} /config/netconf-keystore:keystore -${SDNC_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator -${PNFSIM_MOUNT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/pnf-simulator/yang-ext:mount/mynetconf:netconflist -${BP_UPLOAD_URL} /api/v1/execution-service/upload -${BP_PROCESS_URL} /api/v1/execution-service/process -${BP_ARCHIVE_PATH} ${CURDIR}/data/blueprint_archive.zip - - - *** Test Cases *** - Test SDNC Keystore - [Documentation] Checking keystore after SDNC installation - Create Session sdnc http://localhost:8282/restconf - &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json - ${resp}= Get Request sdnc ${SDNC_KEYSTORE_CONFIG_PATH} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - ${keystoreContent}= Convert To String ${resp.content} - Log to console ************************* - Log to console ${resp.content} - Log to console ************************* - - Test BP-PROC upload blueprint archive - [Documentation] Upload Blueprint archive to BP processor - Create Session blueprint http://localhost:8000 - ${bp_archive}= Get Binary File ${BP_ARCHIVE_PATH} - &{bp_file}= create Dictionary file ${bp_archive} - &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== - ${resp}= Post Request blueprint ${BP_UPLOAD_URL} files=${bp_file} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - - Test BP-PROC CONFIG-ASSIGN - [Documentation] Send config-assign request to BP-Proc - Create Session blueprint http://localhost:8000 - ${config-assign}= Get File ${CURDIR}${/}data${/}config-assign.json - Log to console ${config-assign} - &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json - ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-assign} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - - Test BP-PROC CONFIG-DEPLOY - [Documentation] Send config-deploy request to BP-Proc - Create Session blueprint http://localhost:8000 - ${config-deploy}= Get File ${CURDIR}${/}data${/}config-deploy.json - Log to console ${config-deploy} - &{headers}= Create Dictionary Authorization=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw== Content-Type=application/json Accept=application/json - ${resp}= Post Request blueprint ${BP_PROCESS_URL} data=${config-deploy} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 200 - - Test PNF Configuration update - [Documentation] Checking PNF configuration params - Create Session sdnc http://localhost:8282/restconf - ${mount}= Get File ${CURDIR}${/}data${/}mount.xml - Log to console ${mount} - &{headers}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/xml Accept=application/xml - ${resp}= Put Request sdnc ${SDNC_MOUNT_PATH} data=${mount} headers=${headers} - Should Be Equal As Strings ${resp.status_code} 201 - Sleep 10 - &{headers1}= Create Dictionary Authorization=Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ== Content-Type=application/json Accept=application/json - ${resp1}= Get Request sdnc ${PNFSIM_MOUNT_PATH} headers=${headers1} - Should Be Equal As Strings ${resp1.status_code} 200 - Log to console ${resp1.content} - Should Contain ${resp1.text} {"netconf-id":30,"netconf-param":3000} -- 2.16.6