diff options
Diffstat (limited to 'vid-automation/src')
33 files changed, 420 insertions, 68 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java new file mode 100644 index 000000000..5a43e10dc --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java @@ -0,0 +1,91 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class PresetAAIModelVersionsByInvariantId extends BaseAAIPreset { + + + @Override + public String getReqPath() { + return getRootPath() + "/query"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of( + "format", Collections.singletonList("resource"), + "depth", Collections.singletonList("0") + ); + } + + @Override + public Object getRequestBody() { + return ImmutableMap.of( + "start", ImmutableList.of("service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea"), + "query", "query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK" + ); + // "{" + + // " \"start\": [\"service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea"]," + + // " \"query\": \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"" + + // "}"; + } + + @Override + public Object getResponseBody() { + return "{" + + " \"results\": [" + + " {" + + " \"model\": {" + + " \"model-invariant-id\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"," + + " \"model-type\": \"service\"," + + " \"resource-version\": \"1534274421300\"" + + " }" + + " }," + + " {" + + " \"model-ver\": {" + + " \"model-version-id\": \"a92f899d-a3ec-465b-baed-1663b0a5aee1\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"3.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534788756086\"" + + " }" + + " }," + + " {" + + " \"model-ver\": {" + + " \"model-version-id\": \"d2fda667-e92e-4cfa-9620-5da5de01a319\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"1.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534444087221\"" + + " }" + + " }," + + " {" + + " \"model-ver\": {" + + " \"model-version-id\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"11.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging the-newest-version\"," + + " \"resource-version\": \"1550783120267\"" + + " }" + + " }" + + " ]" + + + "}"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.PUT; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java index ce0f8fd71..29e1365af 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java @@ -8,7 +8,7 @@ public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstance @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v."; + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java index 39b415fa2..9a41e5bea 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java @@ -6,7 +6,7 @@ package org.onap.simulator.presetGenerator.presets.mso; public class PresetMSOCreateServiceInstancePost extends PresetMSOBaseCreateInstancePost { public String getReqPath() { - return getRootPath() + "/serviceInstances/v."; + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java index 764237e18..5a0b7525f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java @@ -28,11 +28,8 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese @Override public String getReqPath() { - if (isVolumeGroupPreset) { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups"; - } else { - return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules"; - } + String trailer = isVolumeGroupPreset ? "/volumeGroups" : "/vfModules"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + trailer; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java index 42e2a7097..0f4a0429c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java @@ -16,7 +16,7 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java index 964d37e84..d94a681fd 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java @@ -24,9 +24,4 @@ public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDeleteWithCloudConf return getRootPath() + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups/" + volumeGroupInstanceId; } - //remove this method once VfModule path starts with /serviceInstantiation/v7/ - @Override - protected String getRootPath() { - return "/mso/serviceInstances/v7/"; - } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java index 6c4b722d6..135438726 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java @@ -25,7 +25,7 @@ public class PresetMSOActOnConfiguration extends PresetMSOBaseCreateInstancePost @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java index 2a7e262a4..d5a4a402c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java @@ -44,7 +44,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + this.serviceInstanceId + "/configurations"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + this.serviceInstanceId + "/configurations"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java index 4d0582c91..5f61fe8f7 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java @@ -21,7 +21,7 @@ public class PresetMSODeleteConfiguration extends PresetMSOBaseCreateInstancePos @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java index db18e0104..fab96fc30 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java @@ -26,7 +26,7 @@ public class PresetMsoEnableDisablePort extends PresetMSOBaseCreateInstancePost @Override public String getReqPath() { - return "/mso/serviceInstances/v./"+serviceInstanceId+"/configurations/"+configurationId+"/" + action; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/"+serviceInstanceId+"/configurations/"+configurationId+"/" + action; } @Override diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 059500cd5..bf1147a6d 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -43,6 +43,8 @@ public enum Features implements Feature { FLAG_1908_VNF_FC_NEW_INSTANTIATION_UI, FLAG_HANDLE_SO_WORKFLOWS, FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT, + FLAG_FLASH_REPLACE_VF_MODULE, + FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, ; public boolean isActive() { diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java index d7903ceef..a701f1029 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java @@ -352,7 +352,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { SimulatorApi.registerExpectationFromPresets(ImmutableList.of( PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, - new PresetAAIGetL3NetworksByCloudRegionSpecificState("irma-aic", "hvf6", "AIN Web Tool-15-D-testalexandria"), + new PresetAAIGetL3NetworksByCloudRegionSpecificState("irma-aic", "hvf6", "bae71557c5bb4d5aac6743a4e5f1d054"), new PresetAAIGetVpnsByType() ), APPEND); diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java index 40af6f8a1..073db0999 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java @@ -54,7 +54,7 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { private String serviceType = "TYLER SILVIA"; private String serviceInstanceToResumeName; - @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + @FeatureTogglingTest({Features.FLAG_1902_VNF_GROUPING, Features.FLAG_FLASH_REPLACE_VF_MODULE}) @Test public void testDeleteVnfGroupWithMembers() { @@ -184,7 +184,7 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { ); } - @FeatureTogglingTest({Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT, Features.FLAG_1908_RESUME_MACRO_SERVICE}) + @FeatureTogglingTest({Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT, Features.FLAG_1908_RESUME_MACRO_SERVICE, Features.FLAG_FLASH_REPLACE_VF_MODULE}) @Test public void testResumeServiceInstanceWithCollectionResource() { diff --git a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json index 3cfcd7af5..bbd8ab217 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", "body": { "requestDetails": { "modelInfo": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json index 85855ad52..eea3caad9 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>", "body": { "requestDetails": { "modelInfo": { @@ -24,4 +24,4 @@ "simulatorResponse": { "responseCode": 500 } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json index d4d253eb4..5cf1c341f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v.", + "path": "/mso/serviceInstantiation/v./serviceInstances", "body": { "requestDetails": { "requestInfo": { @@ -46,4 +46,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json index b794f476c..181e50f72 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", "body": "{\"requestDetails\":{\"modelInfo\":{\"modelType\":\"service\",\"modelInvariantId\":\"709d1be4-9a3f-4a29-8c4d-a20465e808a3\",\"modelVersionId\":\"240376de-870e-48df-915a-31f140eedd2c\",\"modelName\":\"Demo Service 1\",\"modelVersion\":\"1.0\"},\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"us16807000\"},\"relatedInstanceList\":[{\"relatedInstance\":{\"instanceName\":\"MX_960-F722\",\"modelInfo\":{\"modelType\":\"pnf\"}}}],\"requestParameters\":{\"aLaCarte\":true}}}" }, "simulatorResponse": { @@ -13,4 +13,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json index d1fefe20f..ff2f434c1 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships", "body": { "requestDetails": { "modelInfo": { @@ -35,4 +35,4 @@ "responseCode": 500 } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json index 72245ce66..514298ce5 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", "body": { "requestDetails": { "modelInfo": { @@ -40,4 +40,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json index 2744cae54..065d027cc 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", + "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships", "body": { "requestDetails": { "modelInfo": { @@ -34,4 +34,4 @@ "simulatorResponse": { "responseCode": 500 } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java index b7c6e0e46..6b5b08e2b 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java @@ -43,6 +43,7 @@ import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPo import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNull; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS; @@ -771,6 +772,33 @@ public class AaiApiTest extends BaseApiAaiTest { response.getBody()); } + @Test + public void getNewestModelVersionByInvariant() throws JsonProcessingException { + String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea"; + + SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET ); + + String url = uri + + "/aai_get_newest_model_version_by_invariant/" + invariantId; + ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); + + assertTrue(response.toString().contains("the-newest-version")); + } + + @Test + public void getNewestModelVersionByInvariant_modelNotExist_thenEmptyResponse() { + String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea"; + + SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET ); + + String url = uri + + "/aai_get_newest_model_version_by_invariant/" + "model-not-exist"; + ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); + + assertTrue(response.getStatusCode().is2xxSuccessful()); + assertNull(response.getBody()); + } + private void assertResponse(Object expected, String response) { assertResponse(Configuration.empty(), expected, response); } diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java index 1a93a23d0..b6fa0fb9b 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java @@ -1,12 +1,39 @@ package org.onap.vid.api; +import static java.util.Collections.emptyMap; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_INSTANCE_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; -import org.onap.simulator.presetGenerator.presets.mso.*; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseDelete; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteCypress2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteALaCarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import org.onap.vid.model.asyncInstantiation.JobAuditStatus; @@ -24,21 +51,6 @@ import vid.automation.test.services.AsyncJobsService; import vid.automation.test.services.SimulatorApi; import vid.automation.test.services.SimulatorApi.RegistrationStrategy; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import static java.util.Collections.emptyMap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_INSTANCE_ID; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; - @FeatureTogglingTest({Features.FLAG_ASYNC_ALACARTE_VNF}) public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { @@ -440,7 +452,7 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs", pathCounterOverride.getOrDefault("vnfs", defaultValue)), - TestUtils.hasOrLacksOfEntry("/mso/serviceInstances/v./" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups", + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups", pathCounterOverride.getOrDefault("volumeGroups", defaultValue)), TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/vfModules", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json index f54419169..2846baa54 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json @@ -213,6 +213,7 @@ "isMissingData": false, "trackById": "wk10c4hh1oj", "vfModules": {}, + "upgradedVFMSonsCounter": 0, "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1", "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json index 773bfd0dd..366de41b1 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" }, "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json index 73ff898a7..57c132fbf 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json index ce27b5920..eaba1da0f 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json index 7e808b812..919f02289 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json b/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json index fd8171760..70ab0fd1c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json +++ b/vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "DELETE", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1" }, "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json index ef551184d..ea1dfd252 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 202, "body": "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json index 073fd359f..5c4c9ad7c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 404, "body": "" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json index c85b3cb63..ad2bebe2c 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 202, @@ -12,4 +12,4 @@ } } } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json index f8f6fbbbd..8875503b6 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json @@ -1,10 +1,10 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 500, "body": "ERROR_PAYLOAD" } -}
\ No newline at end of file +} diff --git a/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json b/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json new file mode 100644 index 000000000..cf805b7ba --- /dev/null +++ b/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json @@ -0,0 +1,226 @@ +{ + "instanceName":"SERVICE_INSTANCE_NAME", + "action": "None", + "instanceId":"service-instance-id", + "orchStatus":"GARBAGE DATA", + "globalSubscriberId":"global-customer-id", + "subscriptionServiceType":"service-instance-type", + "owningEntityId":null, + "owningEntityName":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "tenantName":null, + "aicZoneId":null, + "aicZoneName":null, + "projectName":null, + "rollbackOnFailure":null, + "isALaCarte":false, + "modelInfo":{ + "modelInvariantId":"d27e42cf-087e-4d31-88ac-6c4b7585f800", + "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44", + "modelName":"vf_vEPDG", + "modelType":"service", + "modelVersion":"1.0" + }, + "vnfs": { + "VNF1_INSTANCE_ID": { + "originalName": null, + "trackById": "VNF1_INSTANCE_ID", + "instanceName": "VNF1_INSTANCE_NAME", + "action": "None", + "instanceId": "VNF1_INSTANCE_ID", + "instanceType": "VNF1_INSTANCE_TYPE", + "orchStatus": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "vnf-instance-model-version-id", + "modelCustomizationId": "vnf-instance-model-customization-id", + "modelType": "vnf" + }, + "uuid": "vnf-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": "olson3", + "cloudOwner": "att-nc", + "legacyRegion": null, + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness": null, + "platformName": null, + "vfModules": {}, + "networks": { + "NETWORK1_INSTANCE_ID": { + "trackById": "NETWORK1_INSTANCE_ID", + "instanceName": "NETWORK1_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK1_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Assigned", + "provStatus": "prov", + "inMaint": false, + "modelInfo": { + "modelInvariantId": "network-instance-model-invariant-id", + "modelVersionId": "network-instance-model-version-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network" + }, + "uuid": "network-instance-model-version-id" + }, + "NETWORK2_INSTANCE_ID": { + "trackById": "NETWORK2_INSTANCE_ID", + "instanceName": "NETWORK2_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK2_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Created", + "provStatus": "prov", + "inMaint": false, + "modelInfo": { + "modelInvariantId": "network-instance-model-invariant-id", + "modelVersionId": "network-instance-model-version-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network" + }, + "uuid": "network-instance-model-version-id" + } + } + }, + "VNF2_INSTANCE_ID": { + "originalName": "VF_vGeraldine 0", + "trackById": "VNF2_INSTANCE_ID", + "instanceName": "VNF2_INSTANCE_NAME", + "action": "None", + "instanceId": "VNF2_INSTANCE_ID", + "instanceType": "VNF2_INSTANCE_TYPE", + "orchStatus": null, + "provStatus": null, + "inMaint": true, + "modelInfo": { + "modelCustomizationName": "VF_vGeraldine 0", + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9", + "modelType": "vnf" + }, + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "productFamilyId": null, + "lcpCloudRegionId": "hvf6", + "cloudOwner": "irma-aic", + "legacyRegion": null, + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "lineOfBusiness": null, + "platformName": null, + "vfModules": { + "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { + "2c1ca484-cbc2-408b-ab86-25a2c15ce280": { + "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", + "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", + "instanceName": "ss820f_0918_db", + "action": "None", + "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", + "instanceType": null, + "orchStatus": "deleted", + "provStatus": null, + "inMaint": true, + "modelInfo": { + "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1", + "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091", + "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750", + "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "modelType": "vfModule" + }, + "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "isBase": false, + "volumeGroupName": null + } + }, + "dc229cd8-c132-4455-8517-5c1787c18b14": { + "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": { + "originalName": null, + "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5", + "instanceName": "ss820f_0918_base", + "action": "None", + "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5", + "instanceType": null, + "orchStatus": "Assigned", + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a", + "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de", + "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14", + "modelType": "vfModule" + }, + "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "isBase": true, + "volumeGroupName": null + } + } + }, + "networks": {} + } + }, + "networks": { + "NETWORK3_INSTANCE_ID": { + "originalName": "ExtVL 0", + "trackById": "NETWORK3_INSTANCE_ID", + "instanceName": "NETWORK3_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK3_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Assigned", + "provStatus": "nvtprov", + "inMaint": false, + "modelInfo": { + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelType": "network" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + }, + "NETWORK4_INSTANCE_ID": { + "originalName": "ExtVL 0", + "trackById": "NETWORK4_INSTANCE_ID", + "instanceName": "NETWORK4_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK4_INSTANCE_ID", + "instanceType": "CONTRAIL30_HIMELGUARD", + "orchStatus": "Created", + "provStatus": "preprov", + "inMaint": false, + "modelInfo": { + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelType": "network" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "validationCounter": 0, + "vnfGroups": {}, + "existingVNFCounterMap": { + "91415b44-753d-494c-926a-456a9172bbb9": 1, + "vnf-instance-model-customization-id": 1 + }, + "existingNetworksCounterMap": { + "94fdd893-4a36-4d70-b16a-ec29c54c184f": 2 + }, + "existingVnfGroupCounterMap": {} +}
\ No newline at end of file |