diff options
author | 2019-09-10 15:31:00 +0000 | |
---|---|---|
committer | 2019-09-10 15:31:00 +0000 | |
commit | f5597d47623201fc4bf759e4f9c3209ad2ba7c3b (patch) | |
tree | 556416213a3e067570bd7f63002b73766a51dd14 /plans/so | |
parent | 09bb9100e5ad7da234283984ed9ec4d7d049953b (diff) | |
parent | 2deca5dd5f9344e8d81aebc2b4bc0994add9a2ef (diff) |
Merge "Changing sdc directory to unzipped_sdc_csar"
Diffstat (limited to 'plans/so')
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/requestBody.json | 102 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar) | bin | 71960 -> 71960 bytes | |||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml) | 0 | ||||
-rw-r--r-- | plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml (renamed from plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml) | 0 | ||||
-rwxr-xr-x | plans/so/integration-etsi-testing/config/wait-for-container.sh | 11 |
29 files changed, 9 insertions, 104 deletions
diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/requestBody.json b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/requestBody.json deleted file mode 100644 index 47a9f21b..00000000 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/requestBody.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "distributionID": "cfe30d6c-eb67-4ffb-ba98-4b654162223a", - "serviceName": "manualDistributionTestService", - "serviceVersion": "1.0", - "serviceUUID": "28d4acf3-4791-4998-8d06-1cdf6d1767a9", - "serviceDescription": "Test", - "serviceInvariantUUID": "0ddc448d-5513-44bc-8b02-5759d84600d5", - "resources": [ - { - "resourceInstanceName": "manualDistributionTestVNF 0", - "resourceCustomizationUUID": "82ad3aa0-edc6-410c-a217-655fb064323f", - "resourceName": "manualDistributionTestVNF", - "resourceVersion": "1.0", - "resoucreType": "VF", - "resourceUUID": "e8e39dc4-4761-4da7-aedf-7d1fd3637772", - "resourceInvariantUUID": "0a0b9979-863d-4b7e-b7f4-d27725a182b3", - "category": "Application L4+", - "subcategory": "Media Servers", - "artifacts": [ - { - "artifactName": "manualdistributiontestvnf0_modules.json", - "artifactType": "VF_MODULES_METADATA", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json", - "artifactChecksum": "NTc0NDlkNzdmYzVmMDM3ZjMxMTE2NDBmYWJiMDM1NzY\u003d", - "artifactDescription": "Auto-generated VF Modules information artifact", - "artifactTimeout": 120, - "artifactVersion": "1", - "artifactUUID": "a10f397a-6546-4a27-843f-25821955ef3e", - "relatedArtifactsInfo": [] - }, - { - "artifactName": "base_ves_med1.yaml", - "artifactType": "HEAT", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml", - "artifactChecksum": "YTAwNTQ3NjczY2Y5MmUwZjUzZTY1ZjNhNTA0NGQyMDY\u003d", - "artifactDescription": "created from csar", - "artifactTimeout": 120, - "artifactVersion": "2", - "artifactUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295", - "generatedArtifact": { - "artifactName": "base_ves_med1.env", - "artifactType": "HEAT_ENV", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env", - "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d", - "artifactDescription": "Auto-generated HEAT Environment deployment artifact", - "artifactTimeout": 120, - "artifactVersion": "2", - "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951", - "generatedFromUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295" - }, - "relatedArtifactsInfo": [] - }, - { - "artifactName": "base_ves_med1.env", - "artifactType": "HEAT_ENV", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env", - "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d", - "artifactDescription": "Auto-generated HEAT Environment deployment artifact", - "artifactTimeout": 120, - "artifactVersion": "2", - "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951", - "relatedArtifactsInfo": [] - }, - { - "artifactName": "TOSCA.meta", - "artifactType": "OTHER", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta", - "artifactChecksum": "NWE2ODcyOWY0NGI2MzEyOGViYjUxNTEwMjU5OWRhZmI\u003d", - "artifactDescription": "created from csar", - "artifactTimeout": 120, - "artifactVersion": "1", - "artifactUUID": "6c64d38b-186f-4339-9a76-a266c40f40ec", - "relatedArtifactsInfo": [] - }, - { - "artifactName": "descriptor.yaml", - "artifactType": "OTHER", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml", - "artifactChecksum": "YWZkNTg2ZGMzZjRhZjgxNzNkODJiNjgwZmRlZjlmNDE\u003d", - "artifactDescription": "created from csar", - "artifactTimeout": 120, - "artifactVersion": "1", - "artifactUUID": "4bd0cdf6-0b12-4d19-b3d8-6dbc34fe397e", - "relatedArtifactsInfo": [] - } - ] - } - ], - "serviceArtifacts": [ - { - "artifactName": "service-Manualdistributiontestservice-csar.csar", - "artifactType": "TOSCA_CSAR", - "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar", - "artifactChecksum": "YWYxNmUxNTlhMmE3MjA1NGVhNTBhYTdkMmU0OTZjNzM\u003d", - "artifactDescription": "TOSCA definition package of the asset", - "artifactTimeout": 0, - "artifactVersion": "1", - "artifactUUID": "e6e8c36a-b939-4845-995a-41c50be890a0" - } - ], - "workloadContext": "Production" -} diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar Binary files differindex c7a325e4..c7a325e4 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta index 78e5dff0..78e5dff0 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt index 2fb08492..2fb08492 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/VSP_manualDistributionTestVSP_Information.txt diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml index 2f146061..2f146061 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/annotations.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml index a4fb0fe2..a4fb0fe2 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/artifacts.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env index 2c73cedc..2c73cedc 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml index aa51a80b..aa51a80b 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml index 85af71a8..85af71a8 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/capabilities.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta index bc3359ce..bc3359ce 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/csar.meta diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml index 552513af..552513af 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/data.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml index 7192b690..7192b690 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml index 3fd26fff..3fd26fff 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/groups.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml index 35353603..35353603 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/interfaces.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json index 9098234e..9098234e 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml index d188dd1b..d188dd1b 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/nodes.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml index 4bef4e92..4bef4e92 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/policies.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml index fe4b9880..fe4b9880 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/relationships.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml index b51a72f9..b51a72f9 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Extneutroncp-template.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml index 6d4cd7b3..6d4cd7b3 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template-interface.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml index 9d5bc204..9d5bc204 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-Manualdistributiontestvsp-template.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml index 5c7c990a..5c7c990a 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspComputeNodesHeatSimple-template.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml index a5ce7c7f..a5ce7c7f 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template-interface.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml index 21093271..21093271 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/resource-ManualdistributiontestvspNodesSimplecvfc-template.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml index aa3f5456..aa3f5456 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template-interface.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml index defdf0a8..defdf0a8 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/service-Manualdistributiontestservice-template.yml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml index f25ff824..f25ff824 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vendor-license-model.xml diff --git a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml index f4369f1f..f4369f1f 100644 --- a/plans/so/integration-etsi-testing/config/distribution-test-unzipped/sdc/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml +++ b/plans/so/integration-etsi-testing/config/distribution-test-unzipped/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/vf-license-model.xml diff --git a/plans/so/integration-etsi-testing/config/wait-for-container.sh b/plans/so/integration-etsi-testing/config/wait-for-container.sh index 598715d9..35ee2641 100755 --- a/plans/so/integration-etsi-testing/config/wait-for-container.sh +++ b/plans/so/integration-etsi-testing/config/wait-for-container.sh @@ -118,16 +118,23 @@ process_arguments() exit 1 fi + result=$(docker inspect --format '{{.State.Running}}' $CONTAINER_NAME) + + if [ $result != "true" ] ; then + echo "$SCRIPT_NAME $(current_timestamp) ERROR: $CONTAINER_NAME container is not running" + exit 1 + fi + HOST_IP=$(docker inspect --format '{{ index .NetworkSettings.Networks "'$NETWORK_NAME'" "IPAddress"}}' $CONTAINER_NAME) - if [ $? -ne 0 ]; then + if [ $? -ne 0 ] || [ -z $HOST_IP ] ; then echo "$SCRIPT_NAME $(current_timestamp) ERROR: Unable to find HOST IP using network name: $NETWORK_NAME and container name: $CONTAINER_NAME" exit 1 fi PORT=$(docker port $CONTAINER_NAME | cut -c1-$(docker port $CONTAINER_NAME | grep -aob '/' | grep -oE '[0-9]+')) - if [ $? -ne 0 ]; then + if [ $? -ne 0 ] || [ -z $PORT ] ; then echo "$SCRIPT_NAME $(current_timestamp) ERROR: Unable to find PORT using project name: $PROJECT_NAME and container name: $CONTAINER_NAME" exit 1 fi |