From e601bbdc43bae9a08e2e10c5139a6f76b47860d7 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 16 Jul 2019 17:17:36 +0300 Subject: Implant vid-app-common org.onap.vid.job (main and test) Issue-ID: VID-378 Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc Signed-off-by: Einat Vinouze Signed-off-by: Ittay Stern --- .../test/resources/WEB-INF/conf/system.properties | 108 +- vid-app-common/src/test/resources/cr-csar.JSON | 7 +- .../src/test/resources/csars/1712_PASQUALE.zip | Bin 0 -> 87747 bytes .../test/resources/csars/csarTransportWithPnfs.zip | Bin 0 -> 33722 bytes .../test/resources/csars/service-AmpPhSvc-csar.zip | Bin 0 -> 56568 bytes .../test/resources/csars/service-Infravpn-csar.zip | Bin 0 -> 36957 bytes .../csars/service-JennyVtsbcVlanSvc-csar.zip | Bin 0 -> 181221 bytes .../csars/service-MsoExampleService-csar.zip | Bin 0 -> 30033 bytes .../service-ServicecontainerContainsPprobe.zip | Bin 0 -> 31473 bytes ...ervice-Servicecontainermultiplepprobes-csar.zip | Bin 0 -> 31463 bytes .../resources/csars/service-VdorotheaSrv-csar.zip | Bin 0 -> 67068 bytes .../csars/service-fabric-configuration.zip | Bin 0 -> 82131 bytes .../src/test/resources/csars/service-vf-csar.zip | Bin 0 -> 46618 bytes .../csars/service-vf-with-annotations.zip | Bin 0 -> 83322 bytes .../src/test/resources/csars/service-vl-csar.zip | Bin 0 -> 33677 bytes .../resources/csars/service-vnf-grouping-csar.zip | Bin 0 -> 71009 bytes .../csars/vLoadBalancerMS-with-policy.TOSCA.zip | Bin 0 -> 108776 bytes .../src/test/resources/fabric-configuration.json | 11 +- .../resources/fabric-real-sriov-configuration.json | 2 +- .../src/test/resources/getTopology/network.json | 79 ++ .../resources/getTopology/serviceWithCR/CR.json | 62 ++ .../serviceWithCR/getTopologyWithCR.json | 95 ++ .../serviceWithCR/instanceGroup-NCF.json | 43 + .../serviceWithCR/service-design-and-creation.json | 1057 ++++++++++++++++++++ .../getTopology/serviceWithCR/serviceWithCR.json | 38 + .../serviceWithCR/serviceWithCRModel.json | 72 ++ .../src/test/resources/getTopology/vfModule.json | 66 ++ .../src/test/resources/getTopology/vnf.json | 160 +++ .../orchestrationRequestsByServiceInstanceId.json | 4 +- .../VnfGroupCreate1Delete1None1Request.json | 123 +++ .../VnfGroupCreate3Delete1None1Request.json | 171 ++++ ...Create3Delete1None1RequestResolvedForRetry.json | 176 ++++ .../bulk_alacarte_service_request.json | 2 +- ...bulk_alacarte_service_request_naming_false.json | 2 +- .../payload_jsons/bulk_macro_service_request.json | 4 +- .../bulk_service_request_ecomp_naming.json | 4 +- ...k_service_request_no_vfmodule_ecomp_naming.json | 4 +- .../bulk_service_request_unique_names.json | 4 +- .../resources/payload_jsons/bulk_vnf_request.json | 2 +- .../bulk_vnf_request_without_instance_name.json | 2 +- .../instance_group_instantiation_request.json | 5 +- .../mso_request_create_configuration.json | 2 +- .../payload_jsons/mso_service_instantiation.json | 4 +- .../networkDelete1Create1Request.json | 117 +++ .../network_instantiation_request.json | 7 +- ...nstantiation_request_without_instance_name.json | 5 +- ...e_1806_macro_service_instantiation_request.json | 47 + .../pre_1806_macro_without_cloudConfiguration.json | 42 + .../resume/feRequestResumeMacroService.json | 107 ++ .../msoResponseGetRequestsOfServiceInstance.json | 62 ++ .../vfModuleDelete1Create1None1Request.json | 139 +++ .../payload_jsons/vfmodule/replace_vfmodule.json | 52 + .../vfmodule/replace_vfmodule_fe_input.json | 92 ++ .../vfmodule_instantiation_request.json | 5 +- ...nstantiation_request_without_instance_name.json | 5 +- ...instantiation_request_without_volume_group.json | 5 +- .../payload_jsons/vnf/bulk_vnf_request.json | 49 + .../vnf/bulk_vnf_request_without_cloud_owner.json | 48 + .../bulk_vnf_request_without_instance_name.json | 48 + .../vnf/vnf_without_lob_expected.json | 46 + .../vnf/vnf_without_lob_user_input.json | 24 + .../payload_jsons/vnfDelete1Create1Request.json | 240 +++++ .../volumegroup_instantiation_request.json | 5 +- .../vrfEntry/service_with_vrf_entry_fe_input.json | 81 ++ .../service_with_vrf_instantiation_request.json | 59 ++ .../policy-configuration-by-policy-false.JSON | 42 +- .../test/resources/policy-configuration-csar.JSON | 49 +- .../aai/getCloudRegionAndTenantByVnfId.json | 12 +- ...ltipleOrchestrationRequestsServiceInstance.json | 300 ++++++ .../responses/mso/orchestrationRequestsVnf.json | 2 +- vid-app-common/src/test/resources/sdcservices.json | 284 ++++++ .../vLoadBalancerMS-with-policy.TOSCA.json | 2 +- vid-app-common/src/test/resources/vf-csar.JSON | 11 +- .../test/resources/vf-with-annotation-csar.json | 223 +++-- .../test/resources/vf-with-vfcInstanceGroups.json | 31 +- vid-app-common/src/test/resources/vl-csar.JSON | 7 +- .../src/test/resources/vnf-grouping-csar.json | 24 +- 77 files changed, 4307 insertions(+), 274 deletions(-) create mode 100644 vid-app-common/src/test/resources/csars/1712_PASQUALE.zip create mode 100644 vid-app-common/src/test/resources/csars/csarTransportWithPnfs.zip create mode 100644 vid-app-common/src/test/resources/csars/service-AmpPhSvc-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-Infravpn-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-MsoExampleService-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-ServicecontainerContainsPprobe.zip create mode 100644 vid-app-common/src/test/resources/csars/service-Servicecontainermultiplepprobes-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-VdorotheaSrv-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-fabric-configuration.zip create mode 100644 vid-app-common/src/test/resources/csars/service-vf-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-vf-with-annotations.zip create mode 100644 vid-app-common/src/test/resources/csars/service-vl-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/service-vnf-grouping-csar.zip create mode 100644 vid-app-common/src/test/resources/csars/vLoadBalancerMS-with-policy.TOSCA.zip create mode 100644 vid-app-common/src/test/resources/getTopology/network.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/CR.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/getTopologyWithCR.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/instanceGroup-NCF.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/service-design-and-creation.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCR.json create mode 100644 vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCRModel.json create mode 100644 vid-app-common/src/test/resources/getTopology/vfModule.json create mode 100644 vid-app-common/src/test/resources/getTopology/vnf.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json create mode 100644 vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json create mode 100644 vid-app-common/src/test/resources/responses/mso/multipleOrchestrationRequestsServiceInstance.json create mode 100644 vid-app-common/src/test/resources/sdcservices.json (limited to 'vid-app-common/src/test/resources') diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index 9cb5208da..bfd7ef985 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -1,23 +1,4 @@ -# Properties read by ECOMP Core library, epsdk-core.jar - -########################################################################## -# The following properties should NOT be changed by partner applications. -########################################################################## - -application_user_id = 30000 -post_default_role_id = 16 -clustered = true - -#Enable Fusion Mobile capabilities for the application -mobile_enable = false - -# Cache config file is needed on the classpath -cache_config_file_path = /WEB-INF/classes/cache.ccf -cache_switch = 199 -cache_load_on_startup = false - -user_name = fullName -decryption_key = AGLDdG4D04BKm2IxIWEr8o== +#DB Info #db.userName=XXXX #db.password=XXXX #db.connectionURL=jdbc:oracle:thin:@XXXX/XX @@ -63,6 +44,21 @@ files_path = /opt/app/vid/license #business_direct_menu_attribute_name = businessDirectMenuData application_name = Virtual Infrastructure Deployment +application_user_id = 30000 +post_default_role_id = 16 +clustered = true + +#Enable Fusion Mobile capabilities for the application +mobile_enable = false + +# Cache config file is needed on the classpath +cache_config_file_path = /WEB-INF/classes/cache.ccf +cache_switch = 199 +cache_load_on_startup = false + +user_name = fullName + +decryption_key = AGLDdG4D04BKm2IxIWEr8o== #element map files @@ -113,7 +109,7 @@ contact_us_link = https://wiki.web.att.com/display/EcompPortal/ECOMP+Portal+Home camunda_cockpit_link = https://cloopwf.client.research.att.com:8443/camunda/app/cockpit/default/#/dashboard # An Unique 128-bit value defined to identify a specific version # of an application deployed on a specific virtual machine. -# This value must be generated and updated by the application +# This value must be generated and updated by the application # which is using the ECOMP SDK at the time of its deployment. # Online Unique UUID generator - https://www.uuidgenerator.net/ instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d @@ -129,6 +125,19 @@ guard_notebook_url=https://rcloud.research.att.com/mini.html?notebook=a06a9cf142 #ueb_app_key = sYH0NJnsKmJC1B2A #ueb_app_secret = YOtknsT2wVFz9WISlSPDaAtd + +#Policy related properties +#simulator +policy.server.url=http://localhost:8080/pdp +policy.get.config=/api/getConfig +policy.ClientAuth= +policy.client.mechId= +policy.client.password= +policy.username= +policy.password= +policy.Authorization= +policy.environment= + #MSO related properties #simulator #mso.server.url=http://localhost:8089 @@ -145,47 +154,55 @@ mso.polling.interval.msecs=10000 mso.max.polls=10 mso.user.name=infraportal mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz -mso.restapi.svc.instance=/serviceInstances/v5 -mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v5/serviceInstances -mso.restapi.vnf.instance=/serviceInstances/v5//vnfs -mso.restapi.vnf.changemanagement.instance=/serviceInstances/v5//vnfs// -mso.restapi.network.instance=/serviceInstances/v5//networks -mso.restapi.vf.module.instance=/serviceInstances/v7//vnfs//vfModules +mso.restapi.svc.instance=/serviceInstances/v7 +mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances +mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//vnfs +mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7//vnfs// +mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//networks mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances//vnfs//vfModules/scaleOut +mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances//vnfs//vfModules mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances//vnfs//workflows/ -mso.restapi.volume.group.instance=/serviceInstances/v5//vnfs//volumeGroups -mso.restapi.instance.group=/serviceInstantiation/v7/instanceGroups -mso.restapi.get.orc.req=/orchestrationRequests/v5 -mso.restapi.get.orc.reqs=/orchestrationRequests/v5? +mso.restapi.volume.group.instance=/serviceInstances/v7//vnfs//volumeGroups +mso.restapi.instance.group=${mso.restapi.serviceInstantiationApiRoot}/instanceGroups +mso.restapi.get.orc.req=/orchestrationRequests/v7 +mso.restapi.get.orc.reqs=/orchestrationRequests/v7? +mso.restapi.resume.orc.req=/orchestrationRequests/v7//resume mso.restapi.get.man.tasks=/tasks/v1 mso.restapi.configurations=/serviceInstances/v6//configurations mso.restapi.configuration.instance=${mso.restapi.configurations} +mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= + +mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 +mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances +mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign -mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate -mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/ mso.restapi.cloudResourcesApiRoot=/cloudResources/v1 -mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1 -mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId= +mso.restapi.operationalEnvironment=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments/ + +mso.restapi.operationalEnvironment.activate=${mso.restapi.operationalEnvironment}/activate mso.restapi.operationalEnvironment.deactivate=${mso.restapi.operationalEnvironment}/deactivate mso.restapi.operationalEnvironment.create=${mso.restapi.cloudResourcesApiRoot}/operationalEnvironments -mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 -mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances -mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign -mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId= +mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1 +mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId= vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 -scheduler.server.url= + +scheduler.server.url=http://localhost:8080/vidSimulator/scheduler + +##scheduler authentication credentials +scheduler.user.name=test1 +scheduler.password=test2 + scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ +scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals +scheduler.delete.schedule=/v1/ChangeManagement/schedules/%s scheduler.get.time.slots=/v1/ChangeManagement/schedules/ scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ - -#vid.truststore.filename=/Users/Oren/Downloads/vid_keystore2.jks - vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi #mso.dme2.server.url=http://mso-api-handler-anap-v1.mso.ecomp.att.com/services/ecomp/mso? mso.dme2.server.url=http://mso-api-handler-anap-v1.mso.ecomp.att.com/services/ecomp/mso?version=1607&envContext=TEST&routeOffer=st_mtsnj @@ -203,3 +220,8 @@ mso.asyncPollingIntervalSeconds=0 # Only required for applications using WebJunction or FE/BE separation. For example: # app_base_url = https://www.e-access.att.com/app_junction/app_context/ +vid.asyncJob.howLongToKeepOldJobsInDays=7 + +# thread definition - count and timeout (in seconds) +vid.thread.count=50 +vid.thread.timeout=30 diff --git a/vid-app-common/src/test/resources/cr-csar.JSON b/vid-app-common/src/test/resources/cr-csar.JSON index b712cc779..97b39b2d2 100644 --- a/vid-app-common/src/test/resources/cr-csar.JSON +++ b/vid-app-common/src/test/resources/cr-csar.JSON @@ -21,7 +21,7 @@ "networks": { }, - "collectionResource": { + "collectionResources": { "MSO_Example 0": { "uuid": "4f8068d9-fb13-49fc-9e39-634d2094b659", "invariantUuid": "2fc1b3b8-b8ed-413e-add8-3d903cf2b458", @@ -75,5 +75,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/csars/1712_PASQUALE.zip b/vid-app-common/src/test/resources/csars/1712_PASQUALE.zip new file mode 100644 index 000000000..bbfbd2368 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/1712_PASQUALE.zip differ diff --git a/vid-app-common/src/test/resources/csars/csarTransportWithPnfs.zip b/vid-app-common/src/test/resources/csars/csarTransportWithPnfs.zip new file mode 100644 index 000000000..33225f9d6 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/csarTransportWithPnfs.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-AmpPhSvc-csar.zip b/vid-app-common/src/test/resources/csars/service-AmpPhSvc-csar.zip new file mode 100644 index 000000000..d8969d65f Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-AmpPhSvc-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-Infravpn-csar.zip b/vid-app-common/src/test/resources/csars/service-Infravpn-csar.zip new file mode 100644 index 000000000..403aacc8f Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-Infravpn-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.zip b/vid-app-common/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.zip new file mode 100644 index 000000000..a04f6dbda Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-JennyVtsbcVlanSvc-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-MsoExampleService-csar.zip b/vid-app-common/src/test/resources/csars/service-MsoExampleService-csar.zip new file mode 100644 index 000000000..83131de5e Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-MsoExampleService-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-ServicecontainerContainsPprobe.zip b/vid-app-common/src/test/resources/csars/service-ServicecontainerContainsPprobe.zip new file mode 100644 index 000000000..86b784b2c Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-ServicecontainerContainsPprobe.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-Servicecontainermultiplepprobes-csar.zip b/vid-app-common/src/test/resources/csars/service-Servicecontainermultiplepprobes-csar.zip new file mode 100644 index 000000000..7882b641d Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-Servicecontainermultiplepprobes-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-VdorotheaSrv-csar.zip b/vid-app-common/src/test/resources/csars/service-VdorotheaSrv-csar.zip new file mode 100644 index 000000000..5c5ee0fd6 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-VdorotheaSrv-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-fabric-configuration.zip b/vid-app-common/src/test/resources/csars/service-fabric-configuration.zip new file mode 100644 index 000000000..c53e4f73f Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-fabric-configuration.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-vf-csar.zip b/vid-app-common/src/test/resources/csars/service-vf-csar.zip new file mode 100644 index 000000000..05d4fd3b4 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-vf-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-vf-with-annotations.zip b/vid-app-common/src/test/resources/csars/service-vf-with-annotations.zip new file mode 100644 index 000000000..7473eeb3a Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-vf-with-annotations.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-vl-csar.zip b/vid-app-common/src/test/resources/csars/service-vl-csar.zip new file mode 100644 index 000000000..220e02fd5 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-vl-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/service-vnf-grouping-csar.zip b/vid-app-common/src/test/resources/csars/service-vnf-grouping-csar.zip new file mode 100644 index 000000000..7f93dc83a Binary files /dev/null and b/vid-app-common/src/test/resources/csars/service-vnf-grouping-csar.zip differ diff --git a/vid-app-common/src/test/resources/csars/vLoadBalancerMS-with-policy.TOSCA.zip b/vid-app-common/src/test/resources/csars/vLoadBalancerMS-with-policy.TOSCA.zip new file mode 100644 index 000000000..da749d247 Binary files /dev/null and b/vid-app-common/src/test/resources/csars/vLoadBalancerMS-with-policy.TOSCA.zip differ diff --git a/vid-app-common/src/test/resources/fabric-configuration.json b/vid-app-common/src/test/resources/fabric-configuration.json index ff17ca049..cb4407386 100644 --- a/vid-app-common/src/test/resources/fabric-configuration.json +++ b/vid-app-common/src/test/resources/fabric-configuration.json @@ -2,13 +2,13 @@ "service": { "uuid": "12344bb4-a416-4b4e-997e-0059973630b9", "invariantUuid": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9", - "name": "ADIOD vMX vPE_BV Service 488", + "name": "PASQUALE vMX vPE_BV Service 488", "version": "1.0", "toscaModelURL": null, "category": "Network L1-3", "serviceType": "", "serviceRole": "", - "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", "serviceEcompNaming": "true", "instantiationType": "ClientConfig", "inputs": { @@ -21,7 +21,7 @@ "networks": { }, - "collectionResource": {}, + "collectionResources": {}, "configurations": { }, @@ -48,5 +48,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json index d6efc2854..1b20c31fb 100644 --- a/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json +++ b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json @@ -21,7 +21,7 @@ "networks": { }, - "collectionResource": {}, + "collectionResources": {}, "configurations": { }, diff --git a/vid-app-common/src/test/resources/getTopology/network.json b/vid-app-common/src/test/resources/getTopology/network.json new file mode 100644 index 000000000..ba9cf5ca6 --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/network.json @@ -0,0 +1,79 @@ +{ + "network-id": "94c86b39-bbbf-4027-8120-ff37c6d2493a", + "network-name": "AUK51a_oam_calea_net_1", + "network-type": "SR-IOV-PROVIDER2-1", + "network-role": "oam_calea_net_1", + "network-technology": "STANDARD-SR-IOV", + "is-bound-to-vpn": false, + "resource-version": "1540925016770", + "orchestration-status": "Assigned", + "model-invariant-id": "b9a9b549-0ee4-49fc-b4f2-5edc6701da68", + "model-version-id": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "model-customization-id": "e5f33853-f84c-4cdd-99f2-93846957aa18", + "physical-network-name": "sriovnet1", + "is-provider-network": true, + "is-shared-network": true, + "is-external-network": false, + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/4b7cc8d1-f8ec-4461-ac43-5805e4ca3126/service-data/networks/network/94c86b39-bbbf-4027-8120-ff37c6d2493a/network-data/network-topology/", + "relationship-list": { + "relationship": [{ + "related-to": "service-instance", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-link": "/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/4b7cc8d1-f8ec-4461-ac43-5805e4ca3126", + "relationship-data": [{ + "relationship-key": "customer.global-customer-id", + "relationship-value": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" + }, { + "relationship-key": "service-subscription.service-type", + "relationship-value": "Emanuel" + }, { + "relationship-key": "service-instance.service-instance-id", + "relationship-value": "4b7cc8d1-f8ec-4461-ac43-5805e4ca3126" + } + ], + "related-to-property": [{ + "property-key": "service-instance.service-instance-name", + "property-value": "AUK51a_oam_calea_net_service" + } + ] + }, { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "att-nc" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "auk51a" + }, { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b530fc990b6d4334bd45518bebca6a51" + } + ], + "related-to-property": [{ + "property-key": "tenant.tenant-name", + "property-value": "ecomp_ispt" + } + ] + }, { + "related-to": "cloud-region", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "att-nc" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "auk51a" + } + ], + "related-to-property": [{ + "property-key": "cloud-region.owner-defined-type", + "property-value": "lcp" + } + ] + } + ] + } +} diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/CR.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/CR.json new file mode 100644 index 000000000..26d598c6c --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/CR.json @@ -0,0 +1,62 @@ +{ + "collection-id": "84a351ae-3601-45e2-98df-878d6c816abc", + "model-invariant-id": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "model-version-id": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "collection-name": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "collection-type": "L3-NETWORK", + "collection-role": "SUB_INTERFACE", + "collection-function": "vTSBC_function", + "orchestration-status": "Active", + "collection-customization-id": "bac6ffe5-c851-495f-a64a-28751400ff03", + "relationship-list": { + "relationship": [ + { + "related-to": "service-instance", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-link": "/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/a565e6ad-75d1-4493-98f1-33234b5c17e2", + "relationship-data": [ + { + "relationship-key": "customer.global-customer-id", + "relationship-value": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" + }, + { + "relationship-key": "service-subscription.service-type", + "relationship-value": "Emanuel" + }, + { + "relationship-key": "service-instance.service-instance-id", + "relationship-value": "a565e6ad-75d1-4493-98f1-33234b5c17e2" + } + ], + "related-to-property": [ + { + "property-key": "service-instance.service-instance-name", + "property-value": "NcmVlanSvcYm161f_77" + } + ] + }, + { + "related-to": "instance-group", + "relationship-label": "org.onap.inventory.BelongsTo", + "related-link": "/aai/v14/network/instance-groups/instance-group/6b3536cf-3a12-457f-abb5-fa2203e0d923", + "relationship-data": [ + { + "relationship-key": "instance-group.id", + "relationship-value": "6b3536cf-3a12-457f-abb5-fa2203e0d923" + } + ], + "related-to-property": [ + { + "property-key": "instance-group.description", + "property-value": "vTSBC Customer Landing Network Collection Desc" + }, + { + "property-key": "instance-group.instance-group-name", + "property-value": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection" + } + ] + } + ] + }, + "resource-version": "1539158498209" +} diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/getTopologyWithCR.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/getTopologyWithCR.json new file mode 100644 index 000000000..f038427c5 --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/getTopologyWithCR.json @@ -0,0 +1,95 @@ +{ + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77", + "instanceId": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "orchStatus": "Assigned", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "modelVersionId": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelName": "NCM_VLAN_SVC_ym161f", + "modelType": "service", + "modelVersion": "8.0" + }, + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriptionServiceType": "Emanuel", + "owningEntityId": null, + "owningEntityName": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": null, + "isALaCarte": false, + "vnfs": {}, + "networks": {}, + "vrfs": {}, + "vnfGroups": {}, + "collectionResources": { + "84a351ae-3601-45e2-98df-878d6c816abc": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "84a351ae-3601-45e2-98df-878d6c816abc", + "orchStatus": "Active", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "modelVersionId": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "modelName": "NCM_VLAN_ym161f", + "modelType": "collection", + "modelVersion": "5.0" + }, + "instanceType": null, + "provStatus": null, + "inMaint": false, + "uuid": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "originalName": "NCM_VLAN_ym161f 0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "84a351ae-3601-45e2-98df-878d6c816abc", + "ncfs": { + "6b3536cf-3a12-457f-abb5-fa2203e0d923": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "868b109c-9481-4a18-891b-af974db7705a", + "modelVersionId": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "modelName": "ncm_vlan_ym161f..NetworkCollection..0", + "modelType": "instanceGroup", + "modelVersion": "1" + }, + "instanceType": "L3-NETWORK", + "provStatus": null, + "inMaint": false, + "uuid": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "originalName": "ncm_vlan_ym161f..NetworkCollection..0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "instanceGroupRole": "SUB_INTERFACE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "numberOfNetworks": 1 + } + } + } + }, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingNetworksCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingVRFCounterMap": {} +} diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/instanceGroup-NCF.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/instanceGroup-NCF.json new file mode 100644 index 000000000..8c4d3f26c --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/instanceGroup-NCF.json @@ -0,0 +1,43 @@ +{ + "id": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "instance-group-role": "SUB_INTERFACE", + "model-invariant-id": "868b109c-9481-4a18-891b-af974db7705a", + "model-version-id": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "description": "vTSBC Customer Landing Network Collection Desc", + "instance-group-type": "L3-NETWORK", + "resource-version": "1539158492730", + "instance-group-name": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instance-group-function": "vTSBC Customer Landing Network Collection", + "relationship-list": { + "relationship": [ + { + "related-to-property": [ + { + "property-value": "APPC-24595-T-IST-02AShared_cps_internal_net_1", + "property-key": "l3-network.network-name" + } + ], + "relationship-data": [ + { + "relationship-value": "1fea0624-dac2-4997-904d-34ca1bc12fa9", + "relationship-key": "l3-network.network-id" + } + ], + "related-link": "/aai/v14/network/l3-networks/l3-network/1fea0624-dac2-4997-904d-34ca1bc12fa9", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-to": "l3-network" + }, + { + "related-to": "collection", + "relationship-label": "org.onap.inventory.BelongsTo", + "related-link": "/aai/v14/network/collections/collection/84a351ae-3601-45e2-98df-878d6c816abc", + "relationship-data": [ + { + "relationship-key": "collection.collection-id", + "relationship-value": "84a351ae-3601-45e2-98df-878d6c816abc" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/service-design-and-creation.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/service-design-and-creation.json new file mode 100644 index 000000000..d7bafebfe --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/service-design-and-creation.json @@ -0,0 +1,1057 @@ +{ + "model": [ + { + "model-invariant-id": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "model-type": "service", + "resource-version": "1534274421300", + "model-vers": { + "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-elements": { + "model-element": [ + { + "model-element-uuid": "901e2641-c66c-4178-a6e8-cbe2877b0a2a", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534463243387", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "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-elements": { + "model-element": [ + { + "model-element-uuid": "d291ed5e-4f50-4f57-956d-ce0e67a059e5", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534274421311", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "d4a447e5-9791-47b9-b365-1abb19b4b626", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "4.0", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1534863624237", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "0ef29f1f-836a-4fab-986c-5f1b96310a3d", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534863624242", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "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", + "resource-version": "1550783120267", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "0ea8ac21-64b8-4489-9d62-12e625d66995", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1543961990189", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "46093d8f-6dfa-4332-9c00-7e822c681b59", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "7.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1534885144462", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "d74a5dff-ef7f-4e32-9c13-d82fb2c617c9", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534885014144", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "12930bcc-5276-42bb-8ed6-1e43d7acae2c", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "10.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1539613511543", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "4d57798e-81b7-490e-bee8-48bd382a1349", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1539613450903", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "f8783bb2-6135-4c35-8320-64fa7deae76b", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "2.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1534450229751", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "c666f1dd-99ff-442a-9ba2-1ee2dabb9e25", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534450167963", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "0148e4c5-629b-4fef-9728-1e13fd630679", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "9.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1537901614540", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "6ae6fd91-2086-470d-8c36-9d668c41fd32", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1537882880185", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "1ceab842-7ded-49f1-a129-dce2ecef8c71", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "6.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1534883213652", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "5ca853fc-2984-45c7-b2e7-8514a56785ba", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534883154090", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "fd21f6b5-02f6-4ac0-9515-e1f01112da95", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "5.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1534872246413", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534872174141", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "model-name": "NCM_VLAN_SVC_ym161f", + "model-version": "8.0", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "model-description": "Network Collection service for vLAN tagging", + "resource-version": "1536098608209", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "a0247d2e-3843-4753-be2f-4c252c99390e", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1536098548388", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "service-instance" + } + ] + } + ] + } + } + ] + } + } + ] + } + }, + { + "model-invariant-id": "868b109c-9481-4a18-891b-af974db7705a", + "model-type": "resource", + "resource-version": "1534795610752", + "model-vers": { + "model-ver": [ + { + "model-version-id": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "model-name": "ncm_vlan_ym161f..NetworkCollection..0", + "model-version": "1", + "distribution-status": "DISTRIBUTION_COMPLETE_OK", + "resource-version": "1534795610763" + }, + { + "model-version-id": "e5fc56b7-e14c-45e5-b127-978c36a921c0", + "model-name": "ncm_vlan_ym161f..NetworkCollection..0", + "model-version": "1", + "resource-version": "1543961989136", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "9001ff96-1142-49c6-af5b-df4e2b23a305", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1543961989136", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd/model-vers/model-ver/8e6ee9dc-9017-444a-83b3-219edb018128", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "8e6ee9dc-9017-444a-83b3-219edb018128" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "instance-group" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/081ceb56-eb71-4566-a72d-3e7cbee5cdf1/model-vers/model-ver/a580855f-8d1b-40d5-a75b-50709fbd17d3/model-elements/model-element/06014449-69d3-4aef-a96b-0a5130ba9483/model-elements/model-element/a050dc96-2c35-45c7-ba23-9279215d501e", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "a580855f-8d1b-40d5-a75b-50709fbd17d3" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "06014449-69d3-4aef-a96b-0a5130ba9483" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "a050dc96-2c35-45c7-ba23-9279215d501e" + } + ] + } + ] + } + } + ] + } + }, + { + "model-invariant-id": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "model-type": "resource", + "resource-version": "1534788713816", + "model-vers": { + "model-ver": [ + { + "model-version-id": "747d2a17-5771-4fd6-879d-c2e9e4c5cd4f", + "model-name": "NCM_VLAN_ym161f", + "model-version": "2.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1534863623891", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "0dd28c63-cadf-48b2-afb0-a7bf7184ef5a", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534863623895", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "2a160989-b202-47dd-874b-4a0f275998f7" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "cloud-region" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/d4a447e5-9791-47b9-b365-1abb19b4b626/model-elements/model-element/0ef29f1f-836a-4fab-986c-5f1b96310a3d/model-elements/model-element/700f890b-05c9-471a-b859-956655d28f47", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "d4a447e5-9791-47b9-b365-1abb19b4b626" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "0ef29f1f-836a-4fab-986c-5f1b96310a3d" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "700f890b-05c9-471a-b859-956655d28f47" + } + ] + } + ] + } + }, + { + "model-version-id": "a580855f-8d1b-40d5-a75b-50709fbd17d3", + "model-name": "NCM_VLAN_ym161f", + "model-version": "6.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1543961989670", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "06014449-69d3-4aef-a96b-0a5130ba9483", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1543961989670", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/8bac3599-9a1c-4b7f-80e5-c1838f744c23/model-vers/model-ver/3f908abc-3a15-40d0-b674-2a639e52884d", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "8bac3599-9a1c-4b7f-80e5-c1838f744c23" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "3f908abc-3a15-40d0-b674-2a639e52884d" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "collection" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0e97a118-b1b6-40d5-bbad-98cdd51b1c48/model-elements/model-element/0ea8ac21-64b8-4489-9d62-12e625d66995/model-elements/model-element/d614653c-5f19-4668-ad98-cfbe012308e1", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "0e97a118-b1b6-40d5-bbad-98cdd51b1c48" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "0ea8ac21-64b8-4489-9d62-12e625d66995" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "d614653c-5f19-4668-ad98-cfbe012308e1" + } + ] + } + ] + } + }, + { + "model-version-id": "b84e2233-37bf-4c8d-b613-eb8a8820b725", + "model-name": "NCM_VLAN_ym161f", + "model-version": "4.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1534883153714", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "f7c3f5bb-777a-4d9f-9401-a652f5006152", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534883153720", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "2a160989-b202-47dd-874b-4a0f275998f7" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "cloud-region" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/1ceab842-7ded-49f1-a129-dce2ecef8c71/model-elements/model-element/5ca853fc-2984-45c7-b2e7-8514a56785ba/model-elements/model-element/030553aa-8d82-4b03-a3dc-bc210daadd5e", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "1ceab842-7ded-49f1-a129-dce2ecef8c71" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "5ca853fc-2984-45c7-b2e7-8514a56785ba" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "030553aa-8d82-4b03-a3dc-bc210daadd5e" + } + ] + } + ] + } + }, + { + "model-version-id": "5ededaad-905c-4356-b30d-471b0ae2a12a", + "model-name": "NCM_VLAN_ym161f", + "model-version": "3.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1534872173817", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "31f558c6-d73a-43e4-aab0-c863ccd6b110", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534872173821", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "2a160989-b202-47dd-874b-4a0f275998f7" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "cloud-region" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/fd21f6b5-02f6-4ac0-9515-e1f01112da95/model-elements/model-element/0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee/model-elements/model-element/110a5ba4-997b-45f0-8e53-d64d6b342be1", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "fd21f6b5-02f6-4ac0-9515-e1f01112da95" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "110a5ba4-997b-45f0-8e53-d64d6b342be1" + } + ] + } + ] + } + }, + { + "model-version-id": "67b91dcd-4fa5-4111-80c9-60d524740667", + "model-name": "NCM_VLAN_ym161f", + "model-version": "1.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1534788713822", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "6fdf228e-89ce-4cf6-9bd7-399aa1b690b3", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534788713833", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "2a160989-b202-47dd-874b-4a0f275998f7" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "cloud-region" + } + ] + } + ] + } + } + ] + } + }, + { + "model-version-id": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "model-name": "NCM_VLAN_ym161f", + "model-version": "5.0", + "model-description": "Network Collection Service VF for VLAN TAgging", + "resource-version": "1534885013739", + "model-elements": { + "model-element": [ + { + "model-element-uuid": "4bd10473-a9de-4399-abe7-c9b24e48e0ee", + "new-data-del-flag": "T", + "cardinality": "unbounded", + "resource-version": "1534885013745", + "relationship-list": { + "relationship": [ + { + "related-to": "model-ver", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "2a160989-b202-47dd-874b-4a0f275998f7" + } + ], + "related-to-property": [ + { + "property-key": "model-ver.model-name", + "property-value": "cloud-region" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/12930bcc-5276-42bb-8ed6-1e43d7acae2c/model-elements/model-element/4d57798e-81b7-490e-bee8-48bd382a1349/model-elements/model-element/93eafb42-11b5-471d-8f8a-333408114a9a", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "12930bcc-5276-42bb-8ed6-1e43d7acae2c" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "4d57798e-81b7-490e-bee8-48bd382a1349" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "93eafb42-11b5-471d-8f8a-333408114a9a" + } + ] + }, + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/6e0bec91-09f3-43aa-9cf3-e617cd0146be/model-elements/model-element/a0247d2e-3843-4753-be2f-4c252c99390e/model-elements/model-element/cb986adf-5ca8-48a5-ac9b-b222d6d2e280", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "6e0bec91-09f3-43aa-9cf3-e617cd0146be" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "a0247d2e-3843-4753-be2f-4c252c99390e" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "cb986adf-5ca8-48a5-ac9b-b222d6d2e280" + } + ] + }, + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0148e4c5-629b-4fef-9728-1e13fd630679/model-elements/model-element/6ae6fd91-2086-470d-8c36-9d668c41fd32/model-elements/model-element/a520808b-b8bc-4969-9eba-c85e2797f3dd", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "0148e4c5-629b-4fef-9728-1e13fd630679" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "6ae6fd91-2086-470d-8c36-9d668c41fd32" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "a520808b-b8bc-4969-9eba-c85e2797f3dd" + } + ] + }, + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/ca26a7e6-064d-4e90-a5b9-32ffe819f826/model-vers/model-ver/e9a290ca-41f0-4117-a1b5-8b7cd5595ff7/model-elements/model-element/ff3fdeb9-24e9-406f-8761-1334c9ea29d1/model-elements/model-element/bc6ddc86-f948-4f47-a4e6-bededd8d5780", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "ca26a7e6-064d-4e90-a5b9-32ffe819f826" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "e9a290ca-41f0-4117-a1b5-8b7cd5595ff7" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "ff3fdeb9-24e9-406f-8761-1334c9ea29d1" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "bc6ddc86-f948-4f47-a4e6-bededd8d5780" + } + ] + }, + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/46093d8f-6dfa-4332-9c00-7e822c681b59/model-elements/model-element/d74a5dff-ef7f-4e32-9c13-d82fb2c617c9/model-elements/model-element/f7bd32b4-bbbf-4788-9137-9dfa299e6111", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "46093d8f-6dfa-4332-9c00-7e822c681b59" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "d74a5dff-ef7f-4e32-9c13-d82fb2c617c9" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "f7bd32b4-bbbf-4788-9137-9dfa299e6111" + } + ] + } + ] + } + } + ] + } + } + ] +} diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCR.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCR.json new file mode 100644 index 000000000..7b9672966 --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCR.json @@ -0,0 +1,38 @@ +{ + "service-instance-id": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "service-instance-name": "NcmVlanSvcYm161f_77", + "service-type": "INFRASTRUCTURE", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "model-version-id": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "resource-version": "1539158502875", + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/a565e6ad-75d1-4493-98f1-33234b5c17e2/service-data/service-topology/", + "orchestration-status": "Assigned", + "relationship-list": { + "relationship": [ + { + "related-to": "collection", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-link": "/aai/v14/network/collections/collection/84a351ae-3601-45e2-98df-878d6c816abc", + "relationship-data": [ + { + "relationship-key": "collection.collection-id", + "relationship-value": "84a351ae-3601-45e2-98df-878d6c816abc" + } + ] + }, + { + "related-to": "owning-entity", + "relationship-label": "org.onap.relationships.inventory.BelongsTo", + "related-link": "/aai/v14/business/owning-entities/owning-entity/e4257a94-21cc-40c5-adc9-e6f4ff868e31", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "e4257a94-21cc-40c5-adc9-e6f4ff868e31" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCRModel.json b/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCRModel.json new file mode 100644 index 000000000..6cca1cdc0 --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/serviceWithCR/serviceWithCRModel.json @@ -0,0 +1,72 @@ +{ + "service": { + "uuid": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "invariantUuid": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "name": "NCM_VLAN_SVC_ym161f", + "version": "8.0", + "toscaModelURL": null, + "category": "Network L4+", + "serviceType": "INFRASTRUCTURE", + "serviceRole": "", + "description": "Network Collection service for vLAN tagging", + "serviceEcompNaming": "true", + "instantiationType": "Macro", + "inputs": {}, + "vidNotions": { + "instantiationType": "Macro", + "instantiationUI": "serviceWithCollectionResource", + "modelCategory": "other", + "viewEditUI": "serviceWithCollectionResource" + } + }, + "vnfs": {}, + "networks": {}, + "collectionResources": { + "NCM_VLAN_ym161f 0": { + "uuid": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "invariantUuid": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "description": "Network Collection Service VF for VLAN TAgging", + "name": "NCM_VLAN_ym161f", + "version": "5.0", + "customizationUuid": "bac6ffe5-c851-495f-a64a-28751400ff03", + "inputs": {}, + "commands": {}, + "properties": { + "ncm_vlan_ym161f..Fixed..0_quantity": "3", + "cr_function": "vTSBC_function", + "ncm_vlan_ym161f..NetworkCollection..0_network_collection_description": "vTSBC Customer Landing Network Collection Desc", + "cr_role": "SUB_INTERFACE", + "cr_type": "L3-NETWORK", + "ecomp_generated_naming": "false", + "ncm_vlan_ym161f..NetworkCollection..0_network_collection_function": "vTSBC Customer Landing Network Collection" + }, + "type": "CR", + "category": "Generic", + "subcategory": "Infrastructure", + "resourceVendor": "ATT", + "resourceVendorRelease": "201810", + "resourceVendorModelNumber": "294455b", + "customizationUUID": "bac6ffe5-c851-495f-a64a-28751400ff03", + "networksCollection": { + "ncm_vlan_ym161f..NetworkCollection..0": { + "uuid": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "invariantUuid": "868b109c-9481-4a18-891b-af974db7705a", + "name": "ncm_vlan_ym161f..NetworkCollection..0", + "version": "1", + "networkCollectionProperties": { + "networkCollectionFunction": "vTSBC Customer Landing Network Collection", + "networkCollectionDescription": "vTSBC Customer Landing Network Collection Desc" + } + } + } + } + }, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {}, + "vrfs": {} +} diff --git a/vid-app-common/src/test/resources/getTopology/vfModule.json b/vid-app-common/src/test/resources/getTopology/vfModule.json new file mode 100644 index 000000000..3fd9c089e --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/vfModule.json @@ -0,0 +1,66 @@ +{ + "vf-module": [{ + "vf-module-id": "2cb6d41e-2bef-4cb2-80ce-c7815bcdcf4e", + "vf-module-name": "dyh3brarf8000v_base", + "heat-stack-id": "dyh3brarf8000v_base/5a826d59-cafa-49fd-9860-dfc6eb7515ae", + "orchestration-status": "Active", + "is-base-vf-module": true, + "automated-assignment": false, + "resource-version": "1546547784901", + "model-invariant-id": "3ecca473-b0c0-46ae-b0b7-bd2969d8b79f", + "model-version-id": "5c35b764-e266-4498-af87-a88c4ba92dc4", + "model-customization-id": "06b4ece0-f6f8-4003-b445-653418292101", + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/aea56040-8caf-41b3-a85b-97c44001499e/service-data/vnfs/vnf/9a7a4dc1-8e5f-43fe-a360-7734c5f51382/vnf-data/vf-modules/vf-module/2cb6d41e-2bef-4cb2-80ce-c7815bcdcf4e/vf-module-data/vf-module-topology/", + "relationship-list": { + "relationship": [{ + "related-to": "l3-network", + "relationship-label": "org.onap.relationships.inventory.DependsOn", + "related-link": "/aai/v14/network/l3-networks/l3-network/974345f8-75d5-4ae2-be72-600930bcbe6b", + "relationship-data": [{ + "relationship-key": "l3-network.network-id", + "relationship-value": "974345f8-75d5-4ae2-be72-600930bcbe6b" + } + ], + "related-to-property": [{ + "property-key": "l3-network.network-name", + "property-value": "APP-C-24595-T-IST-05B_oam_protected_net_1" + } + ] + }, { + "related-to": "vnfc", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/network/vnfcs/vnfc/dyh3brarf8000vm001", + "relationship-data": [{ + "relationship-key": "vnfc.vnfc-name", + "relationship-value": "dyh3brarf8000vm001" + } + ] + }, { + "related-to": "vserver", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b/tenants/tenant/c8035f5ee95d4c62bbc8074c044122b9/vservers/vserver/3e3985e1-2369-4191-9721-7858a478ab6d", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + }, { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c8035f5ee95d4c62bbc8074c044122b9" + }, { + "relationship-key": "vserver.vserver-id", + "relationship-value": "3e3985e1-2369-4191-9721-7858a478ab6d" + } + ], + "related-to-property": [{ + "property-key": "vserver.vserver-name", + "property-value": "dyh3brarf8000vm001" + } + ] + } + ] + } + } + ] +} diff --git a/vid-app-common/src/test/resources/getTopology/vnf.json b/vid-app-common/src/test/resources/getTopology/vnf.json new file mode 100644 index 000000000..7b640dac1 --- /dev/null +++ b/vid-app-common/src/test/resources/getTopology/vnf.json @@ -0,0 +1,160 @@ +{ + "vnf-id": "9a7a4dc1-8e5f-43fe-a360-7734c5f51382", + "vnf-name": "dyh3brarf8000v", + "vnf-type": "vRAR_1902_ap7134/vRAR_1902_ap7134 0", + "prov-status": "PREPROV", + "equipment-role": "vRAR", + "orchestration-status": "Active", + "in-maint": true, + "is-closed-loop-disabled": false, + "resource-version": "1547155053461", + "model-invariant-id": "b711997f-36b3-4a9b-8b37-71a0fc2ebd6d", + "model-version-id": "7f23e4f7-e44c-44df-b066-4cedc6950bfe", + "model-customization-id": "401350be-0f56-481c-86d8-f32d573fec26", + "nf-type": "REPORT", + "nf-function": "REVENUE-ASSURANCE", + "nf-role": "vRAR", + "nf-naming-code": "rarf", + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/aea56040-8caf-41b3-a85b-97c44001499e/service-data/vnfs/vnf/9a7a4dc1-8e5f-43fe-a360-7734c5f51382/vnf-data/vnf-topology/", + "relationship-list": { + "relationship": [{ + "related-to": "service-instance", + "relationship-label": "org.onap.relationships.inventory.ComposedOf", + "related-link": "/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/aea56040-8caf-41b3-a85b-97c44001499e", + "relationship-data": [{ + "relationship-key": "customer.global-customer-id", + "relationship-value": "e433710f-9217-458d-a79d-1c7aff376d89" + }, { + "relationship-key": "service-subscription.service-type", + "relationship-value": "TYLER SILVIA" + }, { + "relationship-key": "service-instance.service-instance-id", + "relationship-value": "aea56040-8caf-41b3-a85b-97c44001499e" + } + ], + "related-to-property": [{ + "property-key": "service-instance.service-instance-name", + "property-value": "vRAR_1902_un577h" + } + ] + }, { + "related-to": "vnfc", + "relationship-label": "org.onap.relationships.inventory.BelongsTo", + "related-link": "/aai/v14/network/vnfcs/vnfc/dyh3brarf8000vm001", + "relationship-data": [{ + "relationship-key": "vnfc.vnfc-name", + "relationship-value": "dyh3brarf8000vm001" + } + ] + }, { + "related-to": "platform", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/business/platforms/platform/FIRSTNET-DEDICATED", + "relationship-data": [{ + "relationship-key": "platform.platform-name", + "relationship-value": "FIRSTNET-DEDICATED" + } + ] + }, { + "related-to": "line-of-business", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/business/lines-of-business/line-of-business/FIRSTNET", + "relationship-data": [{ + "relationship-key": "line-of-business.line-of-business-name", + "relationship-value": "LINDSEY" + } + ] + }, { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.BelongsTo", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b/tenants/tenant/c8035f5ee95d4c62bbc8074c044122b9", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + }, { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c8035f5ee95d4c62bbc8074c044122b9" + } + ], + "related-to-property": [{ + "property-key": "tenant.tenant-name", + "property-value": "APP-C-24595-T-IST-05B" + } + ] + }, { + "related-to": "vserver", + "relationship-label": "tosca.relationships.HostedOn", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b/tenants/tenant/c8035f5ee95d4c62bbc8074c044122b9/vservers/vserver/3e3985e1-2369-4191-9721-7858a478ab6d", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + }, { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c8035f5ee95d4c62bbc8074c044122b9" + }, { + "relationship-key": "vserver.vserver-id", + "relationship-value": "3e3985e1-2369-4191-9721-7858a478ab6d" + } + ], + "related-to-property": [{ + "property-key": "vserver.vserver-name", + "property-value": "dyh3brarf8000vm001" + } + ] + }, { + "related-to": "availability-zone", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b/availability-zones/availability-zone/dyh3b-kvm-az02", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + }, { + "relationship-key": "availability-zone.availability-zone-name", + "relationship-value": "dyh3b-kvm-az02" + } + ] + }, { + "related-to": "availability-zone", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b/availability-zones/availability-zone/dyh3b-kvm-az01", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + }, { + "relationship-key": "availability-zone.availability-zone-name", + "relationship-value": "dyh3b-kvm-az01" + } + ] + }, { + "related-to": "cloud-region", + "relationship-label": "org.onap.relationships.inventory.LocatedIn", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/dyh3b", + "relationship-data": [{ + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "dyh3b" + } + ], + "related-to-property": [{ + "property-key": "cloud-region.owner-defined-type", + "property-value": "lcp" + } + ] + } + ] + } +} diff --git a/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json index 34f18f7fb..d20fc6700 100644 --- a/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json +++ b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json @@ -93,7 +93,7 @@ ], "cloudConfiguration": { "tenantId": "460f35aeb53542dc9f77105066483e83", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic" , "lcpCloudRegionId": "rdm5b" }, "requestParameters": {}, @@ -177,7 +177,7 @@ ], "cloudConfiguration": { "tenantId": "460f35aeb53542dc9f77105066483e83", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic" , "lcpCloudRegionId": "rdm5b" }, "requestParameters": { diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json new file mode 100644 index 000000000..bc645452f --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate1Delete1None1Request.json @@ -0,0 +1,123 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "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": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json new file mode 100644 index 000000000..1906bc89f --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1Request.json @@ -0,0 +1,171 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:003": { + "action": "Create", + "isFailed": true, + "statusMessage": "failed!", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "asedrftjko", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP4_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:004": { + "action": "Create", + "isFailed": false, + "statusMessage": null, + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "rgedfdged4", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP5_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "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": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json new file mode 100644 index 000000000..6196cd797 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/VnfGroupCreate3Delete1None1RequestResolvedForRetry.json @@ -0,0 +1,176 @@ +{ + "action": "None", + "isDirty": true, + "trackById":"aabbcc", + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "statusMessage": "Vnf has been created successfully.", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "isFailed": true, + "statusMessage": "Vnf has been created successfully.", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:003": { + "action": "None", + "isFailed": false, + "instanceId": "VNF_GROUP1_INSTANCE_ID_3", + "statusMessage": "Vnf has been created successfully.", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "asedrftjko", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP4_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + }, + "groupingservicefortest..ResourceInstanceGroup..0:004": { + "action": "None", + "isFailed": false, + "statusMessage": "Vnf has been created successfully.", + "instanceId": "VNF_GROUP1_INSTANCE_ID_4", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "rgedfdged4", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP5_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "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": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json index 955685268..4e3fc1021 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json index be697ed88..5b1fdc1bd 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "subscriberInfo": { "globalSubscriberId": "{some subscriber id}" diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json index 917900c22..c0315d015 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -51,7 +51,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json index 55765a86b..dd343f46e 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -48,7 +48,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json index fdc81511c..0ef15d790 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -48,7 +48,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json index 643c1043a..c4f40a9c0 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json @@ -9,7 +9,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "{some project name}" @@ -50,7 +50,7 @@ }, "cloudConfiguration": { "lcpCloudRegionId": "mdt1", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic", "tenantId": "88a6ca3ee0394ade9403f075db23167e" }, "platform": { diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json index d7b6d8629..5aa0211d1 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_001", diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json index 9921de59b..7322d8589 100644 --- a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner": "att-aic" + "cloudOwner": "irma-aic" }, "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", diff --git a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json index 7072d3213..70e8f04ff 100644 --- a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json @@ -10,7 +10,7 @@ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" }, "requestInfo": { - "instanceName": "VNF_GROUP_NAME_001", + "instanceName": "VNF_GROUP_NAME", "source": "VID", "suppressRollback": true, "requestorId": "az2018" @@ -30,7 +30,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json index e0942bae2..c4849f047 100644 --- a/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json +++ b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json @@ -39,7 +39,7 @@ "modelType": "vnf", "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c", "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", - "modelName": "vmmeService2", + "modelName": "vflorenceService2", "modelVersion": "1.0", "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17" } diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json b/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json index 537b8d60c..926c435dc 100644 --- a/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json +++ b/vid-app-common/src/test/resources/payload_jsons/mso_service_instantiation.json @@ -13,7 +13,7 @@ }, "owningEntity": { "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName": "PACKET CORE" + "owningEntityName": "JULIO ERICKSON" }, "project": { "projectName": "TODO" @@ -49,7 +49,7 @@ "modelVersion":"10.0" }, "owningEntityId":"038d99af-0427-42c2-9d15-971b99b9b489", - "owningEntityName":"PACKET CORE", + "owningEntityName":"JULIO ERICKSON", "projectName":"{some project name}", "globalSubscriberId":"{some subscriber id}", "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", diff --git a/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json b/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json new file mode 100644 index 000000000..cc35dcac7 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/networkDelete1Create1Request.json @@ -0,0 +1,117 @@ +{ + "action":"None", + "isDirty":true, + "vnfs":{ + + }, + "instanceParams":[ + { + "2017488_pasqualevpe0_ASN":"AV_vPE" + } + ], + "validationCounter":0, + "existingNames":{ + "123":"", + "instancename":"", + "yoav":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 + }, + "networks":{ + "ExtVL 0":{ + "rollbackOnFailure":"false", + "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness":"zzz1", + "platformName":"platform", + "originalName":"ExtVL 0", + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelType":"network", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0" + }, + "instanceName":"ExtVL 0", + "instanceId":"NETWORK_INSTANCE_ID", + "action":"None_Delete" + }, + "ExtVL 0_1":{ + "action":"Create", + "inMaint":false, + "rollbackOnFailure":"true", + "originalName":"ExtVL 0", + "isMissingData":false, + "trackById":"r21vcx0szoc", + "networkStoreKey":"ExtVL 0_1", + "instanceName":"ExtVL", + "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "platformName":"xxx1", + "lineOfBusiness":"zzz1", + "instanceParams":[ + { + + } + ], + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0", + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelUniqueId":"94fdd893-4a36-4d70-b16a-ec29c54c184f" + }, + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", + "lcpCloudRegionId":"AAIAIC25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName":"WATKINS", + "rollbackOnFailure":true, + "aicZoneName":"YUDFJULP-JAG1", + "owningEntityName":"WayneHolland", + "testApi":"GR_API", + "tenantName":"USP-SIP-IC-24335-T-01", + "modelInfo":{ + "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName":"action-data", + "modelVersion":"1.0", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte":true, + "name":"action-data", + "version":"1.0", + "description":"", + "category":"", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType":"", + "serviceRole":"", + "isMultiStepDesign":false, + "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb" +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json index 5a722ac4c..241ee07a9 100644 --- a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json @@ -12,10 +12,10 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { - "instanceName": "vmxnjr001_001", + "instanceName": "vmxnjr001", "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "source": "VID", "suppressRollback": true, @@ -42,7 +42,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json index db55736c4..8b69e0beb 100644 --- a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -41,7 +41,8 @@ } ], "requestParameters": { - "userParams": [] + "userParams": [], + "testApi" : "VNF_API" } } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json new file mode 100644 index 000000000..992323023 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_service_instantiation_request.json @@ -0,0 +1,47 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "JULIO ERICKSON" + }, + "project": { + "projectName": "some_project_name" + }, + "subscriberInfo": { + "globalSubscriberId": "some_subscriber_id", + "subscriberName": "some_subscriber_name" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "MOG", + "aLaCarte": false, + "userParams": [ + { + "name": "someUserParam", + "value": "someValue" + }, + { + "name": "anotherUserParam", + "value": "anotherValue" + } + ] + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json new file mode 100644 index 000000000..472ccc90e --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/pre_1806_macro_without_cloudConfiguration.json @@ -0,0 +1,42 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + }, + "owningEntity": { + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "JULIO ERICKSON" + }, + "project": { + "projectName": "some_project_name" + }, + "subscriberInfo": { + "globalSubscriberId": "some_subscriber_id", + "subscriberName": "some_subscriber_name" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "MOG", + "aLaCarte": false, + "userParams": [ + { + "name": "someUserParam", + "value": "someValue" + }, + { + "name": "anotherUserParam", + "value": "anotherValue" + } + ] + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json b/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json new file mode 100644 index 000000000..c2c84dc9c --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/resume/feRequestResumeMacroService.json @@ -0,0 +1,107 @@ +{ + "isDirty": false, + "instanceParams": [], + "existingNames": { + "ncmvlansvcym161f_77": "" + }, + "vidNotions": { + "instantiationType": "Macro", + "instantiationUI": "serviceWithCollectionResource", + "modelCategory": "other", + "viewEditUI": "serviceWithCollectionResource" + }, + "bulkSize": 1, + "action": "Resume", + "instanceName": "NcmVlanSvcYm161f_77", + "instanceId": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "orchStatus": "Assigned", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "modelVersionId": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelName": "NCM_VLAN_SVC_ym161f", + "modelType": "service", + "modelVersion": "8.0" + }, + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriptionServiceType": "Emanuel", + "owningEntityId": null, + "owningEntityName": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": false, + "vnfs": {}, + "vrfs": {}, + "networks": {}, + "vnfGroups": {}, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingNetworksCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "collectionResources": { + "84a351ae-3601-45e2-98df-878d6c816abc": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "84a351ae-3601-45e2-98df-878d6c816abc", + "orchStatus": "Active", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "modelVersionId": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "modelName": "NCM_VLAN_ym161f", + "modelType": "collection", + "modelVersion": "5.0" + }, + "instanceType": null, + "provStatus": null, + "inMaint": false, + "uuid": "ce8c98bc-4691-44fb-8ff0-7a47487c11c4", + "originalName": "NCM_VLAN_ym161f 0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "84a351ae-3601-45e2-98df-878d6c816abc", + "ncfs": { + "6b3536cf-3a12-457f-abb5-fa2203e0d923": { + "action": "None", + "instanceName": "NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection", + "instanceId": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "868b109c-9481-4a18-891b-af974db7705a", + "modelVersionId": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "modelName": "ncm_vlan_ym161f..NetworkCollection..0", + "modelType": "instanceGroup", + "modelVersion": "1" + }, + "instanceType": "L3-NETWORK", + "provStatus": null, + "inMaint": false, + "uuid": "dd182d7d-6949-4b90-b3cc-5befe400742e", + "originalName": "ncm_vlan_ym161f..NetworkCollection..0", + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "6b3536cf-3a12-457f-abb5-fa2203e0d923", + "instanceGroupRole": "SUB_INTERFACE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "numberOfNetworks": 1 + } + } + } + } +} diff --git a/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json b/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json new file mode 100644 index 000000000..cb49dd8da --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/resume/msoResponseGetRequestsOfServiceInstance.json @@ -0,0 +1,62 @@ +{ + "requestList": [ + { + "request": { + "requestId": "894089b8-f7f4-418d-81da-34186fd32670", + "startTime": "Wed, 10 Oct 2018 08:01:21 GMT", + "finishTime": "Wed, 10 Oct 2018 08:01:43 GMT", + "requestScope": "service", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelInvariantId": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", + "modelType": "service", + "modelName": "NCM_VLAN_SVC_ym161f", + "modelVersion": "8.0", + "modelVersionId": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelUuid": "6e0bec91-09f3-43aa-9cf3-e617cd0146be", + "modelInvariantUuid": "f6342be5-d66b-4d03-a1aa-c82c3094c4ea" + }, + "requestInfo": { + "productFamilyId": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "source": "VID", + "suppressRollback": false, + "requestorId": "cs0554" + }, + "subscriberInfo": { + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" + }, + "cloudConfiguration": { + "tenantId": "d3b49834f7164cbe831bfbfa35ef649b", + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "Two" + }, + "requestParameters": { + "subscriptionServiceType": "Emanuel", + "userParams": [ + { + "name": "aic_zone", + "value": "TTL58" + } + ], + "aLaCarte": false + }, + "owningEntity": { + "owningEntityId": "e4257a94-21cc-40c5-adc9-e6f4ff868e31", + "owningEntityName": "EMANUEL-CORE" + } + }, + "instanceReferences": { + "serviceInstanceId": "a565e6ad-75d1-4493-98f1-33234b5c17e2", + "requestorId": "cs0554" + }, + "requestStatus": { + "requestState": "FAILED", + "statusMessage": "STATUS: Macro-Service-createInstance request was executed correctly.", + "percentProgress": 100, + "timestamp": "Wed, 10 Oct 2018 08:01:43 GMT" + } + } + } + ] +} diff --git a/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json b/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json new file mode 100644 index 000000000..642c2aac9 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfModuleDelete1Create1None1Request.json @@ -0,0 +1,139 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "2017-488_PASQUALE-vPE 0": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO", + "instanceId": "VF_MODULE_INSTANCE_ID", + "action": "Create", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "provStatus": "Prov Status", + "orchStatus": "Active", + "inMaint": true + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename", + "instanceId": "VF_MODULE_INSTANCE_ID", + "action": "None_Delete", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + }, + "2017588_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-2": { + "2017588_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-2frgth": { + "instanceName": "VFinstancename", + "instanceId": "VF_MODULE_INSTANCE_ID1", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None", + "legacyRegion": "some legacy region" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json new file mode 100644 index 000000000..c3ab694aa --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json @@ -0,0 +1,52 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "az2016", + "instanceName": "replace_module", + "suppressRollback": false + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "e9993045-cc96-4f3f-bf9a-71b2a400a956", + "modelInfo": { + "modelVersionId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "modelVersion": "1", + "modelName": "Vf zolson5bpxmc02092017-Service", + "modelInvariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "modelType": "service" + } + } + }, { + "relatedInstance": { + "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5", + "modelInfo": { + "modelName": "Vf zolson5bpxmc02092017-VF", + "modelVersion": "1", + "modelInvariantId": "23122c9b-dd7f-483f-bf0a-e069303db2f7", + "modelType": "vnf", + "modelCustomizationName": "Vf zolson5bpxmc02092017-VF 0", + "modelVersionId": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "modelCustomizationId": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade" + } + } + }], + "requestParameters": { + "userParams": [], + "testApi": "GR_API" + }, + "modelInfo": { + "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0", + "modelVersion": "1", + "modelInvariantId": "f7a867f2-596b-4f4a-a128-421e825a6190", + "modelType": "vfModule", + "modelVersionId": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46", + "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "lcpCloudRegionId": "regionOne" + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json new file mode 100644 index 000000000..92ccfe541 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json @@ -0,0 +1,92 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "Vf zolson5bpxmc02092017-VF 0": { + "vfModules": { + "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0": { + "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0-?": { + "instanceName": "replace_module", + "instanceId": "5d49c3b1-fc90-4762-8c98-e800170baa55", + "action": "Replace", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "rollbackOnFailure": true, + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "modelInfo": { + "modelInvariantId": "f7a867f2-596b-4f4a-a128-421e825a6190", + "modelVersionId": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46", + "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0", + "modelVersion": "1", + "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d", + "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46" + }, + "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46" + } + } + }, + "uuid": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "productFamilyId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "23122c9b-dd7f-483f-bf0a-e069303db2f7", + "modelVersionId": "d326f424-2312-4dd6-b7fe-364fadbd1ef5", + "modelName": "Vf zolson5bpxmc02092017-VF", + "modelVersion": "1", + "modelCustomizationId": "96c23a4a-6887-4b2c-9cce-1e4ea35eaade", + "modelCustomizationName": "Vf zolson5bpxmc02092017-VF 0", + "uuid": "d326f424-2312-4dd6-b7fe-364fadbd1ef5" + }, + "orchStatus": "Created", + "inMaint": false, + "rollbackOnFailure": true, + "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5", + "instanceName": "vnf_of_replace_module", + "action": "None", + "legacyRegion": "some legacy region" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "d326f424-2312-4dd6-b7fe-364fadbd1ef5": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "e9993045-cc96-4f3f-bf9a-71b2a400a956", + "instanceName": "service_of_replace_module", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "lcpCloudRegionId": "regionOne", + "tenantId": "0422ffb57ba042c0800a29dc85ca70f8", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "tenant_name", + "modelInfo": { + "modelInvariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "modelVersionId": "bad955c3-29b2-4a27-932e-28e942cc6480", + "modelName": "Vf zolson5bpxmc02092017-Service", + "modelVersion": "1", + "uuid": "bad955c3-29b2-4a27-932e-28e942cc6480" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", + "testApi": "GR_API" +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json index 92f837faf..1bce76097 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion", @@ -63,7 +63,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } } diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json index 82df5b90a..1c0d2b981 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "source": "VID", @@ -53,7 +53,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json index cfa4c2652..3581a475a 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion", @@ -54,7 +54,8 @@ "vre_a_volume_size_0" : "100", "vmx_int_net_len" : "24", "availability_zone_0": "mtpocdv-kvm-az01" - }] + }], + "testApi" : "VNF_API" } } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json new file mode 100644 index 000000000..1ae0406a7 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request.json @@ -0,0 +1,49 @@ + { + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "cloudOwner" : "irma-aic" + }, + "requestInfo": { + "instanceName": "vmxnjr001", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } + } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json new file mode 100644 index 000000000..191696490 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_cloud_owner.json @@ -0,0 +1,48 @@ + { + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "instanceName": "vmxnjr001", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } + } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json new file mode 100644 index 000000000..3b59e6d29 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/bulk_vnf_request_without_instance_name.json @@ -0,0 +1,48 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9", + "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8", + "modelName": "2016-73_MOW-AVPN-vPE-BV-L", + "modelVersion": "10.0", + "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0", + "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "cloudOwner": "irma-aic" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": true, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "platformName" + }, + "lineOfBusiness": { + "lineOfBusinessName": "lineOfBusinessName" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi" : "VNF_API" + } + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json new file mode 100644 index 000000000..11c5dcb63 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_expected.json @@ -0,0 +1,46 @@ +{ + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "xbi test VID noFC HEAT 0", + "modelCustomizationId": "e9745411-1f7d-47e3-9857-47363cb9ff92", + "modelInvariantId": "77d3a011-affb-4166-89b2-c4be7bc4ff23", + "modelVersionId": "9bb0edd9-3631-455b-bdfd-979b2ab53d07", + "modelName": "xbi test VID noFC HEAT", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "olson52b", + "tenantId": "bbf14e449c954feea272e926a8c2b244", + "cloudOwner" : "irma-aic" + }, + "requestInfo": { + "instanceName": "zolson52bfrwl01", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "suppressRollback": false, + "requestorId": "pa0916" + }, + "platform": { + "platformName": "NETWORK-CLOUD" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "sriov", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [], + "testApi": "VNF_API" + } + } +} diff --git a/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json new file mode 100644 index 000000000..60be0d13e --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnf/vnf_without_lob_user_input.json @@ -0,0 +1,24 @@ +{ + "modelInfo": { + "modelCustomizationName": "xbi test VID noFC HEAT 0", + "modelCustomizationId": "e9745411-1f7d-47e3-9857-47363cb9ff92", + "modelInvariantId": "77d3a011-affb-4166-89b2-c4be7bc4ff23", + "modelVersionId": "9bb0edd9-3631-455b-bdfd-979b2ab53d07", + "modelName": "xbi test VID noFC HEAT", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "zolson52bfrwl01", + "action": "Create", + "platformName": "NETWORK-CLOUD", + "lcpCloudRegionId": "olson52b", + "tenantId": "bbf14e449c954feea272e926a8c2b244", + "instanceParams": [{}], + "rollbackOnFailure": true, + "instanceId": null, + "vfModules": {}, + "trackById": "449206d5-54a6-441f-b5c2-beacb2f2e1cc", + "isFailed": false, + "lineOfBusiness": null +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json b/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json new file mode 100644 index 000000000..5cf7973be --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vnfDelete1Create1Request.json @@ -0,0 +1,240 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "2017-388_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + }, + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None_Delete", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0001": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_001", + "action": "None", + "provStatus": "Prov Status", + "inMaint": true, + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_001", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_001", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_001", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0002": { + "vfModules": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_002", + "action": "None", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_002", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_002", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "AAIAIC25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_002", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-388_PASQUALE-vPE 0_1": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "2017-388_PASQUALE-vPE 0", + "isMissingData": false, + "trackById": "wk10c4hh1oj", + "vfModules": {}, + "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1", + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + { + "vnf_config_template_version": "17.2", + "bandwidth_units": "Gbps", + "bandwidth": "10", + "AIC_CLLI": "ATLMY8GA", + "ASN": "AV_vPE", + "vnf_instance_name": "mtnj309me6" + } + ], + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelUniqueId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c" + }, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json index 02d2d1e14..8d64ebefb 100644 --- a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json +++ b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json @@ -12,7 +12,7 @@ "cloudConfiguration": { "lcpCloudRegionId": "mdt1", "tenantId": "88a6ca3ee0394ade9403f075db23167e", - "cloudOwner" : "att-aic" + "cloudOwner" : "irma-aic" }, "requestInfo": { "instanceName": "myVgName", @@ -50,7 +50,8 @@ ], "requestParameters" : { "userParams" : [ ], - "usePreload" : true + "usePreload" : true, + "testApi" : "VNF_API" } } } diff --git a/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json new file mode 100644 index 000000000..4f20cf19c --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_entry_fe_input.json @@ -0,0 +1,81 @@ +{ + "action": "Create", + "isDirty": false, + "vnfs": {}, + "vrfs": { + "vrf-1": { + "networks": { + "Network-1": { + "instanceName": "myBestNetwork", + "instanceId": "884b373f-41c0-4a96-9785-7f075cb4ae9d", + "modelInfo": { + "modelType": "network" + } + } + }, + "vpns": { + "vpn-1": { + "instanceName": "justFakeVPN", + "instanceId": "7e971d5c-6ddf-4f02-be8a-95dcbc7daf83", + "modelInfo": { + "modelType": "vpnBinding" + } + } + } + } + }, + "instanceParams": [ + {} + ], + "validationCounter": 0, + "existingNames": { + "dfd": "" + }, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "optionalGroupMembersMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceName": "dfd", + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "lcpCloudRegionId": "lcpCloudRegionId", + "tenantName": "tenantName", + "tenantId": "4b273bc5-0ae6-4088-aa5d-5a862d84cab2", + "projectName": "WATKINS", + "rollbackOnFailure": "true", + "aicZoneName": null, + "owningEntityName": "WayneHolland", + "testApi": "VNF_API", + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "infraVPN", + "modelVersion": "1.0", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelUniqueId": "f028b2e2-7080-4b13-91b2-94944d4c42d8" + }, + "isALaCarte": true, + "name": "infraVPN", + "version": "1.0", + "description": "ddd", + "category": "Network Service", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "serviceType": "BONDING", + "serviceRole": "INFRASTRUCTURE-VPN", + "vidNotions": { + "instantiationType": "Macro", + "instantiationUI": "infrastructureVpn", + "modelCategory": "INFRASTRUCTURE_VPN", + "viewEditUI": "legacy" + }, + "isEcompGeneratedNaming": true, + "isMultiStepDesign": false +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json new file mode 100644 index 000000000..2e64554a3 --- /dev/null +++ b/vid-app-common/src/test/resources/payload_jsons/vrfEntry/service_with_vrf_instantiation_request.json @@ -0,0 +1,59 @@ +{ + "requestDetails": { + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "infraVPN", + "modelVersion": "1.0", + "modelType": "service" + }, + "cloudConfiguration": { + "cloudOwner": "irma-aic", + "lcpCloudRegionId": "lcpCloudRegionId", + "tenantId": "4b273bc5-0ae6-4088-aa5d-5a862d84cab2" + }, + "owningEntity": { + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland" + }, + "project": { + "projectName": "WATKINS" + }, + "subscriberInfo": { + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS" + }, + "requestInfo": { + "instanceName": "dfd", + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "source": "VID", + "suppressRollback": false, + "requestorId": "az2016" + }, + "requestParameters": { + "subscriptionServiceType": "TYLER SILVIA", + "aLaCarte": false, + "userParams": [] + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "7e971d5c-6ddf-4f02-be8a-95dcbc7daf83", + "instanceName": "justFakeVPN", + "modelInfo": { + "modelType": "vpnBinding" + } + } + }, + { + "relatedInstance": { + "instanceId": "884b373f-41c0-4a96-9785-7f075cb4ae9d", + "instanceName": "myBestNetwork", + "modelInfo": { + "modelType": "network" + } + } + } + ] + } +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON index 4508599bc..6e073260e 100644 --- a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON +++ b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON @@ -34,8 +34,8 @@ "type": "Configuration", "modelCustomizationName": "Port Mirroring Configuration By Policy 1", "sourceNodes": [ - "vmmeservice2_proxy 2", - "vmmeservice2_proxy 3" + "vflorenceservice2_proxy 2", + "vflorenceservice2_proxy 3" ], "collectorNodes": [ "pprobeservice_proxy 5" @@ -61,9 +61,9 @@ "type": "Configuration", "modelCustomizationName": "Port Mirroring Configuration By Policy 0", "sourceNodes": [ - "vmmeservice2_proxy 2", - "vmmeservice_proxy 1", - "vmmeservice_proxy 0" + "vflorenceservice2_proxy 2", + "vflorenceservice_proxy 1", + "vflorenceservice_proxy 0" ], "collectorNodes": [ ], @@ -71,11 +71,11 @@ } }, "serviceProxies": { - "vmmeservice_proxy 0": { + "vflorenceservice_proxy 0": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService", - "name": "vmmeService Service Proxy", + "description": "A Proxy for Service vflorenceService", + "name": "vflorenceService Service Proxy", "version": "1.0", "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17", "inputs": {}, @@ -84,13 +84,13 @@ "type": "Service Proxy", "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", - "sourceModelName": "vmmeService" + "sourceModelName": "vflorenceService" }, - "vmmeservice_proxy 1": { + "vflorenceservice_proxy 1": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService", - "name": "vmmeService Service Proxy", + "description": "A Proxy for Service vflorenceService", + "name": "vflorenceService Service Proxy", "version": "1.0", "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb", "inputs": {}, @@ -99,13 +99,13 @@ "type": "Service Proxy", "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", - "sourceModelName": "vmmeService" + "sourceModelName": "vflorenceService" }, - "vmmeservice2_proxy 3": { + "vflorenceservice2_proxy 3": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService2", - "name": "vmmeService2 Service Proxy", + "description": "A Proxy for Service vflorenceService2", + "name": "vflorenceService2 Service Proxy", "version": "1.0", "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a", "inputs": {}, @@ -114,7 +114,7 @@ "type": "Service Proxy", "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "sourceModelName": "vmmeService2" + "sourceModelName": "vflorenceService2" }, "pprobeservice_proxy 4": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", @@ -146,11 +146,11 @@ "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911", "sourceModelName": "pProbeService" }, - "vmmeservice2_proxy 2": { + "vflorenceservice2_proxy 2": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService2", - "name": "vmmeService2 Service Proxy", + "description": "A Proxy for Service vflorenceService2", + "name": "vflorenceService2 Service Proxy", "version": "1.0", "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17", "inputs": {}, @@ -159,7 +159,7 @@ "type": "Service Proxy", "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "sourceModelName": "vmmeService2" + "sourceModelName": "vflorenceService2" } }, "vfModules": {}, diff --git a/vid-app-common/src/test/resources/policy-configuration-csar.JSON b/vid-app-common/src/test/resources/policy-configuration-csar.JSON index 41f5f5cbf..d2614cb18 100644 --- a/vid-app-common/src/test/resources/policy-configuration-csar.JSON +++ b/vid-app-common/src/test/resources/policy-configuration-csar.JSON @@ -34,9 +34,9 @@ "type": "Configuration", "modelCustomizationName": "Port Mirroring Configuration By Policy 1", "sourceNodes": [ - "vmmeservice2_proxy 2", - "vmmeservice2_proxy 3", - "vmmeservice_proxy 1" + "vflorenceservice2_proxy 2", + "vflorenceservice2_proxy 3", + "vflorenceservice_proxy 1" ], "collectorNodes": [ "pprobeservice_proxy 5" @@ -62,9 +62,9 @@ "type": "Configuration", "modelCustomizationName": "Port Mirroring Configuration By Policy 0", "sourceNodes": [ - "vmmeservice2_proxy 2", - "vmmeservice_proxy 1", - "vmmeservice_proxy 0" + "vflorenceservice2_proxy 2", + "vflorenceservice_proxy 1", + "vflorenceservice_proxy 0" ], "collectorNodes": [ "pprobeservice_proxy 4" @@ -73,11 +73,11 @@ } }, "serviceProxies": { - "vmmeservice_proxy 0": { + "vflorenceservice_proxy 0": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService", - "name": "vmmeService Service Proxy", + "description": "A Proxy for Service vflorenceService", + "name": "vflorenceService Service Proxy", "version": "1.0", "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17", "inputs": {}, @@ -88,13 +88,13 @@ "type": "Service Proxy", "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", - "sourceModelName": "vmmeService" + "sourceModelName": "vflorenceService" }, - "vmmeservice_proxy 1": { + "vflorenceservice_proxy 1": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService", - "name": "vmmeService Service Proxy", + "description": "A Proxy for Service vflorenceService", + "name": "vflorenceService Service Proxy", "version": "1.0", "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb", "inputs": {}, @@ -105,13 +105,13 @@ "type": "Service Proxy", "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", - "sourceModelName": "vmmeService" + "sourceModelName": "vflorenceService" }, - "vmmeservice2_proxy 3": { + "vflorenceservice2_proxy 3": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService2", - "name": "vmmeService2 Service Proxy", + "description": "A Proxy for Service vflorenceService2", + "name": "vflorenceService2 Service Proxy", "version": "1.0", "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a", "inputs": {}, @@ -122,7 +122,7 @@ "type": "Service Proxy", "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "sourceModelName": "vmmeService2" + "sourceModelName": "vflorenceService2" }, "pprobeservice_proxy 4": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", @@ -158,11 +158,11 @@ "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911", "sourceModelName": "pProbeService" }, - "vmmeservice2_proxy 2": { + "vflorenceservice2_proxy 2": { "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", - "description": "A Proxy for Service vmmeService2", - "name": "vmmeService2 Service Proxy", + "description": "A Proxy for Service vflorenceService2", + "name": "vflorenceService2 Service Proxy", "version": "1.0", "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17", "inputs": {}, @@ -173,11 +173,14 @@ "type": "Service Proxy", "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "sourceModelName": "vmmeService2" + "sourceModelName": "vflorenceService2" } }, "vfModules": {}, "volumeGroups": {}, "pnfs": {}, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json index 690be607b..bc3ab0a18 100644 --- a/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json +++ b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json @@ -34,7 +34,7 @@ { "id": "264798392", "node-type": "vserver", - "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84", "properties": { "vserver-id": "088c2bf0-80e2-4bdf-93ae-b2469fbeba84", "vserver-name": "zrdm3mogx01oam001", @@ -49,7 +49,7 @@ "id": "211808464", "relationship-label": "tosca.relationships.AttachesTo", "node-type": "volume", - "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84/volumes/volume/28e1246e-2aeb-4a59-bb51-f20fb8e93c42" + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84/volumes/volume/28e1246e-2aeb-4a59-bb51-f20fb8e93c42" } ] }, @@ -75,7 +75,7 @@ { "id": "8757432", "node-type": "tenant", - "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", "properties": { "tenant-id": "3e9a20a3e89e45f884e09df0cc2d2d2a", "tenant-name": "APPC-24595-T-IST-02C", @@ -93,9 +93,9 @@ { "id": "302227536", "node-type": "cloud-region", - "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b", + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mtn23b", "properties": { - "cloud-owner": "att-aic", + "cloud-owner": "irma-aic" , "cloud-region-id": "mtn23b", "cloud-type": "openstack", "owner-defined-type": "lcp", @@ -111,7 +111,7 @@ "id": "2744328", "relationship-label": "org.onap.relationships.inventory.BelongsTo", "node-type": "tenant", - "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/5452d6bd0cb34e99a3553d349456c642" + "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mtn23b/tenants/tenant/5452d6bd0cb34e99a3553d349456c642" } ] } diff --git a/vid-app-common/src/test/resources/responses/mso/multipleOrchestrationRequestsServiceInstance.json b/vid-app-common/src/test/resources/responses/mso/multipleOrchestrationRequestsServiceInstance.json new file mode 100644 index 000000000..9708522a2 --- /dev/null +++ b/vid-app-common/src/test/resources/responses/mso/multipleOrchestrationRequestsServiceInstance.json @@ -0,0 +1,300 @@ +{ + "requestList": [ + { + "request": { + "requestId": "2543cd7c-ed76-4e94-83be-0cf0cc55bf23", + "startTime": "Mon, 04 Mar 2019 20:47:45 GMT", + "finishTime": "Mon, 04 Mar 2019 20:48:46 GMT", + "requestScope": "vnf", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "OAM_FRWL_5G_NC 0", + "modelInvariantId": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelType": "vnf", + "modelName": "OAM_FRWL_5G_NC", + "modelVersion": "7.0", + "modelCustomizationUuid": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelVersionId": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelCustomizationId": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelUuid": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelInvariantUuid": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelInstanceName": "OAM_FRWL_5G_NC 0" + }, + "requestInfo": { + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "source": "VID", + "instanceName": "zauk51bfrwl07", + "suppressRollback": false, + "requestorId": "pj8646" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "modelInfo": { + "modelInvariantId": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2", + "modelType": "service", + "modelName": "OAM_FRWL_5G_NC_SVC", + "modelVersion": "6.0", + "modelVersionId": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelUuid": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelInvariantUuid": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "e2a6af59d1cb43b2874e943bbbf8470a", + "cloudOwner": "att-nc", + "lcpCloudRegionId": "auk51b" + }, + "requestParameters": { + "testApi": "GR_API" + }, + "platform": { + "platformName": "NETWORK-CLOUD" + }, + "lineOfBusiness": { + "lineOfBusinessName": "EMANUEL-CONSUMER" + } + }, + "instanceReferences": { + "serviceInstanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "vnfInstanceId": "05bedd02-b933-40f1-ad20-bab3197489a9", + "vnfInstanceName": "zauk51bfrwl07", + "requestorId": "pj8646" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "STATUS: ALaCarte-Vnf-createInstance request was executed correctly. FLOW STATUS: Successfully completed all Building Blocks", + "percentProgress": 100, + "timestamp": "Mon, 04 Mar 2019 20:48:46 GMT" + } + } + }, + { + "request": { + "requestId": "fab854bf-e53c-415e-b3cc-b6fcce8414b2", + "startTime": "Mon, 04 Mar 2019 20:47:15 GMT", + "finishTime": "Mon, 04 Mar 2019 20:47:38 GMT", + "requestScope": "service", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelInvariantId": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2", + "modelType": "service", + "modelName": "OAM_FRWL_5G_NC_SVC", + "modelVersion": "6.0", + "modelVersionId": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelUuid": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelInvariantUuid": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2" + }, + "requestInfo": { + "source": "VID", + "instanceName": "zauk51bfrwl07_vnf_service", + "suppressRollback": false, + "requestorId": "pj8646" + }, + "subscriberInfo": { + "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" + }, + "requestParameters": { + "subscriptionServiceType": "Emanuel", + "aLaCarte": true, + "testApi": "GR_API" + }, + "project": { + "projectName": "Kennedy" + }, + "owningEntity": { + "owningEntityId": "e4257a94-21cc-40c5-adc9-e6f4ff868e31", + "owningEntityName": "EMANUEL-CORE" + } + }, + "instanceReferences": { + "serviceInstanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "serviceInstanceName": "zauk51bfrwl07_vnf_service", + "requestorId": "pj8646" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "STATUS: ALaCarte-Service-createInstance request was executed correctly. FLOW STATUS: Successfully completed all Building Blocks", + "percentProgress": 100, + "timestamp": "Mon, 04 Mar 2019 20:47:38 GMT" + } + } + }, + { + "request": { + "requestId": "3eb7b323-b486-402e-931a-2ad296e6406b", + "startTime": "Mon, 04 Mar 2019 20:48:52 GMT", + "finishTime": "Mon, 04 Mar 2019 20:50:40 GMT", + "requestScope": "vfModule", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "OamFrwl5gNc..base_oam..module-0", + "modelInvariantId": "00b03b3e-454f-438c-87ca-5860f98e8dbc", + "modelType": "vfModule", + "modelName": "OamFrwl5gNc..base_oam..module-0", + "modelVersion": "3", + "modelCustomizationUuid": "53aef95c-92b5-48d7-912a-1f89d0eb6355", + "modelVersionId": "3fb037f3-d629-490f-af49-2bbb97a946be", + "modelCustomizationId": "53aef95c-92b5-48d7-912a-1f89d0eb6355", + "modelUuid": "3fb037f3-d629-490f-af49-2bbb97a946be", + "modelInvariantUuid": "00b03b3e-454f-438c-87ca-5860f98e8dbc", + "modelInstanceName": "OamFrwl5gNc..base_oam..module-0" + }, + "requestInfo": { + "source": "VID", + "instanceName": "zauk51bfrwl07_base_1", + "suppressRollback": false, + "requestorId": "pj8646" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "modelInfo": { + "modelInvariantId": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2", + "modelType": "service", + "modelName": "OAM_FRWL_5G_NC_SVC", + "modelVersion": "6.0", + "modelVersionId": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelUuid": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelInvariantUuid": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2" + } + } + }, + { + "relatedInstance": { + "instanceId": "05bedd02-b933-40f1-ad20-bab3197489a9", + "modelInfo": { + "modelCustomizationName": "OAM_FRWL_5G_NC 0", + "modelInvariantId": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelType": "vnf", + "modelName": "OAM_FRWL_5G_NC", + "modelVersion": "7.0", + "modelCustomizationUuid": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelVersionId": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelCustomizationId": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelUuid": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelInvariantUuid": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelInstanceName": "OAM_FRWL_5G_NC 0" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "e2a6af59d1cb43b2874e943bbbf8470a", + "cloudOwner": "att-nc", + "lcpCloudRegionId": "auk51b" + }, + "requestParameters": { + "usePreload": false, + "testApi": "GR_API" + } + }, + "instanceReferences": { + "serviceInstanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "vnfInstanceId": "05bedd02-b933-40f1-ad20-bab3197489a9", + "vfModuleInstanceId": "9276805f-07ba-43c0-a5f1-f327c1d72606", + "vfModuleInstanceName": "zauk51bfrwl07_base_1", + "requestorId": "pj8646" + }, + "requestStatus": { + "requestState": "COMPLETE", + "statusMessage": "STATUS: ALaCarte-VfModule-createInstance request was executed correctly. FLOW STATUS: Successfully completed all Building Blocks", + "percentProgress": 100, + "timestamp": "Mon, 04 Mar 2019 20:50:40 GMT" + } + } + }, + { + "request": { + "requestId": "74f5a2dc-1e80-4553-8fac-d30675e510be", + "startTime": "Mon, 04 Mar 2019 20:50:47 GMT", + "requestScope": "vfModule", + "requestType": "createInstance", + "requestDetails": { + "modelInfo": { + "modelCustomizationName": "OamFrwl5gNc..module_oam..module-1", + "modelInvariantId": "972a22a1-8cbf-45ce-8ff2-f0f33694695d", + "modelType": "vfModule", + "modelName": "OamFrwl5gNc..module_oam..module-1", + "modelVersion": "3", + "modelCustomizationUuid": "cf88008e-c4b6-48b8-99a9-44d850f3d8db", + "modelVersionId": "cea74dcd-1174-4f65-adff-87a355849275", + "modelCustomizationId": "cf88008e-c4b6-48b8-99a9-44d850f3d8db", + "modelUuid": "cea74dcd-1174-4f65-adff-87a355849275", + "modelInvariantUuid": "972a22a1-8cbf-45ce-8ff2-f0f33694695d", + "modelInstanceName": "OamFrwl5gNc..module_oam..module-1" + }, + "requestInfo": { + "source": "VID", + "instanceName": "zauk51bfrwl07_mod_1", + "suppressRollback": false, + "requestorId": "pj8646" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "modelInfo": { + "modelInvariantId": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2", + "modelType": "service", + "modelName": "OAM_FRWL_5G_NC_SVC", + "modelVersion": "6.0", + "modelVersionId": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelUuid": "75a90831-a34f-4b81-8245-4f8b110f93fa", + "modelInvariantUuid": "77ac5b6f-e31a-4477-b2c9-8a49ea58aee2" + } + } + }, + { + "relatedInstance": { + "instanceId": "05bedd02-b933-40f1-ad20-bab3197489a9", + "modelInfo": { + "modelCustomizationName": "OAM_FRWL_5G_NC 0", + "modelInvariantId": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelType": "vnf", + "modelName": "OAM_FRWL_5G_NC", + "modelVersion": "7.0", + "modelCustomizationUuid": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelVersionId": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelCustomizationId": "006ad5a0-b8c4-43f3-aa93-0fa379ea613d", + "modelUuid": "f248be17-b66d-4ea0-bb24-51de6f62c240", + "modelInvariantUuid": "d5f2cc03-fad3-4a5a-bf36-6328771b3915", + "modelInstanceName": "OAM_FRWL_5G_NC 0" + } + } + } + ], + "cloudConfiguration": { + "tenantId": "e2a6af59d1cb43b2874e943bbbf8470a", + "cloudOwner": "att-nc", + "lcpCloudRegionId": "auk51b" + }, + "requestParameters": { + "usePreload": true, + "testApi": "GR_API" + } + }, + "instanceReferences": { + "serviceInstanceId": "d40c8a82-cc04-45e5-a0f6-0c9394c8f8d2", + "vnfInstanceId": "05bedd02-b933-40f1-ad20-bab3197489a9", + "vfModuleInstanceId": "73a01fe6-d9f9-4022-82f4-082c6d8cf520", + "vfModuleInstanceName": "zauk51bfrwl07_mod_1", + "requestorId": "pj8646" + }, + "requestStatus": { + "requestState": "FAILED", + "statusMessage": "STATUS: Error from SDNC: No active l3-network found in AAI with network_name GRP-27529-T-IST-07A_N_oam_protected_net_1 FLOW STATUS: All Rollback flows have completed successfully ROLLBACK STATUS: Rollback has been completed successfully.", + "percentProgress": 100, + "timestamp": "Mon, 04 Mar 2019 20:51:14 GMT" + } + } + } + ] +} diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json index f83310427..e31f0e05e 100644 --- a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json +++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json @@ -42,7 +42,7 @@ ], "cloudConfiguration": { "tenantId": "19dfa99ba1cc4948bb868eba9e0de7ab", - "cloudOwner": "att-aic", + "cloudOwner": "irma-aic" , "lcpCloudRegionId": "test1" }, "requestParameters": { diff --git a/vid-app-common/src/test/resources/sdcservices.json b/vid-app-common/src/test/resources/sdcservices.json new file mode 100644 index 000000000..1ba13c9ae --- /dev/null +++ b/vid-app-common/src/test/resources/sdcservices.json @@ -0,0 +1,284 @@ +{ + "services": [ + { + "uuid": "6bce7302-70bd-4057-b48e-8d5b99e686ca", + "invariantUUID": "9aa04749-c02c-432d-a90c-18caa361c833", + "name": "vDOROTHEA_srv", + "version": "1.0", + "toscaModelURL": "./csars/service-VdorotheaSrv-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "invariantUUID": "c3618e16-bb5b-433a-a6e0-565ca79d8b65", + "name": "4-27_vFLORENCE_Service", + "version": "1.0", + "toscaModelURL": "./csars/service-MsoExampleService-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9", + "invariantUUID": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "PASQUALE vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": "./csars/service-vf-with-annotations.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "48a52540-8772-4368-9cdb-1f124ea5c931", + "invariantUUID": "f430728a-4530-42be-a577-1206b9484cef", + "name": "4-27_vFLORENCE_Service", + "version": "1.0", + "toscaModelURL": "./csars/service-vf-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "cb49608f-5a24-4789-b0f7-2595473cb997", + "invariantUUID": "0311f998-9268-4fd6-bbba-afff15087b72", + "name": "4-27_vFLORENCE_Service", + "version": "1.0", + "toscaModelURL": "./csars/service-vl-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "3f6bd9e9-0942-49d3-84e8-6cdccd6de339", + "invariantUUID": "5461e83e-0b2a-465d-ab45-9d731894afd9", + "name": "vLoadBalancerMS", + "version": "1.0", + "toscaModelURL": "./csars/vLoadBalancerMS-with-policy.TOSCA.zip", + "category": "Network L4+", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "demo", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "90fe6842-aa76-4b68-8329-5c86ff564407", + "invariantUUID": "0311f998-9268-4fd6-bbba-afff15087b72", + "name": "4-27_vFLORENCE_Service", + "version": "1.0", + "toscaModelURL": "./csars/1712_PASQUALE.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "73e1322a-8a9a-49dc-9558-b0c5c5770e4a", + "invariantUUID": "f430728a-4530-42be-a577-1206b9484cef", + "name": "4-27_vFLORENCE_Service", + "version": "1.0", + "toscaModelURL": "./csars/pnf.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "240376de-870e-48df-915a-31f140eedd2c", + "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "name": "Demo Service", + "version": "1.0", + "toscaModelURL": "./csars/service-DemoService1-csar.csar", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "32671332-a7ee-4df6-9609-db50ce5eaee7", + "invariantUUID": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "PASQUALE vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": "./csars/pasquale.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "55a48870-d99e-41a8-a3b4-a8d748333139", + "invariantUUID": "3d89efc0-19ca-4df7-9818-028e1fc6f708", + "name": "AMP PH SVC", + "version": "1.0", + "toscaModelURL": "./csars/service-AmpPhSvc-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "invariantUUID": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "name": "action-data", + "version": "1.0", + "toscaModelURL": "./csars/2f80c596.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "invariantUUID": "b7d923c9-6175-41f1-91ba-4565c4953408", + "name": "Multiple pProbes", + "version": "1.0", + "toscaModelURL": "./csars/service-Servicecontainermultiplepprobes-csar.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "ee6d61be-4841-4f98-8f23-5de9da845544", + "invariantUUID": "b7d923c9-6175-41f1-91ba-4565c4955555", + "name": "ServiceContainerMultiplepProbes2", + "version": "2.0", + "toscaModelURL": "./csars/service-ServicecontainerContainsPprobe.zip", + "category": "Network L1-3", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "12344bb4-a416-4b4e-997e-0059973630b9", + "invariantUUID": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "Fabric Configuration", + "version": "1.0", + "toscaModelURL": "./csars/service-fabric-configuration.zip", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "1837481c-fa7d-4362-8ce1-d05fafc87bd1", + "invariantUUID": "93518289-3049-450f-a22d-86108c250265", + "name": "jenny vTSBC vlan SVC", + "version": "1.0", + "toscaModelURL": "./csars/service-JennyVtsbcVlanSvc-csar.zip", + "category": "Network L1-3", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "2a53419b-3f85-4ad5-a9c9-d79905500a27", + "invariantUUID": "16972715-9d79-4fb0-9463-0253d45e1d48", + "name": "MNS VNN1B exn svc", + "version": "1.0", + "toscaModelURL": "./csars/service-MnsVnn1bExnSvc-csar.csar", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "e32a5014-357f-4be4-b3f9-fecb0010811e", + "invariantUUID": "4e099102-fccb-4ee3-b51b-ebb51259dc50", + "name": "MNS VNN1B dmz svc", + "version": "1.0", + "toscaModelURL": "./csars/service-MnsVnn1bDmzSvc-csar.csar", + "category": "Emanuel", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "invariantUUID": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "name": "Grouping Service for Test", + "version": "1.0", + "toscaModelURL": "./csars/service-vnf-grouping-csar.zip", + "category": "Network L4+", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + }, + { + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "invariantUUID": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "name": "infraVPN", + "version": "1.0", + "toscaModelURL": "./csars/service-Infravpn-csar.zip", + "category": "Network Service", + "lifecycleState": "CERTIFIED", + "lastUpdaterUserId": "rg276b", + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTED", + "artifacts": null, + "resources": null + } + ] +} \ No newline at end of file diff --git a/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json b/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json index 8e29ff1d9..d066c2aba 100644 --- a/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json +++ b/vid-app-common/src/test/resources/vLoadBalancerMS-with-policy.TOSCA.json @@ -167,7 +167,7 @@ } }, "networks": {}, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": {}, diff --git a/vid-app-common/src/test/resources/vf-csar.JSON b/vid-app-common/src/test/resources/vf-csar.JSON index c1b71b34f..591f06803 100644 --- a/vid-app-common/src/test/resources/vf-csar.JSON +++ b/vid-app-common/src/test/resources/vf-csar.JSON @@ -3,7 +3,7 @@ }, "service": { - "category": "Mobility", + "category": "Emanuel", "description": "Bla bla", "serviceRole": null, "serviceType": null, @@ -96,10 +96,10 @@ "properties": { "availability_zone_max_count": "get_input:greatdefect0_availability_zone_max_count", "itc_flavor_name": "nv.c8r24d160", - "itc_image_name": "NIMBUS_IXLA-ITC_8.20_EA_KVM_210117.qcow2", + "itc_image_name": "KENNEDY_IXLA-ITC_8.20_EA_KVM_210117.qcow2", "itc_name_0": "get_input:greatdefect0_itc_name_0", "itm_flavor_name": "nv.c2r4d50", - "itm_image_name": "NIMBUS_IXLA-ITM_8.20.EA_KVM.qcow2", + "itm_image_name": "KENNEDY_IXLA-ITM_8.20.EA_KVM.qcow2", "vf_module_id": "get_input:greatdefect0_vf_module_id", "ecomp_generated_naming": "false" }, @@ -178,5 +178,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/vf-with-annotation-csar.json b/vid-app-common/src/test/resources/vf-with-annotation-csar.json index db68313f1..17cb65251 100644 --- a/vid-app-common/src/test/resources/vf-with-annotation-csar.json +++ b/vid-app-common/src/test/resources/vf-with-annotation-csar.json @@ -2,17 +2,17 @@ "service": { "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9", "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", - "name": "ADIOD vMX vPE_BV Service 488", + "name": "PASQUALE vMX vPE_BV Service 488", "version": "1.0", "toscaModelURL": null, "category": "Network L1-3", "serviceType": "", "serviceRole": "", - "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", "serviceEcompNaming": "true", "instantiationType": "Macro", "inputs": { - "2017488_adiodvpe0_ASN": { + "2017488_pasqualevpe0_ASN": { "type": "string", "description": "AV/PE", "entry_schema": null, @@ -26,11 +26,11 @@ } }, "vnfs": { - "2017-488_ADIOD-vPE 0": { + "2017-488_PASQUALE-vPE 0": { "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350", "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e", - "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", - "name": "2017-488_ADIOD-vPE", + "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-488_PASQUALE-vPE", "version": "9.0", "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8", "inputs": { @@ -41,21 +41,21 @@ }, "properties": { "vmxvre_retype": "RE-VMX", - "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version", "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "ROUTER", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -83,10 +83,10 @@ "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", "vmxvpfe_sriov44_0_port_vlanstrip": "false", "vf_module_id": "123", - "nf_function": "ADIOD vPE", + "nf_function": "PASQUALE vPE", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", - "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", "vmxvre_volume_type_1": "HITACHI", @@ -94,24 +94,24 @@ "vmxvre_volume_type_0": "HITACHI", "vmxvpfe_volume_type_0": "HITACHI", "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units", + "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units", "vnf_id": "123", "vmxvre_oam_prefix": "24", - "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0", - "ASN": "get_input:2017488_adiodvpe0_ASN", + "availability_zone_0": "get_input:2017488_pasqualevpe0_availability_zone_0", + "ASN": "get_input:2017488_pasqualevpe0_ASN", "vmxvre_chassis_i2cid": "161", "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:2017488_adiodvpe0_bandwidth", + "bandwidth": "get_input:2017488_pasqualevpe0_bandwidth", "availability_zone_max_count": "1", "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", "vmxvre_type": "0", - "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name", "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", "vmx_int_ctl_len": "24", @@ -126,32 +126,32 @@ "ecomp_generated_naming": "true" }, "type": "VF", - "modelCustomizationName": "2017-488_ADIOD-vPE 0", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", "vfModules": { - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, - "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "baseModule" : false }, "inputs": { "bandwidth_units": { - "fromInputName": "2017488_adiodvpe0_bandwidth_units", + "fromInputName": "2017488_pasqualevpe0_bandwidth_units", "type": "string", "description": "Units of bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth_units" }, "constraints": null, @@ -159,13 +159,13 @@ "default": "Gbps" }, "bandwidth": { - "fromInputName": "2017488_adiodvpe0_bandwidth", + "fromInputName": "2017488_pasqualevpe0_bandwidth", "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth" }, "constraints": null, @@ -173,13 +173,13 @@ "default": "10" }, "vnf_instance_name": { - "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "fromInputName": "2017488_pasqualevpe0_vnf_instance_name", "type": "string", "description": "The hostname assigned to the vpe.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_instance_name" }, "constraints": null, @@ -187,13 +187,13 @@ "default": "mtnj309me6" }, "vnf_config_template_version": { - "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version", "type": "string", "description": "VPE Software Version", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_config_template_version" }, "constraints": null, @@ -201,13 +201,13 @@ "default": "17.2" }, "AIC_CLLI": { - "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "fromInputName": "2017488_pasqualevpe0_AIC_CLLI", "type": "string", "description": "AIC Site CLLI", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "AIC_CLLI" }, "constraints": null, @@ -217,19 +217,19 @@ }, "volumeGroupAllowed": true }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", "description": null, - "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "version": "6", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, "initialCount": 1, - "vfModuleLabel": "ADIOD_base_vPE_BV", + "vfModuleLabel": "PASQUALE_base_vPE_BV", "baseModule" : true }, "inputs": { @@ -237,30 +237,30 @@ }, "volumeGroupAllowed": false }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, - "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "baseModule" : false }, "inputs": { "availability_zone_0": { - "fromInputName": "2017488_adiodvpe0_availability_zone_0", + "fromInputName": "2017488_pasqualevpe0_availability_zone_0", "type": "string", "description": "The Availability Zone to launch the instance.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "paramName": "availability_zone_0" }, "constraints": null, @@ -272,29 +272,29 @@ } }, "volumeGroups": { - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, - "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vRE_BV" + "vfModuleLabel": "PASQUALE_vRE_BV" }, "inputs": { "bandwidth_units": { - "fromInputName": "2017488_adiodvpe0_bandwidth_units", + "fromInputName": "2017488_pasqualevpe0_bandwidth_units", "type": "string", "description": "Units of bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth_units" }, "constraints": null, @@ -302,13 +302,13 @@ "default": "Gbps" }, "bandwidth": { - "fromInputName": "2017488_adiodvpe0_bandwidth", + "fromInputName": "2017488_pasqualevpe0_bandwidth", "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth" }, "constraints": null, @@ -316,13 +316,13 @@ "default": "10" }, "vnf_instance_name": { - "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "fromInputName": "2017488_pasqualevpe0_vnf_instance_name", "type": "string", "description": "The hostname assigned to the vpe.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_instance_name" }, "constraints": null, @@ -330,13 +330,13 @@ "default": "mtnj309me6" }, "vnf_config_template_version": { - "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version", "type": "string", "description": "VPE Software Version", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_config_template_version" }, "constraints": null, @@ -344,13 +344,13 @@ "default": "17.2" }, "AIC_CLLI": { - "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "fromInputName": "2017488_pasqualevpe0_AIC_CLLI", "type": "string", "description": "AIC Site CLLI", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "AIC_CLLI" }, "constraints": null, @@ -359,29 +359,29 @@ } } }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, - "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vPFE_BV" + "vfModuleLabel": "PASQUALE_vPFE_BV" }, "inputs": { "availability_zone_0": { - "fromInputName": "2017488_adiodvpe0_availability_zone_0", + "fromInputName": "2017488_pasqualevpe0_availability_zone_0", "type": "string", "description": "The Availability Zone to launch the instance.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "paramName": "availability_zone_0" }, "constraints": null, @@ -396,7 +396,7 @@ "networks": { }, - "collectionResource": { + "collectionResources": { }, "configurations": { @@ -406,30 +406,30 @@ }, "vfModules": { - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, - "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "baseModule" : false }, "inputs": { "bandwidth_units": { - "fromInputName": "2017488_adiodvpe0_bandwidth_units", + "fromInputName": "2017488_pasqualevpe0_bandwidth_units", "type": "string", "description": "Units of bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth_units" }, "constraints": null, @@ -437,13 +437,13 @@ "default": "Gbps" }, "bandwidth": { - "fromInputName": "2017488_adiodvpe0_bandwidth", + "fromInputName": "2017488_pasqualevpe0_bandwidth", "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth" }, "constraints": null, @@ -451,13 +451,13 @@ "default": "10" }, "vnf_instance_name": { - "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "fromInputName": "2017488_pasqualevpe0_vnf_instance_name", "type": "string", "description": "The hostname assigned to the vpe.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_instance_name" }, "constraints": null, @@ -465,13 +465,13 @@ "default": "mtnj309me6" }, "vnf_config_template_version": { - "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version", "type": "string", "description": "VPE Software Version", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_config_template_version" }, "constraints": null, @@ -479,13 +479,13 @@ "default": "17.2" }, "AIC_CLLI": { - "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "fromInputName": "2017488_pasqualevpe0_AIC_CLLI", "type": "string", "description": "AIC Site CLLI", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "AIC_CLLI" }, "constraints": null, @@ -495,19 +495,19 @@ }, "volumeGroupAllowed": true }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", "description": null, - "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "version": "6", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, "initialCount": 1, - "vfModuleLabel": "ADIOD_base_vPE_BV", + "vfModuleLabel": "PASQUALE_base_vPE_BV", "baseModule" : true }, "inputs": { @@ -515,30 +515,30 @@ }, "volumeGroupAllowed": false }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, - "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "baseModule" : false }, "inputs": { "availability_zone_0": { - "fromInputName": "2017488_adiodvpe0_availability_zone_0", + "fromInputName": "2017488_pasqualevpe0_availability_zone_0", "type": "string", "description": "The Availability Zone to launch the instance.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "paramName": "availability_zone_0" }, "constraints": null, @@ -550,30 +550,30 @@ } }, "volumeGroups": { - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, - "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "baseModule" : false }, "inputs": { "bandwidth_units": { - "fromInputName": "2017488_adiodvpe0_bandwidth_units", + "fromInputName": "2017488_pasqualevpe0_bandwidth_units", "type": "string", "description": "Units of bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth_units" }, "constraints": null, @@ -581,13 +581,13 @@ "default": "Gbps" }, "bandwidth": { - "fromInputName": "2017488_adiodvpe0_bandwidth", + "fromInputName": "2017488_pasqualevpe0_bandwidth", "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "bandwidth" }, "constraints": null, @@ -595,13 +595,13 @@ "default": "10" }, "vnf_instance_name": { - "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "fromInputName": "2017488_pasqualevpe0_vnf_instance_name", "type": "string", "description": "The hostname assigned to the vpe.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_instance_name" }, "constraints": null, @@ -609,13 +609,13 @@ "default": "mtnj309me6" }, "vnf_config_template_version": { - "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version", "type": "string", "description": "VPE Software Version", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "vnf_config_template_version" }, "constraints": null, @@ -623,13 +623,13 @@ "default": "17.2" }, "AIC_CLLI": { - "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "fromInputName": "2017488_pasqualevpe0_AIC_CLLI", "type": "string", "description": "AIC Site CLLI", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", + "vfModuleLabel": "PASQUALE_vRE_BV", "paramName": "AIC_CLLI" }, "constraints": null, @@ -638,30 +638,30 @@ } } }, - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, - "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "version": "8", - "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": 0, "maxCountInstances": null, "initialCount": 0, - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "baseModule" : false }, "inputs": { "availability_zone_0": { - "fromInputName": "2017488_adiodvpe0_availability_zone_0", + "fromInputName": "2017488_pasqualevpe0_availability_zone_0", "type": "string", "description": "The Availability Zone to launch the instance.", "entry_schema": null, "inputProperties": { "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", + "vfModuleLabel": "PASQUALE_vPFE_BV", "paramName": "availability_zone_0" }, "constraints": null, @@ -674,5 +674,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json b/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json index 3b7e2e854..34e2d45b8 100644 --- a/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json +++ b/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json @@ -2,13 +2,13 @@ "service": { "uuid": "6bce7302-70bd-4057-b48e-8d5b99e686ca", "invariantUuid": "9aa04749-c02c-432d-a90c-18caa361c833", - "name": "vDBE_srv", + "name": "vDOROTHEA_srv", "version": "1.0", "toscaModelURL": null, "category": "Network L4+", "serviceType": "", "serviceRole": "", - "description": "vDBE_srv", + "description": "vDOROTHEA_srv", "serviceEcompNaming": "true", "instantiationType": "A-La-Carte", "inputs": { @@ -16,11 +16,11 @@ } }, "vnfs": { - "vDBE 0": { + "vDOROTHEA 0": { "uuid": "61535073-2e50-4141-9000-f66fea69b433", "invariantUuid": "fcdf49ce-6f0b-4ca2-b676-a484e650e734", - "description": "vDBE", - "name": "vDBE", + "description": "vDOROTHEA", + "name": "vDOROTHEA", "version": "0.2", "customizationUuid": "882e5dcb-ba9f-4766-8cde-e326638107db", "inputs": { @@ -40,16 +40,16 @@ "untr_network_collection_function": "untraaa" }, "type": "VF", - "modelCustomizationName": "vDBE 0", + "modelCustomizationName": "vDOROTHEA 0", "vfModules": { - "vdbe0..Vdbe..main..module-0": { + "vdorothea0..Vdorothea..main..module-0": { "uuid": "25a4d009-2f5a-44b4-b02a-62c584c15912", "invariantUuid": "614afb1a-3e7e-44e9-90ab-424d0070c781", "customizationUuid": "3443b341-7b0b-498c-a84a-a7ee736cba7e", "description": null, - "name": "Vdbe..main..module-0", + "name": "Vdorothea..main..module-0", "version": "1", - "modelCustomizationName": "Vdbe..main..module-0", + "modelCustomizationName": "Vdorothea..main..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, @@ -97,7 +97,7 @@ "networks": { }, - "collectionResource": { + "collectionResources": { }, "configurations": { @@ -107,14 +107,14 @@ }, "vfModules": { - "vdbe0..Vdbe..main..module-0": { + "vdorothea0..Vdorothea..main..module-0": { "uuid": "25a4d009-2f5a-44b4-b02a-62c584c15912", "invariantUuid": "614afb1a-3e7e-44e9-90ab-424d0070c781", "customizationUuid": "3443b341-7b0b-498c-a84a-a7ee736cba7e", "description": null, - "name": "Vdbe..main..module-0", + "name": "Vdorothea..main..module-0", "version": "1", - "modelCustomizationName": "Vdbe..main..module-0", + "modelCustomizationName": "Vdorothea..main..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, @@ -134,5 +134,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/vl-csar.JSON b/vid-app-common/src/test/resources/vl-csar.JSON index 3de6ee460..cdf2125d4 100644 --- a/vid-app-common/src/test/resources/vl-csar.JSON +++ b/vid-app-common/src/test/resources/vl-csar.JSON @@ -75,7 +75,7 @@ "modelCustomizationName": "ExtVL 0" } }, - "collectionResource": { + "collectionResources": { }, "configurations": { @@ -93,5 +93,8 @@ "pnfs": { }, - "vnfGroups": {} + "vnfGroups": {}, + "vrfs": { + + } } \ No newline at end of file diff --git a/vid-app-common/src/test/resources/vnf-grouping-csar.json b/vid-app-common/src/test/resources/vnf-grouping-csar.json index 4c6f1d9c5..ebf2204bd 100644 --- a/vid-app-common/src/test/resources/vnf-grouping-csar.json +++ b/vid-app-common/src/test/resources/vnf-grouping-csar.json @@ -18,18 +18,18 @@ }, "networks": { }, - "collectionResource": { + "collectionResources": { }, "configurations": { }, "fabricConfigurations": { }, "serviceProxies": { - "vdbe_svc_vprs_proxy 0": { + "vdorothea_svc_vprs_proxy 0": { "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", - "description": "A Proxy for Service vDBE_Svc_vPRS", - "name": "vDBE_Svc_vPRS Service Proxy", + "description": "A Proxy for Service vDOROTHEA_Svc_vPRS", + "name": "vDOROTHEA_Svc_vPRS Service Proxy", "version": "1.0", "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9", "inputs": { @@ -42,7 +42,7 @@ "type": "Service Proxy", "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274", "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14", - "sourceModelName": "vDBE_Svc_vPRS" + "sourceModelName": "vDOROTHEA_Svc_vPRS" }, "tsbc0001vm001_svc_proxy 0": { "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", @@ -87,11 +87,11 @@ "ecomp_generated_naming": "true" }, "members": { - "vdbe_svc_vprs_proxy 0": { + "vdorothea_svc_vprs_proxy 0": { "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", - "description": "A Proxy for Service vDBE_Svc_vPRS", - "name": "vDBE_Svc_vPRS Service Proxy", + "description": "A Proxy for Service vDOROTHEA_Svc_vPRS", + "name": "vDOROTHEA_Svc_vPRS Service Proxy", "version": "1.0", "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9", "inputs": {}, @@ -102,7 +102,7 @@ "type": "Service Proxy", "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274", "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14", - "sourceModelName": "vDBE_Svc_vPRS" + "sourceModelName": "vDOROTHEA_Svc_vPRS" } } }, @@ -119,7 +119,8 @@ "function": "SIGNALING", "description": "DDD1", "type": "LOAD-GROUP", - "ecomp_generated_naming": "true" + "ecomp_generated_naming": "true", + "quantity": 3 }, "members": { "tsbc0001vm001_svc_proxy 0": { @@ -141,5 +142,8 @@ } } } + }, + "vrfs": { + } } \ No newline at end of file -- cgit 1.2.3-korg