Merge changes from topics "VID-14", "VID-13", "VID-12"
authorIttay Stern <ittay.stern@att.com>
Tue, 10 Sep 2019 13:13:19 +0000 (13:13 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 10 Sep 2019 13:13:19 +0000 (13:13 +0000)
* changes:
  Add Semicolon at the end
  Add Semicolon at the end
  Add Semicolon ath the end

135 files changed:
epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
features.properties.md [new file with mode: 0644]
vid-app-common/src/main/java/org/onap/vid/aai/AaiClient.java
vid-app-common/src/main/java/org/onap/vid/job/command/CommandUtils.java
vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt
vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt
vid-app-common/src/main/java/org/onap/vid/model/Action.java
vid-app-common/src/main/java/org/onap/vid/model/ServiceInfo.java
vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java
vid-app-common/src/main/java/org/onap/vid/mso/MsoBusinessLogicImpl.java
vid-app-common/src/main/java/org/onap/vid/mso/MsoProperties.java
vid-app-common/src/main/java/org/onap/vid/mso/rest/MsoRestClientNew.java
vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
vid-app-common/src/main/webapp/app/vid/scripts/controller/pnfSearchAssociationController.js
vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
vid-app-common/src/test/java/org/onap/vid/aai/AaiClientTest.java
vid-app-common/src/test/java/org/onap/vid/controller/AaiControllerTest.java
vid-app-common/src/test/java/org/onap/vid/controller/PromiseEcompRequestIdFilterTest.java
vid-app-common/src/test/java/org/onap/vid/job/impl/AsyncInstantiationIntegrationTest.java
vid-app-common/src/test/java/org/onap/vid/mso/MsoBusinessLogicImplTest.java
vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientNewTest.java
vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTest.java
vid-app-common/src/test/java/org/onap/vid/mso/rest/MsoRestClientTestUtil.java
vid-app-common/src/test/java/org/onap/vid/mso/rest/OutgoingRequestHeadersTest.java
vid-app-common/src/test/java/org/onap/vid/services/AAIServiceTreeIntegrativeTest.java
vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBaseTest.java
vid-app-common/src/test/java/org/onap/vid/services/AsyncInstantiationBusinessLogicTest.java
vid-app-common/src/test/java/org/onap/vid/services/MsoRequestBuilderTest.java
vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java
vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java
vid-app-common/src/test/resources/WEB-INF/conf/system.properties
vid-app-common/src/test/resources/mso.properties [deleted file]
vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule.json
vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java [new file with mode: 0644]
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java
vid-automation/src/main/java/vid/automation/test/infra/Features.java
vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java
vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance.json
vid-automation/src/main/resources/registration_to_simulator/activateDeactivate/mso_activate_service_instance_error.json
vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json
vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship.json
vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_add_pnf_relationship_error.json
vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship.json
vid-automation/src/main/resources/registration_to_simulator/pProbe/mso_remove_pnf_relationship_error.json
vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java
vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json
vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json
vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json
vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json
vid-automation/src/test/resources/registration_to_simulator/delete_service_instance1802.json
vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json
vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json
vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json
vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json
vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json [new file with mode: 0644]
vid-ext-services-simulator/src/main/resources/preset_registration/deactivate_service_instance.json
vid-ext-services-simulator/src/main/resources/preset_registration/dissociate_pnf_from_service_instance.json
vid-ext-services-simulator/src/main/resources/preset_registration/post_mso_create_service_instance.json
vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts
vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
vid-webpack-master/cypress/integration/iFrames/vnf.update.e2e.ts
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json
vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts
vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts
vid-webpack-master/package.cypress.json
vid-webpack-master/package.json
vid-webpack-master/src/app/drawingBoard/drawingBoard.module.ts
vid-webpack-master/src/app/drawingBoard/guards/servicePlanningGuard/drawingBoardGuard.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.component.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.html
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.scss
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-tree/drawing-board-tree.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.service.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts
vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/service.control.generator.spec.ts
vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.spec.ts
vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vnfGenerator/vnf.control.generator.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/generic-form-popup.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/basic.popup.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/network/network.popup.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/service/service.popup.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnf/vnf.popup.service.spec.ts
vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vnfGroup/vnfGroup.popup.service.spec.ts
vid-webpack-master/src/app/shared/models/serviceInstance.ts
vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
vid-webpack-master/src/app/shared/models/vnfInstance.ts
vid-webpack-master/src/app/shared/resolvers/viewEdit/viewEdit.resolver.ts
vid-webpack-master/src/app/shared/services/aaiService/aai.service.spec.ts
vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts
vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts
vid-webpack-master/src/app/shared/storeUtil/utils/service/service.actions.ts
vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.spec.ts
vid-webpack-master/src/app/shared/storeUtil/utils/service/service.reducers.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.actions.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.spec.ts
vid-webpack-master/src/app/shared/storeUtil/utils/vnf/vnf.reducers.ts
vid-webpack-master/src/app/shared/utils/constants.ts

index c229f58..0e96997 100755 (executable)
@@ -104,26 +104,24 @@ mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
 
 #E2E is v3
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
-mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances
-mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
+mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs
 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
 mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
-mso.restapi.volume.group.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.volume.group.instance=${mso.restapi.vnf.instance}/<vnf_instance_id>/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/<request_id>/resume
 mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
 mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
-mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
 
 mso.restapi.cloudResourcesApiRoot=/cloudResources/v1
index e3d46aa..272f4d0 100755 (executable)
@@ -104,26 +104,24 @@ mso.password.x=${VID_MSO_PASS}
 
 #E2E is v3
 mso.restapi.svc.e2einstance=/e2eServiceInstances/v3
-mso.restapi.svc.instance=/serviceInstantiation/v7/serviceInstances
-mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
+mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs
 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
 mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
-mso.restapi.volume.group.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.volume.group.instance=${mso.restapi.vnf.instance}/<vnf_instance_id>/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/<request_id>/resume
 mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
 mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
-mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
 
 mso.restapi.cloudResourcesApiRoot=/cloudResources/v1
diff --git a/features.properties.md b/features.properties.md
new file mode 100644 (file)
index 0000000..a61893f
--- /dev/null
@@ -0,0 +1,173 @@
+
+### Feature Flags
+
+* FLAG_ADD_MSO_TESTAPI_FIELD
+
+  As MSO are trying a macro/a-la-carte API consolidation, this feature will signal
+  MSO whether to use the old API or the new one.
+  If enabled, VID will add the field "testApi" (with a selectable value) to many 
+  requests' payloads.
+
+* FLAG_NETWORK_TO_ASYNC_INSTANTIATION
+
+  If FLAG_NETWORK_TO_ASYNC_INSTANTIATION is enabled - services that contain networks will also use the new macro instantiation flow
+  as describes under: FLAG_ASYNC_INSTANTIATION
+  Combination of FLAG_ASYNC_INSTANTIATION- enabled and FLAG_NETWORK_TO_ASYNC_INSTANTIATION- disabled - may break tests
+  that contain csars with networks and expected to go to new flow
+
+* FLAG_5G_IN_NEW_INSTANTIATION_UI
+
+  Enable deployment of 5G a-la-carte services in the "new" Angular 2 instantiation pages.
+  If disabled, the deploy process will be in old UI. 
+
+* FLAG_SHOW_ASSIGNMENTS
+
+* FLAG_ASYNC_ALACARTE_VNF
+
+  enable creating vnfs via async instantiation of a-la-carte service
+
+* FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS
+
+    
+* FLAG_A_LA_CARTE_AUDIT_INFO
+
+  This flag enable show a-la-carte mso audit info, online from mso
+
+
+* FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS
+
+  Once a Provider Network is instantiated and the user goes to View / Edit, she will
+  be able to view the Tenant Networks associated with a Provider network.
+  
+  This information about the networks is retrieved from A&AI.
+  
+  If flag disabled, A&AI is not approached, and View / Edit shows no underlying
+  VLANs.
+  
+* FLAG_ASYNC_ALACARTE_VFMODULE
+
+  Enable creating vfModules and volume groups via async instantiation of a-la-carte 
+  service. If turned off, only VNFs will be created; vf modules will be ignored. 
+  
+* FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI
+  
+  Experimental flag that route any a-la-carte service deployment to "new" Angular 2 instantiation pages.
+  This flag is currently only for development propose and shall not be enabled in testing/production.
+  
+* FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST
+
+  When this flag is is on, VID is adding cloudOwner field into CloudConfiguration section of MSO requests.
+  Relevant requests for 1810 :
+  
+    * Create VNF
+    * Create Volume Group
+    * Create VfModule
+    * Create Network  
+    * Create Macro service
+    * Delete VNF
+    * Delete Volume Group
+    * Delete VfModule
+    * Delete Network  
+    * Delete Macro service
+
+* FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE
+
+  Enable soft delete for vf-module in view/edit page for a-la-carte only.
+
+  
+* FLAG_1810_AAI_LOCAL_CACHE
+
+  Enables the caching of selected AAI responses.
+  
+  
+* FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI
+  
+  Enables to identify the service for new UI.
+  
+  
+* FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER
+
+  Enables using DefaultHostnameVerifier in HttpAuthClient in order to enable a more secure connection
+* FLAG_1902_NEW_VIEW_EDIT
+
+  Enable users to go to new view service instance page that is based on service planning page.
+  If the feature flag is on, once a use click open a service on instantiation status dashboard,
+  the user is redirected to the new view page.
+  
+  
+* FLAG_1902_VNF_GROUPING
+
+  Support services with vnf grouping. If the flag is enabled, clicking on deploy of service with vnf grouping 
+  would open the new UI of deploy service. Also if the flag is enabled, view/edit of such a service is service planning 
+  new UI in view/edit mode.
+  
+* FLAG_1902_RETRY_JOB
+  Support retry of failed job. Once async job has failed, the user is able to retry execute the job again.
+    
+* FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY
+
+  While creating a port-mirroring configuration, user will be able to choose the service-type for
+  both pnf anv vnf (aka pprobe and vprobe).
+  
+  Disable this flag to go back to original behaviour, that pnf defaults to the service's service-
+  type, without a visible queue nor an option to change.
+  
+* FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL
+
+  Enable the user to create resources (like VNF, NETWORK, VF_MODULE) in parallel during ALaCarte.
+  For 1902 version the flag is false, since SDNC doesn't support creation of resources in parallel
+  for ALaCarte scenarios.
+  
+* FLAG_1906_COMPONENT_INFO
+  
+  Show in drawing board an information for each resource, when the resource is selected in 
+  the drawing board tree
+  
+* FLAG_1906_INSTANTIATION_API_USER_VALIDATION
+  
+  Enable user role validation for the Backend API instantiation request. The validation is applied for subscriber
+  and service type. There is no tenants validation.
+  
+* FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH
+  
+  Enable using the depth=1 instead of depth=2 parameter in outgoing A&AI GET 'business/customers/customer/{subscriberId}' 
+  request when the Frontend sends the GET '/aai_sub_details/{subscriberId}' request with additional parameter 
+  'omitServiceInstances=true' to the Backend. 
+  
+  Relevant for these specific cases:
+  1) Service types fetching on the "Create New Service Instance" page after subscriber choosing.
+  2) Service types fetching on Service Instance creation popup from the "Browse SDC models" page.
+  
+* FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI
+  Enable opening transport service (service with type:TRANSPORT) in new instantiation UI. 
+  
+* FLAG_1908_INFRASTRUCTURE_VPN
+  Enable opening VRF service (service with type:BONDING, role: INFRASTRUCTURE-VPN) in new instantiation UI.
+
+* FLAG_1908_RESUME_MACRO_SERVICE
+  Enable resume macro service from new view edit page, if :
+  * Service model has a Macro deployment 
+  * Service Instance is in Assigned / Inventoried Ocrh. Status
+  * Service instance Service Type != Transport (PNFs)
+  
+* FLAG_1908_VNF_FABRIC_CONFIGURATION_NEW_INSTANTIATION_UI
+  Enable open the  "new" Angular 2 instantiation pages for service with service-role = "VNF"
+  
+* FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT
+  Adds a button in legacy View/Edit screen that reopens the service in the _new_ View/Edit screen.
+  This button is not displayed when no "Edit" permissions. 
+
+* FLAG_FLASH_REPLACE_VF_MODULE
+  Enable Replace VF module for upgrade flows, requested by the Flash team.
+  When upgrading a VF module VID will invoke the MSO POST VF-module/replace request
+  
+* FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT
+  Enable New UI on View Edit for Macro, NON TRANSPORT services 
+  
+
+  
+  
\ No newline at end of file
index 8e47bba..c43779d 100644 (file)
@@ -440,6 +440,8 @@ public class AaiClient implements AaiClientInterface {
     }
 
     protected Stream<ModelVer> toModelVerStream(ModelVersions modelVersions) {
+        if (modelVersions == null)
+            return null;
 
         if (modelVersions == null)
             return null;
@@ -454,7 +456,6 @@ public class AaiClient implements AaiClientInterface {
     }
 
     protected ModelVer maxModelVer(Stream<ModelVer> modelVerStream) {
-
         if (modelVerStream == null)
             return null;
 
index 0fe7255..2b6b57a 100644 (file)
 package org.onap.vid.job.command;
 
 import org.apache.commons.lang3.StringUtils;
+import org.onap.vid.aai.model.ModelVer;
 import org.onap.vid.asdc.AsdcCatalogException;
 import org.onap.vid.model.ServiceModel;
+import org.onap.vid.services.AaiService;
 import org.onap.vid.services.VidService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -31,18 +33,16 @@ import org.springframework.stereotype.Component;
 public class CommandUtils {
 
     private final VidService vidService;
+    private final AaiService aaiService;
 
     @Autowired
-    public CommandUtils(VidService vidService) {
+    public CommandUtils(VidService vidService, AaiService aaiService) {
         this.vidService = vidService;
+        this.aaiService = aaiService;
     }
 
     public boolean isVfModuleBaseModule(String serviceModelUuid, String vfModuleModelUUID) throws AsdcCatalogException{
-        ServiceModel serviceModel =  vidService.getService(serviceModelUuid);
-
-        if (serviceModel==null) {
-            throw new AsdcCatalogException("Failed to retrieve model with uuid "+serviceModelUuid +" from SDC");
-        }
+        ServiceModel serviceModel =  getServiceModel(serviceModelUuid);
 
         if (serviceModel.getVfModules() == null) {
             throw createAsdcCatalogVfModuleModelUUIDNotFoundException(serviceModelUuid, vfModuleModelUUID);
@@ -58,6 +58,23 @@ public class CommandUtils {
                 .getBaseModule();
     }
 
+    public ServiceModel getServiceModel(String serviceModelUuid) throws AsdcCatalogException{
+        ServiceModel serviceModel =  vidService.getService(serviceModelUuid);
+
+        if (serviceModel==null) {
+            throw new AsdcCatalogException("Failed to retrieve model with uuid "+serviceModelUuid +" from SDC");
+        }
+
+        return serviceModel;
+    }
+
+    public String getNewestModelUuid(String serviceModelInvariantId)
+    {
+        ModelVer serviceModelLatestVersion = aaiService.getNewestModelVersionByInvariantId(serviceModelInvariantId);
+
+        return serviceModelLatestVersion.getModelVersionId();
+    }
+
     private AsdcCatalogException createAsdcCatalogVfModuleModelUUIDNotFoundException(String serviceModelUuid, String vfModuleModelUUID) {
         return new AsdcCatalogException("Failed to find vfModuleModelUUID: " + vfModuleModelUUID +
                 "in model with uuid: " + serviceModelUuid);
index 0e9ab7b..2c50e03 100644 (file)
@@ -222,11 +222,16 @@ abstract class ResourceCommand(
                 else -> InternalState.IN_PROGRESS
             }
 
+            InternalState.REPLACE_MYSELF -> when (jobStatus) {
+                JobStatus.IN_PROGRESS -> InternalState.REPLACE_MYSELF
+                else -> InternalState.IN_PROGRESS
+            }
+
             InternalState.IN_PROGRESS -> {
                 when {
                     jobStatus != JobStatus.COMPLETED -> InternalState.IN_PROGRESS
                     isDescendantHasAction(Action.Create) -> InternalState.CREATING_CHILDREN
-                    isDescendantHasAction(Action.Replace) -> InternalState.CREATING_CHILDREN
+                    isDescendantHasAction(Action.Upgrade) -> InternalState.CREATING_CHILDREN
                     else -> InternalState.TERMINAL
                 }
             }
@@ -284,7 +289,7 @@ abstract class ResourceCommand(
                     isNeedToResumeMySelf() -> InternalState.RESUME_MYSELF
                     isNeedToReplaceMySelf() -> InternalState.REPLACE_MYSELF
                     isDescendantHasAction(phase) -> InternalState.CREATING_CHILDREN
-                    isDescendantHasAction(Action.Replace) -> InternalState.CREATING_CHILDREN
+                    isDescendantHasAction(Action.Upgrade) -> InternalState.CREATING_CHILDREN
                     else -> InternalState.TERMINAL
                 }
                 else -> throw IllegalStateException("state $internalState is not supported yet")
index af52fa0..276b00e 100644 (file)
@@ -5,9 +5,10 @@ import org.onap.vid.job.Job
 import org.onap.vid.job.JobAdapter
 import org.onap.vid.job.JobCommand
 import org.onap.vid.job.JobsBrokerService
-import org.onap.vid.model.Action
+import org.onap.vid.model.*
 import org.onap.vid.model.serviceInstantiation.VfModule
 import org.onap.vid.mso.RestMsoImplementation
+import org.onap.vid.mso.model.ModelInfo
 import org.onap.vid.services.AsyncInstantiationBusinessLogic
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.config.ConfigurableBeanFactory
@@ -16,6 +17,8 @@ import org.springframework.http.HttpMethod
 import org.springframework.stereotype.Component
 import java.util.*
 
+typealias ToscaVfm = org.onap.vid.model.VfModule
+
 @Component
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 class VfmoduleCommand @Autowired constructor(
@@ -45,7 +48,7 @@ class VfmoduleCommand @Autowired constructor(
         val vnfInstanceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.VNF_INSTANCE_ID)
         val vgInstaceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.VG_INSTANCE_ID)
 
-        val instantiatePath = asyncInstantiationBL.getVfmoduleInstantiationPath(serviceInstanceId, vnfInstanceId)
+         val instantiatePath = asyncInstantiationBL.getVfmoduleInstantiationPath(serviceInstanceId, vnfInstanceId)
 
         val requestDetailsWrapper = msoRequestBuilder.generateVfModuleInstantiationRequest(
                 request as VfModule,
@@ -75,14 +78,16 @@ class VfmoduleCommand @Autowired constructor(
         return false
     }
 
-    private fun planReplaceMyselfRestCall(commandParentData: CommandParentData, request: JobAdapter.AsyncJobRequest, userId: String, testApi: String?): MsoRestCallPlan {
+    private fun planReplaceMyselfRestCall3(commandParentData: CommandParentData, request: JobAdapter.AsyncJobRequest, userId: String, testApi: String?): MsoRestCallPlan {
         val serviceInstanceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.SERVICE_INSTANCE_ID)
         val serviceModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.SERVICE_MODEL_INFO)
         val vnfModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.VNF_MODEL_INFO)
         val vnfInstanceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.VNF_INSTANCE_ID)
         val replacePath = asyncInstantiationBL.getVfModuleReplacePath(serviceInstanceId, vnfInstanceId, getRequest().instanceId)
 
-        val requestDetailsWrapper = msoRequestBuilder.generateVfModuleInstantiationRequest( 
+        amendModelInfoWithNewestModel(serviceModelInfo, vnfModelInfo, (request as VfModule).modelInfo)
+
+        val requestDetailsWrapper = msoRequestBuilder.generateVfModuleInstantiationRequest(
                 request as VfModule, serviceModelInfo, serviceInstanceId,vnfModelInfo, vnfInstanceId,null,userId, testApi)
 
         val actionDescription = "replace vfmodule ${request.instanceId}"
@@ -90,9 +95,142 @@ class VfmoduleCommand @Autowired constructor(
         return MsoRestCallPlan(HttpMethod.POST, replacePath, Optional.of(requestDetailsWrapper), Optional.of(userId), actionDescription)
     }
 
+    private fun planReplaceMyselfRestCall(commandParentData: CommandParentData): MsoRestCallPlan {
+
+        val newestModel = fetchNewestServiceModel()
+
+        val serviceInstanceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.SERVICE_INSTANCE_ID)
+        val vnfInstanceId = commandParentData.getInstanceId(CommandParentData.CommandDataKey.VNF_INSTANCE_ID)
+
+        val (serviceModelInfo, vnfModelInfo, vfmModelInfo) = newestSelector(newestModel, commandParentData);
+
+        val originalRequestWithNewestVfmModelInfo = getRequest().cloneWith(vfmModelInfo)
+
+        val requestDetailsWrapper = msoRequestBuilder.generateVfModuleInstantiationRequest(
+                originalRequestWithNewestVfmModelInfo, serviceModelInfo, serviceInstanceId,
+                vnfModelInfo, vnfInstanceId, null, sharedData.userId, sharedData.testApi)
+
+
+        val replacePath = asyncInstantiationBL.getVfModuleReplacePath(serviceInstanceId, vnfInstanceId, getRequest().instanceId)
+
+        return MsoRestCallPlan(HttpMethod.POST, replacePath, Optional.of(requestDetailsWrapper), Optional.of(sharedData.userId),
+                "replace vfmodule ${getRequest().instanceId}")
+    }
+
+    data class ModelsInfoTriplet(val serviceModelInfo: ModelInfo, val vnfModelInfo: ModelInfo, val vfmModelInfo: ModelInfo)
+
+    private fun newestSelector(newestModel: ServiceModel, commandParentData: CommandParentData): ModelsInfoTriplet {
+        val serviceModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.SERVICE_MODEL_INFO)
+        val vfmModelInfo = getRequest().modelInfo
+        val vnfModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.VNF_MODEL_INFO)
+
+        val newestServiceModelInfo = newestServiceModelInfo(newestModel)
+        val newestVfmModelInfo = newestVfmModelInfo(newestModel)
+        val newestVnfModelInfo = newestVnfModelInfo(newestModel, commandParentData)
+
+        return if (newestServiceModelInfo == null || newestVfmModelInfo == null || newestVnfModelInfo == null) {
+            ModelsInfoTriplet(serviceModelInfo, vnfModelInfo, vfmModelInfo)
+        } else {
+            ModelsInfoTriplet(newestServiceModelInfo, newestVnfModelInfo, newestVfmModelInfo)
+        }
+    }
+
+    private fun newestServiceModelInfo(newestModel: ServiceModel) = toModelInfo(newestModel.service)
+
+    private fun newestVfmModelInfo(newestModel: ServiceModel): ModelInfo? {
+        val vfmModelInfo = getRequest().modelInfo
+        val newestVfm = selectVfm(newestModel, vfmModelInfo)
+        return toModelInfo(newestVfm)
+    }
+
+    private fun newestVnfModelInfo(newestModel: ServiceModel, commandParentData: CommandParentData): ModelInfo? {
+        val vnfModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.VNF_MODEL_INFO)
+        val newestVnf = selectVnf(newestModel, vnfModelInfo)
+        return toModelInfo(newestVnf)
+    }
+
+    private fun selectVfm(newestModel: ServiceModel, modelInfo: ModelInfo) = newestModel.vfModules[modelInfo.modelCustomizationId]
+
+    private fun selectVnf(newestModel: ServiceModel, modelInfo: ModelInfo) = newestModel.vnfs[modelInfo.modelCustomizationId]
+
+    private fun toModelInfo(toBeConverted: VNF?): ModelInfo? = toBeConverted?.let { toModelInfo(it, "vnf") }
+
+    private fun toModelInfo(toBeConverted: ToscaVfm?): ModelInfo? = toBeConverted?.let { toModelInfo(it, "vfModule") }
+
+    private fun toModelInfo(toBeConverted: MinimalNode, modelType: String): ModelInfo {
+        val targetModelInfo = ModelInfo()
+
+        targetModelInfo.modelType = modelType
+        targetModelInfo.modelName = toBeConverted.name
+        targetModelInfo.modelNameVersionId = null
+        targetModelInfo.modelVersion = toBeConverted.version
+        targetModelInfo.modelVersionId = toBeConverted.uuid
+        targetModelInfo.modelInvariantId = toBeConverted.invariantUuid
+
+        targetModelInfo.modelCustomizationId = when (toBeConverted) {
+            is VNF -> toBeConverted.customizationUuid
+            is ToscaVfm -> toBeConverted.customizationUuid
+            else -> throw IllegalArgumentException()
+        }
+
+        targetModelInfo.modelCustomizationName = when (toBeConverted) {
+            is VNF -> toBeConverted.modelCustomizationName
+            is ToscaVfm -> toBeConverted.modelCustomizationName
+            else -> throw IllegalArgumentException()
+        }
+
+        return targetModelInfo
+    }
+
+    private fun toModelInfo(toBeConverted: Service?): ModelInfo? {
+
+        if (toBeConverted == null)
+            return null
+
+        val targetModelInfo = ModelInfo()
+
+        targetModelInfo.modelVersionId = toBeConverted.uuid
+        targetModelInfo.modelInvariantId = toBeConverted.invariantUuid
+        targetModelInfo.modelVersion = toBeConverted.version
+        //targetModelInfo.modelCustomizationId = toBeConverted.customizationUuid
+        //targetModelInfo.modelCustomizationName = toBeConverted.modelCustomizationName
+        targetModelInfo.modelType = "service"
+        targetModelInfo.modelName = toBeConverted.name
+
+        return targetModelInfo
+    }
+
+    private fun amendModelInfoWithNewestModel(serviceModelInfo: ModelInfo, vnfModelInfo: ModelInfo, vfmModelInfo: ModelInfo) {
+        val newestModel = fetchNewestServiceModel()
+        val newestService = newestModel.service
+
+        val newestVfm = newestModel.vfModules[vfmModelInfo.modelCustomizationId]
+        val newestVnf = newestModel.vnfs[vnfModelInfo.modelCustomizationId]
+
+        if (!(newestService == null || newestVnf == null || newestVfm == null)) {
+
+            serviceModelInfo.modelName = newestService.name
+            serviceModelInfo.modelVersionId = newestService.uuid
+            serviceModelInfo.modelVersion = newestService.version
+
+            vnfModelInfo.modelName = newestVnf.name
+            vnfModelInfo.modelVersionId = newestVnf.uuid
+            vnfModelInfo.modelVersion = newestVnf.version
+            vnfModelInfo.modelCustomizationId = newestVnf.customizationUuid
+            vnfModelInfo.modelCustomizationName = newestVnf.modelCustomizationName
+
+            vfmModelInfo.modelName = newestVfm.name
+            vfmModelInfo.modelVersionId = newestVfm.uuid
+            vfmModelInfo.modelVersion = newestVfm.version
+            vfmModelInfo.modelCustomizationId = newestVfm.customizationUuid
+            vfmModelInfo.modelCustomizationName = newestVfm.modelCustomizationName
+        }
+    }
+
+
     override fun replaceMyself(): Job.JobStatus {
         try {
-            val replaceMyselfCommand = planReplaceMyselfRestCall(commandParentData, sharedData.request, sharedData.userId, sharedData.testApi )
+            val replaceMyselfCommand = planReplaceMyselfRestCall(commandParentData)
             return executeAndHandleMsoInstanceRequest(replaceMyselfCommand)
         } catch (exception: Exception) {
             LOGGER.error("Failed to replace instanceId ${getRequest().instanceId} ", exception)
@@ -101,6 +239,14 @@ class VfmoduleCommand @Autowired constructor(
     }
 
     override fun isNeedToReplaceMySelf(): Boolean {
-        return getActionType() == Action.Replace
+        return getActionType() == Action.Upgrade
+    }
+
+    private fun fetchNewestServiceModel(): ServiceModel {
+        val serviceModelInfo = commandParentData.getModelInfo(CommandParentData.CommandDataKey.SERVICE_MODEL_INFO)
+        var modelNewestUuid = commandUtils.getNewestModelUuid(serviceModelInfo.modelInvariantId);
+        var serviceNewestModel = commandUtils.getServiceModel(modelNewestUuid);
+
+        return serviceNewestModel;
     }
 }
index c0d4fae..930f970 100644 (file)
@@ -25,7 +25,7 @@ public enum Action {
     Delete(ServiceInfo.ServiceAction.DELETE),
     None(ServiceInfo.ServiceAction.UPDATE),
     Resume(ServiceInfo.ServiceAction.RESUME),
-    Replace(ServiceInfo.ServiceAction.REPLACE);
+    Upgrade(ServiceInfo.ServiceAction.UPGRADE);
 
     private final ServiceInfo.ServiceAction serviceAction;
     Action(ServiceInfo.ServiceAction serviceAction){
index 1e1e6c2..85c83eb 100644 (file)
@@ -22,18 +22,25 @@ package org.onap.vid.model;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.SelectBeforeUpdate;
-import org.hibernate.annotations.Type;
-import org.onap.portalsdk.core.domain.support.DomainVo;
-import org.onap.vid.job.Job;
-
-import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.SelectBeforeUpdate;
+import org.hibernate.annotations.Type;
+import org.onap.portalsdk.core.domain.support.DomainVo;
+import org.onap.vid.job.Job;
 
 /*
  The following 2 annotations let hibernate to update only fields that actually have been changed.
@@ -51,7 +58,7 @@ public class ServiceInfo extends DomainVo {
         DELETE,
         UPDATE,
         RESUME,
-        REPLACE
+        UPGRADE
     }
 
     private UUID jobId;
index 926dc3c..75658f2 100644 (file)
@@ -65,7 +65,7 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
                        .put("Update_Delete", Action.Delete)
                        .put("None_Delete", Action.Delete)
                        .put("Resume", Action.Resume)
-                       .put("Replace", Action.Replace)
+                       .put("Upgrade", Action.Upgrade)
                        .build();
 
 
index 97b23af..233850d 100644 (file)
 
 package org.onap.vid.model.serviceInstantiation;
 
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.onap.vid.job.JobAdapter;
-import org.onap.vid.job.JobType;
-import org.onap.vid.mso.model.ModelInfo;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
-import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+import org.onap.vid.job.JobAdapter;
+import org.onap.vid.job.JobType;
+import org.onap.vid.mso.model.ModelInfo;
 
 /**
  * The Class VfModule.
@@ -91,4 +90,25 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
        public JobType getJobType() {
                return JobType.VfmoduleInstantiation;
        }
+
+       public VfModule cloneWith(ModelInfo modelInfo) {
+               return new VfModule(
+                               modelInfo,
+                               this.getInstanceName(),
+                               this.getVolumeGroupInstanceName(),
+                               this.getAction().toString(),
+                               this.getLcpCloudRegionId(),
+                               this.getLcpCloudRegionId(),
+                               this.getTenantId(),
+                               this.getInstanceParams(),
+                               this.getSupplementaryParams(),
+                               this.isRollbackOnFailure(),
+                               this.isUsePreload(),
+                               this.getInstanceId(),
+                               this.getTrackById(),
+                               this.getIsFailed(),
+                               this.getStatusMessage()
+               );
+
+       }
 }
\ No newline at end of file
index 4d0d4ee..3d980dc 100644 (file)
@@ -140,7 +140,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
     public MsoResponseWrapper createSvcInstance(RequestDetails msoRequest) {
         logInvocationInDebug("createSvcInstance");
 
-        String endpoint = validateEndpointPath(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String endpoint = validateEndpointPath(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
 
         return msoClientInterface.createSvcInstance(msoRequest, endpoint);
     }
@@ -260,7 +260,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
         logInvocationInDebug("deleteSvcInstance");
         String endpoint;
 
-        endpoint = validateEndpointPath(MsoProperties.MSO_DELETE_OR_UNASSIGN_REST_API_SVC_INSTANCE);
+        endpoint = validateEndpointPath(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         if (shouldUnassignService(serviceStatus)){
             logger.debug(EELFLoggerDelegate.debugLogger, "unassign service");
             String svcEndpoint = endpoint + "/" + serviceInstanceId + "/unassign";
@@ -470,7 +470,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
         String methodName = "activateServiceInstance";
         logInvocationInDebug(methodName);
         try {
-            String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+            String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
             String activateServicePath = serviceEndpoint + "/" + serviceInstanceId + ACTIVATE;
 
             RestObject<String> restObjStr = new RestObject<>();
@@ -534,7 +534,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
 
     @Override
     public String getActivateFabricConfigurationPath(String serviceInstanceId) {
-        String path = validateEndpointPath(MsoProperties.MSO_REST_API_SERVICE_INSTANCE_CREATE);
+        String path = validateEndpointPath(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         path += "/" + serviceInstanceId + ACTIVATE_FABRIC_CONFIGURATION;
 
         return path;
@@ -684,7 +684,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
         logInvocationInDebug("setServiceInstanceStatus");
         String methodName = "setServiceInstanceStatus";
         try {
-            String serviceEndpoint = validateEndpointPath(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+            String serviceEndpoint = validateEndpointPath(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
             String endpoint = serviceEndpoint + "/" + serviceInstanceId;
 
             String isActivateState = (isActivate ? ACTIVATE : DEACTIVATE);
@@ -822,7 +822,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
     public MsoResponseWrapper removeRelationshipFromServiceInstance(RequestDetails requestDetails, String serviceInstanceId) {
         logInvocationInDebug("removeRelationshipFromServiceInstance");
 
-        String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         String removeRelationshipsPath = serviceEndpoint + "/" + serviceInstanceId + "/removeRelationships";
 
         return msoClientInterface.removeRelationshipFromServiceInstance(requestDetails, removeRelationshipsPath);
@@ -832,7 +832,7 @@ public class MsoBusinessLogicImpl implements MsoBusinessLogic {
     public MsoResponseWrapper addRelationshipToServiceInstance(RequestDetails requestDetails, String serviceInstanceId) {
         logInvocationInDebug("addRelationshipToServiceInstance");
 
-        String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String serviceEndpoint = SystemProperties.getProperty(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         String addRelationshipsPath = serviceEndpoint + "/" + serviceInstanceId + "/addRelationships";
 
         return msoClientInterface.addRelationshipToServiceInstance(requestDetails, addRelationshipsPath);
index 4e6258c..81566aa 100644 (file)
@@ -69,10 +69,7 @@ public class MsoProperties extends SystemProperties {
     public static final String MSO_REST_API_E2E_SVC_INSTANCE = "mso.restapi.svc.e2einstance"; // /e2eServiceInstances/v3
 
        /** The Constant MSO_REST_API_SVC_INSTANCE. */
-       public static final String MSO_REST_API_SVC_INSTANCE = "mso.restapi.svc.instance"; // /serviceInstances/v2
-
-       /** The Constant MSO_DELETE_OR_UNASSIGN_REST_API_SVC_INSTANCE. */
-       public static final String MSO_DELETE_OR_UNASSIGN_REST_API_SVC_INSTANCE = "mso.restapi.svc.instance.deleteAndUnassign";
+       public static final String MSO_RESTAPI_SERVICE_INSTANCE = "mso.restapi.service.instance"; // /serviceInstances/v2
 
        /** The Constant MSO_REST_API_VNF_INSTANCE. */
        public static final String MSO_REST_API_VNF_INSTANCE = "mso.restapi.vnf.instance";
@@ -120,9 +117,6 @@ public class MsoProperties extends SystemProperties {
        /** The Constant MSO_REST_API_CLOUD_RESOURCES_REQUEST_STATUS */
        public static final String MSO_REST_API_CLOUD_RESOURCES_REQUEST_STATUS = "mso.restapi.operationalEnvironment.cloudResourcesRequests.status";
 
-       /** The Constant MSO_REST_API_SERVICE_INSTANCE_CREATE */
-       public static final String MSO_REST_API_SERVICE_INSTANCE_CREATE = "mso.restapi.serviceInstanceCreate";
-
        /** The Constant MSO_REST_API_SERVICE_INSTANCE_ASSIGN */
        public static final String MSO_REST_API_SERVICE_INSTANCE_ASSIGN = "mso.restapi.serviceInstanceAssign";
 
index cc6d612..4b8a974 100644 (file)
@@ -20,6 +20,8 @@
  */
 package org.onap.vid.mso.rest;
 
+import static org.onap.vid.utils.Logging.ONAP_REQUEST_ID_HEADER_KEY;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import io.joshworks.restclient.http.HttpResponse;
@@ -177,7 +179,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         logger.debug(EELFLoggerDelegate.debugLogger, methodName + START);
         String path = baseUrl + endpoint;
 
-        HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+        HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
         return MsoUtil.wrapResponse(response);
     }
 
@@ -221,7 +223,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
     public HttpResponseWithRequestInfo<String> getOrchestrationRequest(String endpoint, boolean warpException) {
         String path = baseUrl + endpoint;
 
-        HttpResponse<String> response = client.get(path, commonHeaders, new HashMap<>(), String.class);
+        HttpResponse<String> response = client.get(path, getHeaders(), new HashMap<>(), String.class);
         return new HttpResponseWithRequestInfo<>(response, path, HttpMethod.GET);
     }
 
@@ -229,7 +231,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
     public MsoResponseWrapper getOrchestrationRequest(String endpoint) {
         String path = baseUrl + endpoint;
 
-        HttpResponse<String> response = client.get(path, commonHeaders, new HashMap<>(), String.class);
+        HttpResponse<String> response = client.get(path, getHeaders(), new HashMap<>(), String.class);
         return MsoUtil.wrapResponse(response);
     }
 
@@ -241,7 +243,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         try {
             String path = baseUrl + endpoint;
 
-            HttpResponse<String> response = client.get(path, commonHeaders, new HashMap<>(), String.class);
+            HttpResponse<String> response = client.get(path, getHeaders(), new HashMap<>(), String.class);
             MsoResponseWrapper w = MsoUtil.wrapResponse(response);
 
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " w=" + w.getResponse());
@@ -261,7 +263,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         try {
             String path = baseUrl + endpoint;
 
-            HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
             MsoResponseWrapper w = MsoUtil.wrapResponse(response);
 
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " w=" + w.getResponse());
@@ -302,7 +304,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
 
             logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== "
                   + methodName + " calling change configuration active status, path =[" + path + "]");
-            HttpResponse<String> response = client.post(path, commonHeaders, request, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), request, String.class);
             return MsoUtil.wrapResponse(response);
         } catch (Exception e) {
             logger.info(EELFLoggerDelegate.errorLogger, "." + methodName + e.toString());
@@ -320,7 +322,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
             String path = baseUrl + endpoint;
             logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== "
                 + methodName + " calling change port configuration status, path =[" + path + "]");
-            HttpResponse<String> response = client.post(path, commonHeaders, request, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), request, String.class);
             return MsoUtil.wrapResponse(response);
         } catch (Exception e) {
             logger.info(EELFLoggerDelegate.errorLogger, "." + methodName + e.toString());
@@ -332,7 +334,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
     @Override
     public MsoResponseWrapperInterface changeManagementUpdate(RequestDetailsWrapper requestDetails, String endpoint) {
         String path = baseUrl + endpoint;
-        HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+        HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
         return MsoUtil.wrapResponse2(response, RequestReferencesContainer.class);
     }
 
@@ -345,7 +347,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
             RequestDetailsWrapper requestDetailsWrapper = new RequestDetailsWrapper();
             requestDetailsWrapper.requestDetails = new MsoRequestDetails(request);
 
-            HttpResponse<String> response = client.post(path, commonHeaders, requestDetailsWrapper, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), requestDetailsWrapper, String.class);
             MsoResponseWrapper msoResponseWrapperObject = MsoUtil.wrapResponse(response);
             int status = msoResponseWrapperObject.getStatus();
             if (status == 202) {
@@ -386,7 +388,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
 
             RequestDetailsWrapper requestDetailsWrapper = new RequestDetailsWrapper();
             requestDetailsWrapper.requestDetails = new MsoRequestDetails(request);
-            HttpResponse<String> response = client.put(path, commonHeaders, requestDetailsWrapper, String.class);
+            HttpResponse<String> response = client.put(path, getHeaders(), requestDetailsWrapper, String.class);
             MsoResponseWrapper w = MsoUtil.wrapResponse(response);
 
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " w=" + w.getResponse());
@@ -406,7 +408,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         logger.debug(EELFLoggerDelegate.debugLogger, methodName + " start ");
         try {
             String path = baseUrl + endpoint;
-            HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
             MsoResponseWrapper w = MsoUtil.wrapResponse(response);
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " w =" + w.getResponse());
             return w;
@@ -426,7 +428,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         try {
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " calling Remove relationship from service instance, path =[" + endpoint + "]");
             String path = baseUrl + endpoint;
-            HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
             return MsoUtil.wrapResponse(response);
         } catch (Exception e) {
             logger.info(EELFLoggerDelegate.errorLogger, "." + methodName + e.toString());
@@ -444,7 +446,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " calling Add relationship to service instance, path =[" + addRelationshipsPath + "]");
             String path = baseUrl + addRelationshipsPath;
 
-            HttpResponse<String> response = client.post(path, commonHeaders, requestDetails, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), requestDetails, String.class);
             return MsoUtil.wrapResponse(response);
         } catch (Exception e) {
             logger.info(EELFLoggerDelegate.errorLogger, "." + methodName + e.toString());
@@ -458,7 +460,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         String path = baseUrl + invokeWorkflowsPath;
         Map<String, String> finalHeader = new HashMap<>();
 
-        finalHeader.putAll(commonHeaders);
+        finalHeader.putAll(getHeaders());
         finalHeader.putAll(extraHeaders);
 
         RequestDetailsWrapper<WorkflowRequestDetail> requestDetailsWrapper = new RequestDetailsWrapper<>(workflowRequestDetail);
@@ -470,36 +472,36 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
     @Override
     public <T> HttpResponse<T> get(String endpoint, Class<T> responseClass) {
         String path = baseUrl + endpoint;
-        return client.get(path, commonHeaders, new HashMap<>(), responseClass);
+        return client.get(path, getHeaders(), new HashMap<>(), responseClass);
     }
 
     @Override
     public <T> HttpResponse<T> post(String endpoint, RequestDetailsWrapper<?> requestDetailsWrapper, Class<T> responseClass) {
         String path = baseUrl + endpoint;
 
-        return client.post(path, commonHeaders, requestDetailsWrapper, responseClass);
+        return client.post(path, getHeaders(), requestDetailsWrapper, responseClass);
     }
 
     @Override
     public <T> HttpResponse<T> post(String endpoint, RequestDetails requestDetails, Class<T> responseClass) {
         String path = baseUrl + endpoint;
 
-        return client.post(path, commonHeaders, requestDetails, responseClass);
+        return client.post(path, getHeaders(), requestDetails, responseClass);
     }
 
 
     public HttpResponse<SOWorkflowList> getWorkflowListByModelId(String endpoint){
         String path = baseUrl + endpoint;
 
-        return client.get(path, commonHeaders, Maps.newHashMap(), SOWorkflowList.class);
+        return client.get(path, getHeaders(), Maps.newHashMap(), SOWorkflowList.class);
     }
 
-    private MsoResponseWrapper createInstance(Object request, String path) {
+    protected MsoResponseWrapper createInstance(Object request, String path) {
         String methodName = "createInstance";
         logger.debug(methodName + START);
 
         try {
-            HttpResponse<String> response = client.post(path, commonHeaders, request, String.class);
+            HttpResponse<String> response = client.post(path, getHeaders(), request, String.class);
             return MsoUtil.wrapResponse(response);
         } catch (Exception e) {
             logger.error(EELFLoggerDelegate.errorLogger, "." + methodName + e.toString());
@@ -523,7 +525,7 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         try {
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " calling Delete, path =[" + path + "]");
 
-            HttpResponse<String> response = client.delete(path, commonHeaders, request, String.class);
+            HttpResponse<String> response = client.delete(path, getHeaders(), request, String.class);
             MsoResponseWrapper w = MsoUtil.wrapResponse(response);
 
             logger.debug(EELFLoggerDelegate.debugLogger, methodName + " w=" + w.getResponse());
@@ -537,6 +539,15 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
 
     }
 
+    private Map<String, String> getHeaders() {
+        Map<String, String> map = new HashMap<>();
+        map.putAll(commonHeaders);
+        String requestIdValue = Logging.extractOrGenerateRequestId();
+        map.put(SystemProperties.ECOMP_REQUEST_ID, requestIdValue);
+        map.put(ONAP_REQUEST_ID_HEADER_KEY, requestIdValue);
+        return map;
+    }
+
     private Map<String, String> initCommonHeaders() {
         String username = systemProperties.getProperty(MsoProperties.MSO_USER_NAME);
         String password = systemProperties.getProperty(MsoProperties.MSO_PASSWORD);
@@ -552,7 +563,6 @@ public class MsoRestClientNew extends RestMsoImplementation implements MsoInterf
         map.put(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON);
         map.put(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON);
         map.put(X_FROM_APP_ID, systemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME));
-        map.put(SystemProperties.ECOMP_REQUEST_ID, Logging.extractOrGenerateRequestId());
         map.put(X_ONAP_PARTNER_NAME, "VID");
         return ImmutableMap.copyOf(map);
     }
index d7b3ac6..c77eb82 100644 (file)
@@ -247,13 +247,13 @@ public class AsyncInstantiationBusinessLogicImpl implements
         //in case pause flag is true - use assign , else - use create.
         return MsoBusinessLogicImpl.validateEndpointPath(
                 serviceInstantiationRequest.isPause() ?
-                        MsoProperties.MSO_REST_API_SERVICE_INSTANCE_ASSIGN : MsoProperties.MSO_REST_API_SERVICE_INSTANCE_CREATE
+                        MsoProperties.MSO_REST_API_SERVICE_INSTANCE_ASSIGN : MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE
         );
     }
 
     @Override
     public String getServiceDeletionPath(String serviceInstanceId) {
-        return MsoBusinessLogicImpl.validateEndpointPath( MsoProperties.MSO_DELETE_OR_UNASSIGN_REST_API_SVC_INSTANCE)  + "/" + serviceInstanceId;
+        return MsoBusinessLogicImpl.validateEndpointPath( MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE)  + "/" + serviceInstanceId;
     }
 
     @Override
index 01b8e8a..0c6d1d7 100755 (executable)
@@ -262,6 +262,7 @@ appDS2
       FLAG_VF_MODULE_RESUME_STATUS_CREATE: "FLAG_VF_MODULE_RESUME_STATUS_CREATE",
       FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
       FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
+      FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT: "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT",
     }
 
   };
index 7fa312e..b3afcd8 100755 (executable)
         };\r
 \r
         $scope.allowTransferToNewScreenAndShowButton = function (){\r
-          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_REPLACE_VF_MODULE)) {\r
-              return $scope.isPermitted && !($scope.isMacro());\r
+          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT)) {\r
+              return $scope.isPermitted;\r
           }\r
           return false;\r
         };\r
 \r
+        $scope.navigateToNewEditViewScreen = function(){\r
+                window.location.href = 'serviceModels.htm#/servicePlanning/EDIT?' +\r
+                    'serviceModelId=' +     _.get($scope, 'service.model.service.uuid') +\r
+                    '&subscriberId=' +      $location.search().subscriberId  +\r
+                    '&serviceType=' +       $location.search().serviceType      +\r
+                    '&serviceInstanceId=' + $location.search().serviceInstanceId;\r
+        };\r
+\r
         $scope.deleteService = function (serviceObject, serviceOrchestrationStatus) {\r
 \r
             var serviceInstance = serviceObject.object;\r
index 352d9ca..0cc92ee 100644 (file)
@@ -47,8 +47,8 @@ appDS2.controller("pnfSearchAssociationController", ["COMPONENT", "$log", "FIELD
         var handleGetParametersResponse = function(parameters) {
             $scope.serviceMetadataFields = parameters.summaryList;
             $scope.serviceMetadataFields.forEach(function (t, number) {
-                $scope.serviceMetadataFields[number].key = $scope.serviceMetadataFields[number].name.split(' ').join('')
-            })
+                $scope.serviceMetadataFields[number].key = $scope.serviceMetadataFields[number].name.split(' ').join('');
+            });
             $scope.nodeTemplateFields = _.keyBy(parameters.userProvidedList, 'id');
         };
 
@@ -74,7 +74,7 @@ appDS2.controller("pnfSearchAssociationController", ["COMPONENT", "$log", "FIELD
                    $scope.notFound= true;
                 });
 
-        }
+        };
         var modalInstance;
 
         $scope.associate = function()  {
@@ -99,9 +99,7 @@ appDS2.controller("pnfSearchAssociationController", ["COMPONENT", "$log", "FIELD
                         return null;
                     }
                 }
-            })
-
-
+            });
         };
 
         var updateViewCallbackFunction = function(response) {
index f80f924..6399065 100755 (executable)
@@ -41,7 +41,9 @@
         <h1 class="heading1" style="margin-top: 20px;">{{isPermitted ? "View/Edit" : "View"}} Service Instance</h1>\r
         <a class="btn btn-primary btn-xs pull-right" ng-click="reloadRoute();"><span\r
                 class="glyphicon glyphicon-refresh"></span></a>\r
-\r
+        <a class="pull-right btn btn-primary btn-xs" data-nodrag\r
+           data-tests-id="show-new-screen" ng-if="allowTransferToNewScreenAndShowButton()"\r
+           ng-click="navigateToNewEditViewScreen()" style="margin-right: 8px;">More actions</a>\r
         <br>\r
 \r
         <center>\r
index 5c37bb1..777729c 100644 (file)
@@ -56,7 +56,6 @@ import java.net.URI;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -756,51 +755,6 @@ public class AaiClientTest {
         };
     }
 
-    @Test
-    public void testGetLatestVersionByInvariantId() throws IOException {
-
-        ModelVersions modelVersions = JACKSON_OBJECT_MAPPER.readValue("" +
-                "{\n" +
-                "    \"results\": [\n" +
-                "        {\n" +
-                "            \"model\": {\n" +
-                "                \"model-invariant-id\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\",\n" +
-                "                \"model-type\": \"service\",\n" +
-                "                \"resource-version\": \"1534274421300\"\n" +
-                "            }\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"model-ver\": {\n" +
-                "                \"model-version-id\": \"a92f899d-a3ec-465b-baed-1663b0a5aee1\",\n" +
-                "                \"model-name\": \"NCM_VLAN_SVC_ym161f\",\n" +
-                "                \"model-version\": \"bbb\",\n" +
-                "                \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\",\n" +
-                "                \"model-description\": \"Network Collection service for vLAN tagging\",\n" +
-                "                \"resource-version\": \"1534788756086\"\n" +
-                "            }\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"model-ver\": {\n" +
-                "                \"model-version-id\": \"d2fda667-e92e-4cfa-9620-5da5de01a319\",\n" +
-                "                \"model-name\": \"NCM_VLAN_SVC_ym161f\",\n" +
-                "                \"model-version\": \"aaa\",\n" +
-                "                \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\",\n" +
-                "                \"model-description\": \"Network Collection service for vLAN tagging\",\n" +
-                "                \"resource-version\": \"1534444087221\"\n" +
-                "            }\n" +
-                "        }]}", ModelVersions.class);
-
-
-        final AaiClient aaiClient = new AaiClient(null, null, null);
-
-        assertThat(aaiClient.toModelVerStream(modelVersions).collect(toList()),
-                containsInAnyOrder(
-                        hasProperty("modelVersionId", is("a92f899d-a3ec-465b-baed-1663b0a5aee1")),
-                        hasProperty("modelVersionId", is("d2fda667-e92e-4cfa-9620-5da5de01a319"))
-                ));
-
-    }
-
     @DataProvider
     public static Object[][]  versionsDataProvider() {
         return new Object[][] {
@@ -984,5 +938,4 @@ public class AaiClientTest {
             ));
 
     }
-
 }
index b51bbdc..f9a3749 100644 (file)
@@ -21,6 +21,8 @@
 
 package org.onap.vid.controller;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
@@ -45,8 +47,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.vid.aai.AaiResponse;
+import org.onap.vid.aai.AaiResponseTranslator;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigData;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataError;
 import org.onap.vid.aai.AaiResponseTranslator.PortMirroringConfigDataOk;
@@ -94,7 +98,7 @@ public class AaiControllerTest {
     @Before
     public void setUp() {
         aaiController = new AaiController(aaiService, aaiRestInterface, roleProvider, systemPropertiesWrapper,
-            featureManager);
+                featureManager);
         mockMvc = MockMvcBuilders.standaloneSetup(aaiController).build();
     }
 
@@ -108,12 +112,12 @@ public class AaiControllerTest {
         given(aaiService.getAicZoneForPnf(globalCustomerId, serviceType, serviceId)).willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_get_aic_zone_for_pnf/{globalCustomerId}/{serviceType}/{serviceId}", globalCustomerId, serviceType,
-                serviceId)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
+                get("/aai_get_aic_zone_for_pnf/{globalCustomerId}/{serviceType}/{serviceId}", globalCustomerId, serviceType,
+                        serviceId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
     }
 
     @Test
@@ -124,10 +128,10 @@ public class AaiControllerTest {
         given(aaiService.getInstanceGroupsByVnfInstanceId(vnfInstanceId)).willReturn(aaiResponse);
 
         mockMvc.perform(get("/aai_get_instance_groups_by_vnf_instance_id/{vnfInstanceId}", vnfInstanceId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(expectedResponseBody)));
     }
 
     @Test
@@ -140,17 +144,17 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(eq("VidAaiController"), anyString(), eq(Unchecked.toURI(
-            "search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:"
-                + serviceInstanceId)),
-            eq(false)).getResponse()).willReturn(response);
+                "search/nodes-query?search-node-type=service-instance&filter=service-instance-id:EQUALS:"
+                        + serviceInstanceId)),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
-                serviceInstanceType)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
+                        serviceInstanceType)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -163,17 +167,17 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(eq("VidAaiController"), anyString(), eq(Unchecked.toURI(
-            "search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:"
-                + serviceInstanceId)),
-            eq(false)).getResponse()).willReturn(response);
+                "search/nodes-query?search-node-type=service-instance&filter=service-instance-name:EQUALS:"
+                        + serviceInstanceId)),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
-                serviceInstanceType)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get("/aai_get_service_instance/{service-instance-id}/{service-instance-type}", serviceInstanceId,
+                        serviceInstanceType)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -186,21 +190,21 @@ public class AaiControllerTest {
         given(response.getStatus()).willReturn(HttpStatus.OK.value());
 
         given(aaiRestInterface.RestGet(
-            eq("VidAaiController"),
-            anyString(),
-            eq(Unchecked.toURI(
-                "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
-                    + serviceSubscriptionId + "?depth=0")),
-            eq(false)).getResponse()).willReturn(response);
+                eq("VidAaiController"),
+                anyString(),
+                eq(Unchecked.toURI(
+                        "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
+                                + serviceSubscriptionId + "?depth=0")),
+                eq(false)).getResponse()).willReturn(response);
 
         mockMvc
-            .perform(
-                get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
-                    serviceSubscriptionId)
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(
+                        get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
+                                serviceSubscriptionId)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -209,21 +213,21 @@ public class AaiControllerTest {
         String serviceSubscriptionId = "testServiceSubscriptionId";
         String expectedResponseBody = "Failed to fetch data from A&AI, check server logs for details.";
         given(aaiRestInterface.RestGet(
-            eq("VidAaiController"),
-            anyString(),
-            eq(Unchecked.toURI(
-                "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
-                    + serviceSubscriptionId + "?depth=0")),
-            eq(false)).getResponse()).willReturn(null);
+                eq("VidAaiController"),
+                anyString(),
+                eq(Unchecked.toURI(
+                        "business/customers/customer/" + globalCustomerId + "/service-subscriptions/service-subscription/"
+                                + serviceSubscriptionId + "?depth=0")),
+                eq(false)).getResponse()).willReturn(null);
 
         mockMvc
-            .perform(
-                get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
-                    serviceSubscriptionId)
-                    .contentType(MediaType.APPLICATION_JSON)
-                    .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(
+                        get("/aai_get_service_subscription/{global-customer-id}/{service-subscription-id}", globalCustomerId,
+                                serviceSubscriptionId)
+                                .contentType(MediaType.APPLICATION_JSON)
+                                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -231,18 +235,18 @@ public class AaiControllerTest {
         PortMirroringConfigDataOk okConfigData = new PortMirroringConfigDataOk("foo");
         PortMirroringConfigDataError errorConfigData = new PortMirroringConfigDataError("bar", "{ baz: qux }");
         Map<String, PortMirroringConfigData> expectedJson = ImmutableMap.of(
-            ID_1, okConfigData,
-            ID_2, errorConfigData);
+                ID_1, okConfigData,
+                ID_2, errorConfigData);
         given(aaiService.getPortMirroringConfigData(ID_1)).willReturn(okConfigData);
         given(aaiService.getPortMirroringConfigData(ID_2)).willReturn(errorConfigData);
 
         mockMvc
-            .perform(get("/aai_getPortMirroringConfigsData")
-                .param("configurationIds", ID_1, ID_2)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(expectedJson)));
+                .perform(get("/aai_getPortMirroringConfigsData")
+                        .param("configurationIds", ID_1, ID_2)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(expectedJson)));
     }
 
     @Test
@@ -250,18 +254,18 @@ public class AaiControllerTest {
         PortDetailsOk portDetailsOk = new PortDetailsOk("foo", "testInterface", true);
         PortDetailsError portDetailsError = new PortDetailsError("bar", "{ baz: qux }");
         Multimap<String, PortDetails> expectedJson = ImmutableMultimap.of(
-            ID_1, portDetailsOk,
-            ID_2, portDetailsError);
+                ID_1, portDetailsOk,
+                ID_2, portDetailsError);
         given(aaiService.getPortMirroringSourcePorts(ID_1)).willReturn(Lists.newArrayList(portDetailsOk));
         given(aaiService.getPortMirroringSourcePorts(ID_2)).willReturn(Lists.newArrayList(portDetailsError));
 
         mockMvc
-            .perform(get("/aai_getPortMirroringSourcePorts")
-                .param("configurationIds", ID_1, ID_2)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(expectedJson.asMap())));
+                .perform(get("/aai_getPortMirroringSourcePorts")
+                        .param("configurationIds", ID_1, ID_2)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(expectedJson.asMap())));
     }
 
     @Test
@@ -275,15 +279,15 @@ public class AaiControllerTest {
         String expectedResponseBody = "myResponse";
         AaiResponse<String> aaiResponse = new AaiResponse<>(expectedResponseBody, "", HttpStatus.OK.value());
         given(aaiService
-            .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion))
-            .willReturn(aaiResponse);
+                .getNodeTemplateInstances(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion))
+                .willReturn(aaiResponse);
 
         mockMvc
-            .perform(get(urlTemplate, globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                .perform(get(urlTemplate, globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -292,45 +296,45 @@ public class AaiControllerTest {
         given(aaiService.getAaiZones()).willReturn(new AaiResponse(aicZones, "", HttpStatus.OK.value()));
 
         mockMvc.perform(get("/aai_get_aic_zones")
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(aicZones)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(aicZones)));
     }
 
     @Test
     public void getAicZones_shouldReturnErrorResponse_whenAaiHttpStatusOtherThanOK() throws Exception {
         String expectedErrorMessage = "Calling AAI Failed";
         given(aaiService.getAaiZones())
-            .willReturn(new AaiResponse(null, expectedErrorMessage, HttpStatus.INTERNAL_SERVER_ERROR.value()));
+                .willReturn(new AaiResponse(null, expectedErrorMessage, HttpStatus.INTERNAL_SERVER_ERROR.value()));
 
         mockMvc.perform(get("/aai_get_aic_zones")
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedErrorMessage));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedErrorMessage));
     }
 
     @Test
     public void getSpecificPnf_shouldReturnPnfObjectForPnfId() throws Exception {
         String pnfId = "MyPnfId";
         Pnf pnf = Pnf.builder()
-            .withPnfId(pnfId)
-            .withPnfName("TestPnf")
-            .withPnfName2("pnfName2")
-            .withPnfName2Source("pnfNameSource")
-            .withEquipModel("model")
-            .withEquipType("type")
-            .withEquipVendor("vendor")
-            .build();
+                .withPnfId(pnfId)
+                .withPnfName("TestPnf")
+                .withPnfName2("pnfName2")
+                .withPnfName2Source("pnfNameSource")
+                .withEquipModel("model")
+                .withEquipType("type")
+                .withEquipVendor("vendor")
+                .build();
         AaiResponse<Pnf> aaiResponse = new AaiResponse<>(pnf, "", HttpStatus.OK.value());
         given(aaiService.getSpecificPnf(pnfId)).willReturn(aaiResponse);
 
         mockMvc.perform(get("/aai_get_pnfs/pnf/{pnf_id}", pnfId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().json(objectMapper.writeValueAsString(pnf)));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().json(objectMapper.writeValueAsString(pnf)));
     }
 
     @Test
@@ -340,10 +344,10 @@ public class AaiControllerTest {
         given(aaiService.getSpecificPnf(pnfId)).willThrow(new RuntimeException(expectedErrorMessage));
 
         mockMvc.perform(get("/aai_get_pnfs/pnf/{pnf_id}", pnfId)
-            .contentType(MediaType.APPLICATION_JSON)
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isInternalServerError())
-            .andExpect(content().string(expectedErrorMessage));
+                .contentType(MediaType.APPLICATION_JSON)
+                .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isInternalServerError())
+                .andExpect(content().string(expectedErrorMessage));
     }
 
     public void getPNFInstances_shouldReturnOKResponseFromAAIService() throws Exception {
@@ -359,16 +363,16 @@ public class AaiControllerTest {
         AaiResponse<String> aaiResponse = new AaiResponse<>(expectedResponseBody, "", HttpStatus.OK.value());
 
         given(aaiService
-            .getPNFData(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion, equipVendor,
-                equipModel)).willReturn(aaiResponse);
+                .getPNFData(globalCustomerId, serviceType, modelVersionId, modelInvariantId, cloudRegion, equipVendor,
+                        equipModel)).willReturn(aaiResponse);
 
         mockMvc.perform(
-            get(urlTemplate, globalCustomerId, serviceType, modelVersionId,
-                modelInvariantId, cloudRegion, equipVendor, equipModel)
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponseBody));
+                get(urlTemplate, globalCustomerId, serviceType, modelVersionId,
+                        modelInvariantId, cloudRegion, equipVendor, equipModel)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponseBody));
     }
 
     @Test
@@ -379,20 +383,20 @@ public class AaiControllerTest {
         Response response = mock(Response.class);
         given(response.readEntity(String.class)).willReturn(expectedResponse);
         given(aaiService
-            .getVersionByInvariantId(request.versions)).willReturn(response);
+                .getVersionByInvariantId(request.versions)).willReturn(response);
 
         mockMvc.perform(
-            post("/aai_get_version_by_invariant_id")
-                .content(objectMapper.writeValueAsString(request))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(expectedResponse));
+                post("/aai_get_version_by_invariant_id")
+                        .content(objectMapper.writeValueAsString(request))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(expectedResponse));
     }
 
     @Test
     public void getSubscriberDetails_shouldOmitServiceInstancesFromSubscriberData_whenFeatureEnabled_andOmitFlagIsTrue()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = true;
         boolean omitServiceInstances = true;
 
@@ -401,21 +405,21 @@ public class AaiControllerTest {
         AaiResponse<String> aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value());
         given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive);
         given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class),
-            eq(isFeatureActive && omitServiceInstances)))
-            .willReturn(aaiResponse);
+                eq(isFeatureActive && omitServiceInstances)))
+                .willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_sub_details/{subscriberId}", subscriberId)
-                .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
+                get("/aai_sub_details/{subscriberId}", subscriberId)
+                        .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
     }
 
     @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureEnabled_andOmitFlagIsFalse()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = true;
         boolean omitServiceInstances = false;
 
@@ -424,38 +428,60 @@ public class AaiControllerTest {
 
     @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureDisabled_andOmitFlagIsTrue()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = false;
         boolean omitServiceInstances = true;
 
         getSubscriberDetails_assertServiceInstancesInclusion(isFeatureActive, omitServiceInstances);
     }
 
+    @Test
+    public void getPortMirroringConfigData_givenThreeIds_ReturnsThreeResults() {
+
+        final AaiResponseTranslator.PortMirroringConfigDataOk toBeReturnedForA = new AaiResponseTranslator.PortMirroringConfigDataOk("foobar");
+        final AaiResponseTranslator.PortMirroringConfigDataError toBeReturnedForB = new AaiResponseTranslator.PortMirroringConfigDataError("foo", "{ baz: qux }");
+        final AaiResponseTranslator.PortMirroringConfigDataOk toBeReturnedForC = new AaiResponseTranslator.PortMirroringConfigDataOk("corge");
+
+        Mockito
+                .doReturn(toBeReturnedForA)
+                .doReturn(toBeReturnedForB)
+                .doReturn(toBeReturnedForC)
+                .when(aaiService).getPortMirroringConfigData(Mockito.anyString());
+
+        final Map<String, AaiResponseTranslator.PortMirroringConfigData> result = aaiController.getPortMirroringConfigsData(ImmutableList.of("a", "b", "c"));
+
+        assertThat(result, is(ImmutableMap.of(
+                "a", toBeReturnedForA,
+                "b", toBeReturnedForB,
+                "c", toBeReturnedForC
+        )));
+    }
+
     @Test
     public void getSubscriberDetails_shouldIncludeServiceInstancesFromSubscriberData_whenFeatureDisabled_andOmitFlagIsFalse()
-        throws Exception {
+            throws Exception {
         boolean isFeatureActive = false;
         boolean omitServiceInstances = false;
         getSubscriberDetails_assertServiceInstancesInclusion(isFeatureActive, omitServiceInstances);
     }
 
     private void getSubscriberDetails_assertServiceInstancesInclusion(boolean isFeatureActive,
-        boolean omitServiceInstances) throws Exception {
+                                                                      boolean omitServiceInstances) throws Exception {
         String subscriberId = "subscriberId";
         String okResponseBody = "OK_RESPONSE";
         AaiResponse<String> aaiResponse = new AaiResponse<>(okResponseBody, "", HttpStatus.OK.value());
         given(featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH)).willReturn(isFeatureActive);
         given(aaiService.getSubscriberData(eq(subscriberId), isA(RoleValidatorByRoles.class),
-            eq(isFeatureActive && omitServiceInstances)))
-            .willReturn(aaiResponse);
+                eq(isFeatureActive && omitServiceInstances)))
+                .willReturn(aaiResponse);
 
         mockMvc.perform(
-            get("/aai_sub_details/{subscriberId}", subscriberId)
-                .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
-                .contentType(MediaType.APPLICATION_JSON)
-                .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
+                get("/aai_sub_details/{subscriberId}", subscriberId)
+                        .param("omitServiceInstances", Boolean.toString(omitServiceInstances))
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(content().string(objectMapper.writeValueAsString(okResponseBody)));
     }
 }
 
index f440995..39638c3 100644 (file)
@@ -67,6 +67,21 @@ public class PromiseEcompRequestIdFilterTest {
         buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, specificTxId(someTxId));
     }
 
+
+    @Test
+    public void givenRequestIdHeaderThatIsNotAUUID_headerValueChanged() throws IOException, ServletException {
+
+        final String someTxId = "863850e28544efd94b8afba5f52b3d5";
+
+        final ImmutableMap<String, String> incomingRequestHeaders = ImmutableMap.of(
+                anotherHeader, anotherValue,
+                ECOMP_REQUEST_ID, someTxId
+        );
+
+        buildRequestThenRunThroughFilterAndAssertResultRequestHeaders(incomingRequestHeaders, UserUtils::getRequestId);
+    }
+
+
     @Test
     public void givenMixedCaseRequestIdHeader_headerValueNotChanged() throws IOException, ServletException {
 
index 498708d..fdc416a 100644 (file)
 
 package org.onap.vid.job.impl;
 
+import static java.util.stream.Collectors.counting;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.joining;
+import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonPartEquals;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonPartMatches;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.core.Every.everyItem;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.endsWith;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED_WITH_ERRORS;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED_WITH_NO_ACTION;
+import static org.onap.vid.job.Job.JobStatus.FAILED;
+import static org.onap.vid.job.Job.JobStatus.IN_PROGRESS;
+import static org.onap.vid.job.Job.JobStatus.PAUSE;
+import static org.onap.vid.job.Job.JobStatus.PENDING;
+import static org.onap.vid.job.Job.JobStatus.PENDING_RESOURCE;
+import static org.onap.vid.job.Job.JobStatus.RESOURCE_IN_PROGRESS;
+import static org.onap.vid.job.Job.JobStatus.STOPPED;
+import static org.onap.vid.job.impl.JobSchedulerInitializer.WORKERS_TOPICS;
+import static org.onap.vid.model.JobAuditStatus.SourceStatus.VID;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import javax.inject.Inject;
+import javax.ws.rs.ProcessingException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
@@ -33,13 +90,24 @@ import org.onap.portalsdk.core.service.DataAccessService;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.vid.asdc.AsdcCatalogException;
 import org.onap.vid.changeManagement.RequestDetailsWrapper;
+import org.onap.vid.config.DataSourceConfig;
+import org.onap.vid.config.JobCommandsConfigWithMockedMso;
+import org.onap.vid.config.MockedAaiClientAndFeatureManagerConfig;
 import org.onap.vid.job.Job;
 import org.onap.vid.job.Job.JobStatus;
 import org.onap.vid.job.JobType;
 import org.onap.vid.job.JobsBrokerService;
 import org.onap.vid.job.command.CommandUtils;
 import org.onap.vid.job.command.InternalState;
-import org.onap.vid.model.*;
+import org.onap.vid.model.Action;
+import org.onap.vid.model.JobAuditStatus;
+import org.onap.vid.model.NameCounter;
+import org.onap.vid.model.RequestReferencesContainer;
+import org.onap.vid.model.Service;
+import org.onap.vid.model.ServiceInfo;
+import org.onap.vid.model.ServiceModel;
+import org.onap.vid.model.VNF;
+import org.onap.vid.model.VfModule;
 import org.onap.vid.model.serviceInstantiation.BaseResource;
 import org.onap.vid.model.serviceInstantiation.InstanceGroup;
 import org.onap.vid.model.serviceInstantiation.ServiceInstantiation;
@@ -49,15 +117,12 @@ import org.onap.vid.mso.model.RequestReferences;
 import org.onap.vid.mso.rest.AsyncRequestStatus;
 import org.onap.vid.mso.rest.AsyncRequestStatusList;
 import org.onap.vid.properties.Features;
+import org.onap.vid.services.AsyncInstantiationBaseTest;
 import org.onap.vid.services.AsyncInstantiationBusinessLogic;
 import org.onap.vid.services.AuditService;
 import org.onap.vid.services.VersionService;
-import org.onap.vid.utils.DaoUtils;
-import org.onap.vid.config.DataSourceConfig;
-import org.onap.vid.config.JobCommandsConfigWithMockedMso;
-import org.onap.vid.config.MockedAaiClientAndFeatureManagerConfig;
-import org.onap.vid.services.AsyncInstantiationBaseTest;
 import org.onap.vid.testUtils.TestUtils;
+import org.onap.vid.utils.DaoUtils;
 import org.springframework.http.HttpMethod;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.annotations.BeforeClass;
@@ -66,34 +131,6 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.togglz.core.manager.FeatureManager;
 
-import javax.inject.Inject;
-import javax.ws.rs.ProcessingException;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.*;
-import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
-import static net.javacrumbs.jsonunit.JsonMatchers.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasProperty;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.core.Every.everyItem;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.endsWith;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-import static org.onap.vid.job.Job.JobStatus.*;
-import static org.onap.vid.job.impl.JobSchedulerInitializer.WORKERS_TOPICS;
-import static org.onap.vid.model.JobAuditStatus.SourceStatus.VID;
-import static org.testng.AssertJUnit.*;
-
 //it's more like integration test than UT
 //But it's very hard to test in API test so I use UT
 @ContextConfiguration(classes = {DataSourceConfig.class, SystemProperties.class, MockedAaiClientAndFeatureManagerConfig.class, JobCommandsConfigWithMockedMso.class})
@@ -1203,12 +1240,18 @@ public class AsyncInstantiationIntegrationTest extends AsyncInstantiationBaseTes
     }
 
     @Test
-    public void whenUpgradingAvfModule_thanExpectedReplaceRequestSent() throws IOException {
-        String instanceId = "5d49c3b1-fc90-4762-8c98-e800170baa55"; //from feRequestResumeMacroService.json
+    public void whenUpgradingAvfModule_thanExpectedReplaceRequestSent() throws IOException, AsdcCatalogException {
+        String instanceId = "5d49c3b1-fc90-4762-8c98-e800170baa55"; //from replace_vfmodule_fe_input.json
         String replaceRequestId = randomUuid();
         String userId = "az2016";
 
 
+        //prepare mocks for newest model
+        String newestModelUuid = "newest-model-uuid";
+        when(commandUtils.getNewestModelUuid(eq("b16a9398-ffa3-4041-b78c-2956b8ad9c7b"))).thenReturn(newestModelUuid);
+
+        when(commandUtils.getServiceModel(eq(newestModelUuid))).thenReturn(generateMockLatestModelForUpgrade());
+
         //prepare mocks resume request
         when(restMso.restCall(eq(HttpMethod.POST), eq(RequestReferencesContainer.class), any(), eq("/serviceInstantiation/v7/serviceInstances/e9993045-cc96-4f3f-bf9a-71b2a400a956/vnfs/5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5/vfModules/5d49c3b1-fc90-4762-8c98-e800170baa55/replace"), eq(Optional.of(userId))))
             .thenReturn(createResponse(202, instanceId, replaceRequestId));
@@ -1235,7 +1278,53 @@ public class AsyncInstantiationIntegrationTest extends AsyncInstantiationBaseTes
         requestCaptor.getAllValues().forEach(x->assertJsonEquals(expectedJson, x));
     }
 
+    private ServiceModel generateMockLatestModelForUpgrade() {
+        ServiceModel expectedNewestModel = new ServiceModel();
+
+
+        VfModule vfm = new VfModule();
+        vfm.setModelCustomizationName("newest-model-customization-name-vfm");
+        vfm.setCustomizationUuid("newest-model-customization-uuid-vfm");
+        vfm.setVersion("newest-model-version-vfm");
+        vfm.setUuid("newest-model-uuid-vfm");
+        vfm.setName("newest-model-name-vfm");
+        vfm.setInvariantUuid("f7a867f2-596b-4f4a-a128-421e825a6190");
+
+
+        Map<String,VfModule> vfms = new HashMap<>();
+        vfms.put("074c64d0-7e13-4bcc-8bdb-ea922331102d", vfm);
+
+
+        VNF vnf = new VNF();
+        vnf.setModelCustomizationName("newest-model-customization-name-vnf");
+        vnf.setCustomizationUuid("newest-model-customization-uuid-vnf");
+        vnf.setVersion("newest-model-version-vnf");
+        vnf.setUuid("newest-model-uuid-vnf");
+        vnf.setName("newest-model-name-vnf");
+        vnf.setInvariantUuid("23122c9b-dd7f-483f-bf0a-e069303db2f7");
+        vnf.setVfModules(vfms);
+        expectedNewestModel.setVfModules(vfms);
+
+        Map<String,VNF> vnfs = new HashMap<>();
+        vnfs.put("96c23a4a-6887-4b2c-9cce-1e4ea35eaade", vnf);
+
+        Service svc = new Service();
+        svc.setInvariantUuid("b16a9398-ffa3-4041-b78c-2956b8ad9c7b");
+        svc.setUuid("newest-model-uuid-service");
+        svc.setVersion("newest-model-version-service");
+        svc.setName("newest-model-name-service");
+
+        expectedNewestModel.setService(svc);
+
+        expectedNewestModel.setVnfs(vnfs);
+
+        return expectedNewestModel;
+
+
+    }
+
     private ServiceInstantiation generateReplaceVfModulePayload() throws IOException {
         return TestUtils.readJsonResourceFileAsObject("/payload_jsons/vfmodule/replace_vfmodule_fe_input.json", ServiceInstantiation.class);
     }
+
 }
index 63cd62c..558dc26 100644 (file)
@@ -138,7 +138,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests {
     public void shouldProperlyCreateConfigurationInstanceWithCorrectServiceInstanceId() throws Exception {
         // given
         String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d";
-        String endpointTemplate = String.format("/serviceInstances/v6/%s/configurations", serviceInstanceId);
+        String endpointTemplate = String.format("/serviceInstantiation/v7/serviceInstances/%s/configurations", serviceInstanceId);
         RequestDetailsWrapper requestDetailsWrapper = createRequestDetails();
         MsoResponseWrapper expectedResponse = createOkResponse();
         given(msoInterface.createConfigurationInstance(requestDetailsWrapper, endpointTemplate))
@@ -184,7 +184,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests {
     public void shouldProperlyCreateSvcInstanceWithProperParameters() {
 
         MsoResponseWrapper expectedResponse = createOkResponse();
-        String svcEndpoint = SystemProperties.getProperty(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String svcEndpoint = SystemProperties.getProperty(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         given(msoInterface.createSvcInstance(msoRequest, svcEndpoint)).willReturn(expectedResponse);
 
         MsoResponseWrapper response = msoBusinessLogic.createSvcInstance(msoRequest);
@@ -833,7 +833,7 @@ public class MsoBusinessLogicImplTest extends AbstractTestNGSpringContextTests {
     public void shouldProperlyGetActivateFabricConfigurationPathWithProperParameters() {
         // given
         String serviceInstanceId = "testServiceId";
-        String path = validateEndpointPath(MsoProperties.MSO_REST_API_SERVICE_INSTANCE_CREATE);
+        String path = validateEndpointPath(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         path += "/" + serviceInstanceId + "/activateFabricConfiguration";
 
         // when
index c47e7ce..65cfcc1 100644 (file)
@@ -46,7 +46,6 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.aai.HttpResponseWithRequestInfo;
 import org.onap.vid.client.SyncRestClient;
 import org.onap.vid.controller.MsoController;
 import org.onap.vid.controller.WebConfig;
@@ -196,7 +195,7 @@ public class MsoRestClientNewTest {
     @Ignore
     @Test
     public void testDeleteSvcInstance() throws Exception {
-        String endpoint = props.getString(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String endpoint = props.getString(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         endpoint = endpoint.replaceFirst(MsoController.SVC_INSTANCE_ID, SERVICE_INSTANCE_ID);
 
 
@@ -360,7 +359,7 @@ public class MsoRestClientNewTest {
 
     @Test
     public void testSetConfigurationActiveStatus() throws Exception {
-        String endpoint = "/serviceInstances/v7/<service_instance_id>/configurations/<configuration_id>";
+        String endpoint = "/serviceInstantiation/v7/serviceInstances/<service_instance_id>/configurations/<configuration_id>";
         endpoint = endpoint.replace(MsoController.SVC_INSTANCE_ID, SERVICE_INSTANCE_ID);
         endpoint = endpoint.replace(MsoController.CONFIGURATION_ID, SAMPLE_CONFIGURATION_ID);
         endpoint = endpoint + "/activate";
@@ -432,7 +431,7 @@ public class MsoRestClientNewTest {
 
     @Test
     public void testRemoveRelationshipFromServiceInstance() throws Exception {
-        String serviceEndpoint = props.getString(MsoProperties.MSO_REST_API_SVC_INSTANCE);
+        String serviceEndpoint = props.getString(MsoProperties.MSO_RESTAPI_SERVICE_INSTANCE);
         String removeRelationshipsPath = serviceEndpoint + "/" + SERVICE_INSTANCE_ID + "/removeRelationships";
 
         try (MsoRestClientTestUtil closure = new MsoRestClientTestUtil(
index c91e88b..78982ef 100644 (file)
@@ -25,18 +25,32 @@ import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.refEq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
+import static org.onap.vid.utils.KotlinUtilsKt.JACKSON_OBJECT_MAPPER;
+import static org.onap.vid.utils.Logging.ONAP_REQUEST_ID_HEADER_KEY;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.joshworks.restclient.http.HttpResponse;
 import io.joshworks.restclient.http.JsonMapper;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 import org.apache.http.ProtocolVersion;
 import org.apache.http.StatusLine;
 import org.apache.http.message.BasicHttpResponse;
 import org.apache.http.message.BasicStatusLine;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.vid.aai.HttpResponseWithRequestInfo;
 import org.onap.vid.changeManagement.RequestDetailsWrapper;
@@ -54,17 +68,11 @@ import org.onap.vid.utils.SystemPropertiesWrapper;
 import org.springframework.http.HttpMethod;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.mockito.ArgumentMatchers.refEq;
-import static org.mockito.hamcrest.MockitoHamcrest.argThat;
-import static org.onap.vid.utils.KotlinUtilsKt.JACKSON_OBJECT_MAPPER;
-
 
 @ContextConfiguration(classes = {LocalWebConfig.class, SystemProperties.class})
 @WebAppConfiguration
@@ -138,6 +146,45 @@ public class MsoRestClientTest {
         assertThat(response).isEqualToComparingFieldByField(expectedResponse);
     }
 
+    @Test
+    public void whenCreateInstanceTwice_thenRequestIdHeaderIsDifferentEachTime() {
+
+        RequestAttributes prevRequestAttributes = RequestContextHolder.getRequestAttributes();
+
+        try {
+            //given
+            Mockito.reset(client);
+
+            //mocking syncRestClient
+            RequestDetails requestDetails = MsoRestClientTestUtil.generateMockMsoRequest();
+            HttpResponse<String> httpResponse = HttpResponse.fallback("testOkResponse");
+            when( client.post( anyString() ,anyMap(), any(RequestDetails.class), eq(String.class) )  ).thenReturn(httpResponse);
+
+            //when
+            //create different ECOMP_REQUEST_ID header in Spring HttpServlet each time
+            OutgoingRequestHeadersTest.putRequestInSpringContext();
+            restClient.createInstance(requestDetails, "someEndPoint");
+
+            OutgoingRequestHeadersTest.putRequestInSpringContext();
+            restClient.createInstance(requestDetails, "someEndPoint");
+
+            //then
+            ArgumentCaptor<Map<String, String>> requestCaptor = ArgumentCaptor.forClass(Map.class);
+            verify(client, times(2)).post(anyString(), requestCaptor.capture(), any(RequestDetails.class), eq(String.class));
+            assertEquals(2, requestCaptor.getAllValues().size());
+            assertNotEquals(requestCaptor.getAllValues().get(0).get(SystemProperties.ECOMP_REQUEST_ID),
+                requestCaptor.getAllValues().get(1).get(SystemProperties.ECOMP_REQUEST_ID),
+                SystemProperties.ECOMP_REQUEST_ID + " headers are the same");
+            assertNotEquals(requestCaptor.getAllValues().get(0).get(ONAP_REQUEST_ID_HEADER_KEY),
+                requestCaptor.getAllValues().get(1).get(ONAP_REQUEST_ID_HEADER_KEY),
+                ONAP_REQUEST_ID_HEADER_KEY + " headers are the same");
+        }
+        finally {
+            //make sure other test keep go smooth
+            RequestContextHolder.setRequestAttributes(prevRequestAttributes);
+        }
+    }
+
     @Test
     public void shouldProperlyCreateVnf() {
         //  given
index f662357..ac82a6e 100644 (file)
@@ -32,6 +32,8 @@ import static com.xebialabs.restito.semantics.Condition.post;
 import static com.xebialabs.restito.semantics.Condition.uri;
 import static com.xebialabs.restito.semantics.Condition.withHeader;
 import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
+import static org.onap.vid.mso.rest.MsoRestClientNew.X_ONAP_PARTNER_NAME;
+import static org.onap.vid.utils.Logging.ONAP_REQUEST_ID_HEADER_KEY;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.xebialabs.restito.semantics.Action;
@@ -233,7 +235,10 @@ class MsoRestClientTestUtil implements AutoCloseable {
         withHeader(HttpHeaders.ACCEPT),
         withHeader(HttpHeaders.CONTENT_TYPE),
         withHeader(MsoRestClientNew.X_FROM_APP_ID),
-        withHeader(SystemProperties.ECOMP_REQUEST_ID));
+        withHeader(X_ONAP_PARTNER_NAME, "VID"),
+        withHeader(SystemProperties.ECOMP_REQUEST_ID),
+        withHeader(ONAP_REQUEST_ID_HEADER_KEY)
+    );
   }
 
   private Action jsonContent(String str) {
index 316f200..b70ba06 100644 (file)
 
 package org.onap.vid.mso.rest;
 
+import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasToString;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.ImmutableList;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.core.MultivaluedMap;
 import org.apache.commons.lang3.reflect.FieldUtils;
-import org.mockito.*;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.onap.vid.aai.util.AAIRestInterface;
 import org.onap.vid.aai.util.ServletRequestHelper;
 import org.onap.vid.aai.util.SystemPropertyHelper;
@@ -37,21 +61,6 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-import static org.mockito.Mockito.when;
-
 
 public class OutgoingRequestHeadersTest {
 
@@ -78,7 +87,11 @@ public class OutgoingRequestHeadersTest {
     }
 
     @BeforeMethod
-    private void putRequestInSpringContext() {
+    private void setup() {
+        putRequestInSpringContext();
+    }
+
+    public static void putRequestInSpringContext() {
         RequestContextHolder.setRequestAttributes(new ServletRequestAttributes((HttpServletRequest) PromiseEcompRequestIdFilter.wrapIfNeeded(new MockHttpServletRequest())));
     }
 
index 00a9995..8c33e7f 100644 (file)
@@ -40,10 +40,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import javax.ws.rs.core.Response;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 import org.onap.vid.aai.AaiClientInterface;
 import org.onap.vid.aai.ExceptionWithRequestInfo;
 import org.onap.vid.aai.util.AAITreeConverter;
@@ -58,7 +55,6 @@ import org.onap.vid.model.aaiTree.ServiceInstance;
 import org.onap.vid.model.aaiTree.Vnf;
 import org.onap.vid.testUtils.TestUtils;
 import org.springframework.http.HttpMethod;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -79,11 +75,9 @@ public class AAIServiceTreeIntegrativeTest {
     @Mock
     ServiceModelInflator serviceModelInflator;
 
-    @InjectMocks
     private AAITreeNodeBuilder aaiTreeNodeBuilder;
 
-    @InjectMocks
-    private AAITreeConverter aaiTreeConverter;
+    private AAITreeConverter aaiTreeConverter = new AAITreeConverter();
 
     private ExecutorService executorService = Executors.newFixedThreadPool(10);
 
@@ -295,17 +289,10 @@ public class AAIServiceTreeIntegrativeTest {
             "\"property-key\": \"model-ver.model-name\"," +
             "\"property-value\": \"service-instance\"}]}]}}]}}]}}]}";
 
-    @BeforeClass
-    public void initMocks() {
-        MockitoAnnotations.initMocks(this);
-    }
-
     @BeforeMethod
-    public void resetMocks() {
-        Mockito.reset(aaiClient);
-        Mockito.reset(aaiGetVersionByInvariantIdResponse);
-        Mockito.reset(sdcService);
-        Mockito.reset(serviceModelInflator);
+    public void initMocks() {
+        TestUtils.initMockitoMocks(this);
+        aaiTreeNodeBuilder = new AAITreeNodeBuilder(aaiClient);
     }
 
     public void getServiceInstanceTreeAndAssert(boolean isDuplicatedKeysInTenantRelation) throws IOException, AsdcCatalogException {
index 69458aa..9cc9711 100644 (file)
@@ -183,7 +183,7 @@ public class AsyncInstantiationBaseTest extends AbstractTestNGSpringContextTests
     }
 
     protected VfModule createVfModuleForReplace(ModelInfo vfModuleModelInfo, String instanceName, String lcpCloudRegionId, String tenantId) {
-        return new VfModule( vfModuleModelInfo, instanceName, null, Action.Replace.name(), lcpCloudRegionId, null, tenantId,
+        return new VfModule( vfModuleModelInfo, instanceName, null, Action.Upgrade.name(), lcpCloudRegionId, null, tenantId,
                 null, null, true, null, null, UUID.randomUUID().toString(), null, null);
     }
 
index e2d182c..2b4f4be 100644 (file)
 
 package org.onap.vid.services;
 
+import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
+import static net.javacrumbs.jsonunit.JsonAssert.whenIgnoringPaths;
+import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;
+import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.core.Every.everyItem;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.anyInt;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED_WITH_ERRORS;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED_WITH_NO_ACTION;
+import static org.onap.vid.job.Job.JobStatus.FAILED;
+import static org.onap.vid.job.Job.JobStatus.IN_PROGRESS;
+import static org.onap.vid.job.Job.JobStatus.PAUSE;
+import static org.onap.vid.job.Job.JobStatus.PENDING;
+import static org.onap.vid.job.Job.JobStatus.STOPPED;
+import static org.onap.vid.testUtils.TestUtils.generateRandomAlphaNumeric;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import javax.inject.Inject;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.hibernate.SessionFactory;
@@ -54,7 +125,11 @@ import org.onap.vid.job.command.MsoRequestBuilder;
 import org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator;
 import org.onap.vid.job.impl.JobDaoImpl;
 import org.onap.vid.job.impl.JobSharedData;
-import org.onap.vid.model.*;
+import org.onap.vid.model.Action;
+import org.onap.vid.model.JobAuditStatus;
+import org.onap.vid.model.NameCounter;
+import org.onap.vid.model.ResourceInfo;
+import org.onap.vid.model.ServiceInfo;
 import org.onap.vid.model.serviceInstantiation.BaseResource;
 import org.onap.vid.model.serviceInstantiation.ServiceInstantiation;
 import org.onap.vid.model.serviceInstantiation.Vnf;
@@ -71,34 +146,11 @@ import org.onap.vid.utils.TimeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
-import org.testng.annotations.*;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.time.*;
-import java.util.Optional;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
-import static net.javacrumbs.jsonunit.JsonAssert.whenIgnoringPaths;
-import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals;
-import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
-import static org.hamcrest.core.Every.everyItem;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
-import static org.onap.vid.job.Job.JobStatus.*;
-import static org.onap.vid.testUtils.TestUtils.generateRandomAlphaNumeric;
-import static org.testng.Assert.*;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
 
 @ContextConfiguration(classes = {DataSourceConfig.class, SystemProperties.class, MockedAaiClientAndFeatureManagerConfig.class})
 public class AsyncInstantiationBusinessLogicTest extends AsyncInstantiationBaseTest {
@@ -665,7 +717,7 @@ public class AsyncInstantiationBusinessLogicTest extends AsyncInstantiationBaseT
     public static Object[][] isPauseAndPropertyDataProvider() {
         return new Object[][]{
                 {true, "mso.restapi.serviceInstanceAssign"},
-                {false, "mso.restapi.serviceInstanceCreate"},
+                {false, "mso.restapi.service.instance"},
         };
     }
 
index 311eb04..bd761f2 100644 (file)
@@ -603,18 +603,18 @@ public class MsoRequestBuilderTest extends AsyncInstantiationBaseTest {
         when(featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)).thenReturn(true);
         when(aaiClient.getCloudOwnerByCloudRegionId("regionOne")).thenReturn("irma-aic");
 
-        ModelInfo vfModuleModelInfo = createVfModuleModelInfo("VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0", "1", "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46",
-                "f7a867f2-596b-4f4a-a128-421e825a6190", "074c64d0-7e13-4bcc-8bdb-ea922331102d",null );
+        ModelInfo vfModuleModelInfo = createVfModuleModelInfo("newest-model-name-vfm", "newest-model-version-vfm", "newest-model-uuid-vfm",
+                "f7a867f2-596b-4f4a-a128-421e825a6190", "newest-model-customization-uuid-vfm","newest-model-customization-name-vfm" );
 
         VfModule vfModuleDetails = createVfModuleForReplace(vfModuleModelInfo, "replace_module", "regionOne", "0422ffb57ba042c0800a29dc85ca70f8");
 
-        ModelInfo serviceModelInfo = createServiceModelInfo("Vf zolson5bpxmc02092017-Service", "1", "bad955c3-29b2-4a27-932e-28e942cc6480", "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", null, null );
+        ModelInfo serviceModelInfo = createServiceModelInfo("newest-model-name-service", "newest-model-version-service", "newest-model-uuid-service", "b16a9398-ffa3-4041-b78c-2956b8ad9c7b", null, null );
 
-        ModelInfo vnfModelInfo = createVnfModelInfo("Vf zolson5bpxmc02092017-VF", "1", "d326f424-2312-4dd6-b7fe-364fadbd1ef5", "23122c9b-dd7f-483f-bf0a-e069303db2f7", "96c23a4a-6887-4b2c-9cce-1e4ea35eaade", "Vf zolson5bpxmc02092017-VF 0" );
+        ModelInfo vnfModelInfo = createVnfModelInfo("newest-model-name-vnf", "newest-model-version-vnf", "newest-model-uuid-vnf", "23122c9b-dd7f-483f-bf0a-e069303db2f7", "newest-model-customization-uuid-vnf", "newest-model-customization-name-vnf" );
 
         RequestDetailsWrapper<VfModuleInstantiationRequestDetails> result =
                 msoRequestBuilder.generateVfModuleInstantiationRequest(vfModuleDetails, serviceModelInfo, "e9993045-cc96-4f3f-bf9a-71b2a400a956", vnfModelInfo, "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5", null,"az2016", "GR_API");
 
-        MsoOperationalEnvironmentTest.assertThatExpectationIsLikeObject(expected, result);
+        assertThat(result, jsonEquals(expected).when(IGNORING_ARRAY_ORDER));
     }
 }
\ No newline at end of file
index 399274d..66052ad 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,11 +46,13 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
@@ -60,6 +62,7 @@ import javax.ws.rs.core.Response;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
 import org.apache.commons.text.RandomStringGenerator;
 import org.apache.http.HttpResponseFactory;
@@ -71,8 +74,11 @@ import org.apache.log4j.Logger;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.Assert;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.MockSettings;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.mockito.stubbing.OngoingStubbing;
@@ -176,6 +182,33 @@ public class TestUtils {
             .collect(toList());
     }
 
+    private static List<Field> allMockitoFieldsOf(Object object) {
+        final Predicate<Field> hasMockAnnotation = field -> field.getAnnotation(Mock.class) != null;
+        final Predicate<Field> hasInjectMocksAnnotation = field -> field.getAnnotation(InjectMocks.class) != null;
+
+        return Arrays.stream(FieldUtils.getAllFields(object.getClass()))
+            .filter(hasMockAnnotation.or(hasInjectMocksAnnotation))
+            .collect(toList());
+    }
+
+    /**
+     * Calls MockitoAnnotations.initMocks after nullifying any field which is annotated @Mocke or @InjectMock.
+     * This makes a "hard rest" to any mocked state or instance. Expected to be invoked between any @Tests in class, by
+     * being called in TestNG's @BeforeMethod (or equivalently JUnit's @BeforeTest).
+     */
+    public static void initMockitoMocks(Object testClass) {
+        for (Field field : allMockitoFieldsOf(testClass)) {
+            try {
+                // Write null to fields
+                FieldUtils.writeField(field, testClass, null, true);
+            } catch (ReflectiveOperationException e) {
+                ExceptionUtils.rethrow(e);
+            }
+        }
+
+        MockitoAnnotations.initMocks(testClass);
+    }
+
     /**
      * Sets each String property with a value equal to the name of
      * the property; e.g.: { name: "name", city: "city" }
index eaa9990..9b27f6e 100644 (file)
@@ -80,4 +80,12 @@ public class TreeTest {
         assertTrue(subTree.isPathExist("d"));
         assertFalse(subTree.isPathExist("b","c","d"));
     }
+
+    @Test
+    public void getChildrenDepthTest() {
+        Tree<String> tree = buildTreeForTest();
+        assertEquals(3, tree.getChildrenDepth());
+        Tree<String> subTree = tree.getSubTree("b");
+        assertEquals(2, subTree.getChildrenDepth());
+    }
 }
index 33778ba..ecbc237 100644 (file)
@@ -155,26 +155,24 @@ mso.polling.interval.msecs=10000
 mso.max.polls=10
 mso.user.name=infraportal
 mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
-mso.restapi.svc.instance=/serviceInstances/v7
-mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances
+mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs
 mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
 mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks
 mso.restapi.vf.module.scaleout=/serviceInstantiation/v7/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
 mso.restapi.vf.module.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
 mso.restapi.workflow.invoke=/instanceManagement/v1/serviceInstances/<service_instance_id>/vnfs/<vnf_instance_id>/workflows/<workflow_UUID>
-mso.restapi.volume.group.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.volume.group.instance=${mso.restapi.vnf.instance}/<vnf_instance_id>/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/<request_id>/resume
 mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
 mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id>
 mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
 
 mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7
-mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances
 mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign
 
 mso.restapi.cloudResourcesApiRoot=/cloudResources/v1
diff --git a/vid-app-common/src/test/resources/mso.properties b/vid-app-common/src/test/resources/mso.properties
deleted file mode 100644 (file)
index d021ffd..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-mso.server.url=http://mtanjv9moah01-eth0.aic.cip.att.com:8080/ecomp/mso/infra
-mso.polling.interval.msecs=2000
-mso.max.polls=3
-mso.user.name=infraportal
-mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
-mso.restapi.svc.instance=/serviceInstances/v3
-mso.restapi.vnf.instance=/serviceInstances/v3/<service_instance_id>/vnfs
-mso.restapi.network.instance=/serviceInstances/v3/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/serviceInstantiation/v7/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut
-mso.restapi.volume.group.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
-mso.restapi.get.orc.req=/orchestrationRequests/v3
-mso.restapi.get.orc.reqs=/orchestrationRequests/v3?
-mso.restapi.get.man.tasks=/tasks/v1
-mso.dme2.client.timeout=30000
-mso.dme2.client.read.timeout=120000
-mso.dme2.server.url=http://mso-api-handler-anap-v1.mso.ecomp.att.com/services/ecomp/mso?version=1607&envContext=TEST&routeOffer=st_mtsnj
\ No newline at end of file
index c3ab694..103985c 100644 (file)
@@ -10,9 +10,9 @@
       "relatedInstance": {
         "instanceId": "e9993045-cc96-4f3f-bf9a-71b2a400a956",
         "modelInfo": {
-          "modelVersionId": "bad955c3-29b2-4a27-932e-28e942cc6480",
-          "modelVersion": "1",
-          "modelName": "Vf zolson5bpxmc02092017-Service",
+          "modelVersionId": "newest-model-uuid-service",
+          "modelVersion": "newest-model-version-service",
+          "modelName": "newest-model-name-service",
           "modelInvariantId": "b16a9398-ffa3-4041-b78c-2956b8ad9c7b",
           "modelType": "service"
         }
       "relatedInstance": {
         "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5",
         "modelInfo": {
-          "modelName": "Vf zolson5bpxmc02092017-VF",
-          "modelVersion": "1",
+          "modelName": "newest-model-name-vnf",
+          "modelVersion": "newest-model-version-vnf",
           "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"
+          "modelCustomizationName": "newest-model-customization-name-vnf",
+          "modelVersionId": "newest-model-uuid-vnf",
+          "modelCustomizationId": "newest-model-customization-uuid-vnf"
         }
       }
     }],
       "testApi": "GR_API"
     },
     "modelInfo": {
-      "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0",
-      "modelVersion": "1",
+      "modelName": "newest-model-name-vfm",
+      "modelVersion": "newest-model-version-vfm",
       "modelInvariantId": "f7a867f2-596b-4f4a-a128-421e825a6190",
       "modelType": "vfModule",
-      "modelVersionId": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46",
-      "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d"
+      "modelVersionId": "newest-model-uuid-vfm",
+      "modelCustomizationId": "newest-model-customization-uuid-vfm",
+      "modelCustomizationName":"newest-model-customization-name-vfm"
     },
     "cloudConfiguration": {
       "cloudOwner": "irma-aic",
index 92ccfe5..8d30fd8 100644 (file)
@@ -8,7 +8,7 @@
           "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0-?": {
             "instanceName": "replace_module",
             "instanceId": "5d49c3b1-fc90-4762-8c98-e800170baa55",
-            "action": "Replace",
+            "action": "Upgrade",
             "orchStatus": "Create",
             "provStatus": "Prov Status",
             "inMaint": false,
@@ -21,6 +21,7 @@
               "modelName": "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0",
               "modelVersion": "1",
               "modelCustomizationId": "074c64d0-7e13-4bcc-8bdb-ea922331102d",
+              "modelCustomizationName" : "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0",
               "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46"
             },
             "uuid": "eb5de6fb-9ecf-4009-b922-fae3a9ae7d46"
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelVersionsByInvariantId.java
new file mode 100644 (file)
index 0000000..5a43e10
--- /dev/null
@@ -0,0 +1,91 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class PresetAAIModelVersionsByInvariantId extends BaseAAIPreset {
+
+
+    @Override
+    public String getReqPath() {
+        return getRootPath() + "/query";
+    }
+
+    @Override
+    public Map<String, List> getQueryParams() {
+        return ImmutableMap.of(
+                "format", Collections.singletonList("resource"),
+                "depth", Collections.singletonList("0")
+        );
+    }
+
+    @Override
+    public Object getRequestBody() {
+        return ImmutableMap.of(
+                "start", ImmutableList.of("service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea"),
+                "query", "query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK"
+        );
+        //  "{" +
+        //  "  \"start\": [\"service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea"]," +
+        //  "  \"query\": \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"" +
+        //  "}";
+    }
+
+    @Override
+    public Object getResponseBody() {
+        return "{" +
+                "    \"results\": [" +
+                "        {" +
+                "            \"model\": {" +
+                "              \"model-invariant-id\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"," +
+                "              \"model-type\": \"service\"," +
+                "              \"resource-version\": \"1534274421300\"" +
+                "           }" +
+                "      }," +
+                "      {" +
+                "          \"model-ver\": {" +
+                "              \"model-version-id\": \"a92f899d-a3ec-465b-baed-1663b0a5aee1\"," +
+                "              \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+                "              \"model-version\": \"3.0\"," +
+                "              \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+                "              \"model-description\": \"Network Collection service for vLAN tagging\"," +
+                "              \"resource-version\": \"1534788756086\"" +
+                "          }" +
+                "       }," +
+                "       {" +
+                "           \"model-ver\": {" +
+                "               \"model-version-id\": \"d2fda667-e92e-4cfa-9620-5da5de01a319\"," +
+                "               \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+                "               \"model-version\": \"1.0\"," +
+                "               \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+                "                \"model-description\": \"Network Collection service for vLAN tagging\"," +
+                "                \"resource-version\": \"1534444087221\"" +
+                "            }" +
+                "        }," +
+                "        {" +
+                "            \"model-ver\": {" +
+                "                \"model-version-id\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"," +
+                "                \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+                "                \"model-version\": \"11.0\"," +
+                "                \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+                "                \"model-description\": \"Network Collection service for vLAN tagging the-newest-version\"," +
+                "                \"resource-version\": \"1550783120267\"" +
+                "            }" +
+                "        }" +
+                "    ]" +
+
+                "}";
+    }
+
+    @Override
+    public HttpMethod getReqMethod() {
+        return HttpMethod.PUT;
+    }
+
+}
index ce0f8fd..29e1365 100644 (file)
@@ -8,7 +8,7 @@ public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstance
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v.";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances";
     }
 
     @Override
index 39b415f..9a41e5b 100644 (file)
@@ -6,7 +6,7 @@ package org.onap.simulator.presetGenerator.presets.mso;
 public class PresetMSOCreateServiceInstancePost extends PresetMSOBaseCreateInstancePost {
 
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v.";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances";
     }
 
 }
index 764237e..5a0b752 100644 (file)
@@ -28,11 +28,8 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese
 
     @Override
     public String getReqPath() {
-        if (isVolumeGroupPreset) {
-            return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups";
-        } else {
-            return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules";
-        }
+        String trailer = isVolumeGroupPreset ? "/volumeGroups" : "/vfModules";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + trailer;
     }
 
     @Override
index 42e2a70..0f4a042 100644 (file)
@@ -16,7 +16,7 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups";
     }
 
     @Override
index 964d37e..d94a681 100644 (file)
@@ -24,9 +24,4 @@ public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDeleteWithCloudConf
         return getRootPath() + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups/" + volumeGroupInstanceId;
     }
 
-    //remove this method once VfModule path starts with /serviceInstantiation/v7/
-    @Override
-    protected String getRootPath() {
-        return "/mso/serviceInstances/v7/";
-    }
 }
index 6c4b722..1354387 100644 (file)
@@ -25,7 +25,7 @@ public class PresetMSOActOnConfiguration extends PresetMSOBaseCreateInstancePost
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action;
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action;
     }
 
     @Override
index 2a7e262..d5a4a40 100644 (file)
@@ -44,7 +44,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v./" + this.serviceInstanceId + "/configurations";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + this.serviceInstanceId + "/configurations";
     }
 
     @Override
index 4d0582c..5f61fe8 100644 (file)
@@ -21,7 +21,7 @@ public class PresetMSODeleteConfiguration extends PresetMSOBaseCreateInstancePos
 
     @Override
     public String getReqPath() {
-        return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113";
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113";
     }
 
     @Override
index db18e01..fab96fc 100644 (file)
@@ -26,7 +26,7 @@ public class PresetMsoEnableDisablePort extends PresetMSOBaseCreateInstancePost
 
     @Override
     public String getReqPath() {
-        return "/mso/serviceInstances/v./"+serviceInstanceId+"/configurations/"+configurationId+"/" + action;
+        return getRootPath() + "/serviceInstantiation/v./serviceInstances/"+serviceInstanceId+"/configurations/"+configurationId+"/" + action;
     }
 
     @Override
index 059500c..bf1147a 100644 (file)
@@ -43,6 +43,8 @@ public enum Features implements Feature {
     FLAG_1908_VNF_FC_NEW_INSTANTIATION_UI,
     FLAG_HANDLE_SO_WORKFLOWS,
     FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT,
+    FLAG_FLASH_REPLACE_VF_MODULE,
+    FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT,
     ;
 
     public boolean isActive() {
index d7903ce..a701f10 100644 (file)
@@ -352,7 +352,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest {
 
         SimulatorApi.registerExpectationFromPresets(ImmutableList.of(
             PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC,
-                new PresetAAIGetL3NetworksByCloudRegionSpecificState("irma-aic", "hvf6", "AIN Web Tool-15-D-testalexandria"),
+                new PresetAAIGetL3NetworksByCloudRegionSpecificState("irma-aic", "hvf6", "bae71557c5bb4d5aac6743a4e5f1d054"),
             new PresetAAIGetVpnsByType()
         ), APPEND);
 
index 40af6f8..073db09 100644 (file)
@@ -54,7 +54,7 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase {
     private String serviceType = "TYLER SILVIA";
     private String serviceInstanceToResumeName;
 
-    @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING)
+    @FeatureTogglingTest({Features.FLAG_1902_VNF_GROUPING, Features.FLAG_FLASH_REPLACE_VF_MODULE})
     @Test
     public void testDeleteVnfGroupWithMembers() {
 
@@ -184,7 +184,7 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase {
         );
     }
 
-    @FeatureTogglingTest({Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT, Features.FLAG_1908_RESUME_MACRO_SERVICE})
+    @FeatureTogglingTest({Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT, Features.FLAG_1908_RESUME_MACRO_SERVICE, Features.FLAG_FLASH_REPLACE_VF_MODULE})
     @Test
     public void testResumeServiceInstanceWithCollectionResource() {
 
index 3cfcd7a..bbd8ab2 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>",
     "body": {
         "requestDetails": {
           "modelInfo": {
index 85855ad..eea3caa 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/<ACTIVE_ACTION>",
     "body": {
         "requestDetails": {
           "modelInfo": {
@@ -24,4 +24,4 @@
   "simulatorResponse": {
     "responseCode": 500
   }
-}
\ No newline at end of file
+}
index d4d253e..5cf1c34 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v.",
+    "path": "/mso/serviceInstantiation/v./serviceInstances",
     "body": {
       "requestDetails": {
         "requestInfo": {
@@ -46,4 +46,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index b794f47..181e50f 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships",
     "body": "{\"requestDetails\":{\"modelInfo\":{\"modelType\":\"service\",\"modelInvariantId\":\"709d1be4-9a3f-4a29-8c4d-a20465e808a3\",\"modelVersionId\":\"240376de-870e-48df-915a-31f140eedd2c\",\"modelName\":\"Demo Service 1\",\"modelVersion\":\"1.0\"},\"requestInfo\":{\"source\":\"VID\",\"requestorId\":\"us16807000\"},\"relatedInstanceList\":[{\"relatedInstance\":{\"instanceName\":\"MX_960-F722\",\"modelInfo\":{\"modelType\":\"pnf\"}}}],\"requestParameters\":{\"aLaCarte\":true}}}"
   },
   "simulatorResponse": {
@@ -13,4 +13,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index d1fefe2..ff2f434 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/addRelationships",
     "body": {
       "requestDetails": {
         "modelInfo": {
@@ -35,4 +35,4 @@
     "responseCode": 500
     }
   }
-}
\ No newline at end of file
+}
index 72245ce..514298c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships",
     "body": {
         "requestDetails": {
           "modelInfo": {
@@ -40,4 +40,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 2744cae..065d027 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships",
+    "path": "/mso/serviceInstantiation/v./serviceInstances/3f93c7cb-2fd0-4557-9514-e189b7b04f9d/removeRelationships",
     "body": {
         "requestDetails": {
           "modelInfo": {
@@ -34,4 +34,4 @@
   "simulatorResponse": {
     "responseCode": 500
   }
-}
\ No newline at end of file
+}
index b7c6e0e..6b5b08e 100644 (file)
@@ -43,6 +43,7 @@ import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPo
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
 import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET;
 import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS;
@@ -771,6 +772,33 @@ public class AaiApiTest extends BaseApiAaiTest {
                 response.getBody());
     }
 
+    @Test
+    public void getNewestModelVersionByInvariant() throws JsonProcessingException {
+        String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea";
+
+        SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET );
+
+        String url = uri +
+                "/aai_get_newest_model_version_by_invariant/" + invariantId;
+        ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+
+        assertTrue(response.toString().contains("the-newest-version"));
+    }
+
+    @Test
+    public void getNewestModelVersionByInvariant_modelNotExist_thenEmptyResponse() {
+        String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea";
+
+        SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET );
+
+        String url = uri +
+                "/aai_get_newest_model_version_by_invariant/" + "model-not-exist";
+        ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+
+        assertTrue(response.getStatusCode().is2xxSuccessful());
+        assertNull(response.getBody());
+    }
+
     private void assertResponse(Object expected, String response) {
         assertResponse(Configuration.empty(), expected, response);
     }
index 1a93a23..b6fa0fb 100644 (file)
@@ -1,12 +1,39 @@
 package org.onap.vid.api;
 
+import static java.util.Collections.emptyMap;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_INSTANCE_ID;
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID;
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE;
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
+import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
 import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset;
 import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId;
-import org.onap.simulator.presetGenerator.presets.mso.*;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember;
 import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseDelete;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteCypress;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleALaCarteCypress;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteCypress2;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfGroup;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteALaCarteService;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceGroup;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames;
 import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet;
 import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet;
 import org.onap.vid.model.asyncInstantiation.JobAuditStatus;
@@ -24,21 +51,6 @@ import vid.automation.test.services.AsyncJobsService;
 import vid.automation.test.services.SimulatorApi;
 import vid.automation.test.services.SimulatorApi.RegistrationStrategy;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import static java.util.Collections.emptyMap;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_INSTANCE_ID;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
-import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets;
-
 @FeatureTogglingTest({Features.FLAG_ASYNC_ALACARTE_VNF})
 public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase {
 
@@ -440,7 +452,7 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase {
                 TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs",
                         pathCounterOverride.getOrDefault("vnfs", defaultValue)),
 
-                TestUtils.hasOrLacksOfEntry("/mso/serviceInstances/v./" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups",
+                TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups",
                         pathCounterOverride.getOrDefault("volumeGroups", defaultValue)),
 
                 TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/vfModules",
index f544191..2846baa 100644 (file)
       "isMissingData": false,
       "trackById": "wk10c4hh1oj",
       "vfModules": {},
+      "upgradedVFMSonsCounter": 0,
       "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1",
       "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
index 773bfd0..366de41 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
   },
   "simulatorResponse": {
     "responseCode": 202,
@@ -12,4 +12,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 73ff898..57c132f 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
   } ,
   "simulatorResponse": {
     "responseCode": 500,
     "body": "ERROR_PAYLOAD"
   }
-}
\ No newline at end of file
+}
index ce27b59..eaba1da 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
@@ -12,4 +12,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 7e808b8..919f022 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
   } ,
   "simulatorResponse": {
     "responseCode": 500,
     "body": "ERROR_PAYLOAD"
   }
-}
\ No newline at end of file
+}
index fd81717..70ab0fd 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "DELETE",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1"
   },
   "simulatorResponse": {
     "responseCode": 202,
@@ -12,4 +12,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index ef55118..ea1dfd2 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
     "body": "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}"
   }
-}
\ No newline at end of file
+}
index 073fd35..5c4c9ad 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 404,
     "body": ""
   }
-}
\ No newline at end of file
+}
index c85b3cb..ad2bebe 100644 (file)
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
@@ -12,4 +12,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index f8f6fbb..8875503 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 500,
     "body": "ERROR_PAYLOAD"
   }
-}
\ No newline at end of file
+}
diff --git a/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json b/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json
new file mode 100644 (file)
index 0000000..cf805b7
--- /dev/null
@@ -0,0 +1,226 @@
+{
+  "instanceName":"SERVICE_INSTANCE_NAME",
+  "action": "None",
+  "instanceId":"service-instance-id",
+  "orchStatus":"GARBAGE DATA",
+  "globalSubscriberId":"global-customer-id",
+  "subscriptionServiceType":"service-instance-type",
+  "owningEntityId":null,
+  "owningEntityName":null,
+  "productFamilyId":null,
+  "lcpCloudRegionId":null,
+  "tenantId":null,
+  "tenantName":null,
+  "aicZoneId":null,
+  "aicZoneName":null,
+  "projectName":null,
+  "rollbackOnFailure":null,
+  "isALaCarte":false,
+  "modelInfo":{
+    "modelInvariantId":"d27e42cf-087e-4d31-88ac-6c4b7585f800",
+    "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+    "modelName":"vf_vEPDG",
+    "modelType":"service",
+    "modelVersion":"1.0"
+  },
+  "vnfs": {
+    "VNF1_INSTANCE_ID": {
+      "originalName": null,
+      "trackById": "VNF1_INSTANCE_ID",
+      "instanceName": "VNF1_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "VNF1_INSTANCE_ID",
+      "instanceType": "VNF1_INSTANCE_TYPE",
+      "orchStatus": null,
+      "provStatus": null,
+      "inMaint": false,
+      "modelInfo": {
+        "modelInvariantId": "vnf-instance-model-invariant-id",
+        "modelVersionId": "vnf-instance-model-version-id",
+        "modelCustomizationId": "vnf-instance-model-customization-id",
+        "modelType": "vnf"
+      },
+      "uuid": "vnf-instance-model-version-id",
+      "productFamilyId": null,
+      "lcpCloudRegionId": "olson3",
+      "cloudOwner": "att-nc",
+      "legacyRegion": null,
+      "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+      "lineOfBusiness": null,
+      "platformName": null,
+      "vfModules": {},
+      "networks": {
+        "NETWORK1_INSTANCE_ID": {
+          "trackById": "NETWORK1_INSTANCE_ID",
+          "instanceName": "NETWORK1_INSTANCE_NAME",
+          "action": "None",
+          "instanceId": "NETWORK1_INSTANCE_ID",
+          "instanceType": "CONTRAIL30_BASIC",
+          "orchStatus": "Assigned",
+          "provStatus": "prov",
+          "inMaint": false,
+          "modelInfo": {
+            "modelInvariantId": "network-instance-model-invariant-id",
+            "modelVersionId": "network-instance-model-version-id",
+            "modelCustomizationId": "network-instance-model-customization-id",
+            "modelType": "network"
+          },
+          "uuid": "network-instance-model-version-id"
+        },
+        "NETWORK2_INSTANCE_ID": {
+          "trackById": "NETWORK2_INSTANCE_ID",
+          "instanceName": "NETWORK2_INSTANCE_NAME",
+          "action": "None",
+          "instanceId": "NETWORK2_INSTANCE_ID",
+          "instanceType": "CONTRAIL30_BASIC",
+          "orchStatus": "Created",
+          "provStatus": "prov",
+          "inMaint": false,
+          "modelInfo": {
+            "modelInvariantId": "network-instance-model-invariant-id",
+            "modelVersionId": "network-instance-model-version-id",
+            "modelCustomizationId": "network-instance-model-customization-id",
+            "modelType": "network"
+          },
+          "uuid": "network-instance-model-version-id"
+        }
+      }
+    },
+    "VNF2_INSTANCE_ID": {
+      "originalName": "VF_vGeraldine 0",
+      "trackById": "VNF2_INSTANCE_ID",
+      "instanceName": "VNF2_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "VNF2_INSTANCE_ID",
+      "instanceType": "VNF2_INSTANCE_TYPE",
+      "orchStatus": null,
+      "provStatus": null,
+      "inMaint": true,
+      "modelInfo": {
+        "modelCustomizationName": "VF_vGeraldine 0",
+        "modelInvariantId": "vnf-instance-model-invariant-id",
+        "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+        "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+        "modelType": "vnf"
+      },
+      "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+      "productFamilyId": null,
+      "lcpCloudRegionId": "hvf6",
+      "cloudOwner": "irma-aic",
+      "legacyRegion": null,
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+      "lineOfBusiness": null,
+      "platformName": null,
+      "vfModules": {
+        "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+          "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
+            "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1",
+            "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+            "instanceName": "ss820f_0918_db",
+            "action": "None",
+            "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+            "instanceType": null,
+            "orchStatus": "deleted",
+            "provStatus": null,
+            "inMaint": true,
+            "modelInfo": {
+              "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+              "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
+              "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750",
+              "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+              "modelType": "vfModule"
+            },
+            "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+            "productFamilyId": null,
+            "lcpCloudRegionId": null,
+            "legacyRegion": null,
+            "tenantId": null,
+            "lineOfBusiness": null,
+            "platformName": null,
+            "isBase": false,
+            "volumeGroupName": null
+          }
+        },
+        "dc229cd8-c132-4455-8517-5c1787c18b14": {
+          "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": {
+            "originalName": null,
+            "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+            "instanceName": "ss820f_0918_base",
+            "action": "None",
+            "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+            "instanceType": null,
+            "orchStatus": "Assigned",
+            "provStatus": null,
+            "inMaint": false,
+            "modelInfo": {
+              "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a",
+              "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de",
+              "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14",
+              "modelType": "vfModule"
+            },
+            "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14",
+            "productFamilyId": null,
+            "lcpCloudRegionId": null,
+            "legacyRegion": null,
+            "tenantId": null,
+            "lineOfBusiness": null,
+            "platformName": null,
+            "isBase": true,
+            "volumeGroupName": null
+          }
+        }
+      },
+      "networks": {}
+    }
+  },
+  "networks": {
+    "NETWORK3_INSTANCE_ID": {
+      "originalName": "ExtVL 0",
+      "trackById": "NETWORK3_INSTANCE_ID",
+      "instanceName": "NETWORK3_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "NETWORK3_INSTANCE_ID",
+      "instanceType": "CONTRAIL30_BASIC",
+      "orchStatus": "Assigned",
+      "provStatus": "nvtprov",
+      "inMaint": false,
+      "modelInfo": {
+        "modelCustomizationName": "ExtVL 0",
+        "modelInvariantId": "network-instance-model-invariant-id",
+        "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+        "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+        "modelType": "network"
+      },
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+    },
+    "NETWORK4_INSTANCE_ID": {
+      "originalName": "ExtVL 0",
+      "trackById": "NETWORK4_INSTANCE_ID",
+      "instanceName": "NETWORK4_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "NETWORK4_INSTANCE_ID",
+      "instanceType": "CONTRAIL30_HIMELGUARD",
+      "orchStatus": "Created",
+      "provStatus": "preprov",
+      "inMaint": false,
+      "modelInfo": {
+        "modelCustomizationName": "ExtVL 0",
+        "modelInvariantId": "network-instance-model-invariant-id",
+        "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+        "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+        "modelType": "network"
+      },
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+    }
+  },
+  "validationCounter": 0,
+  "vnfGroups": {},
+  "existingVNFCounterMap": {
+    "91415b44-753d-494c-926a-456a9172bbb9": 1,
+    "vnf-instance-model-customization-id": 1
+  },
+  "existingNetworksCounterMap": {
+    "94fdd893-4a36-4d70-b16a-ec29c54c184f": 2
+  },
+  "existingVnfGroupCounterMap": {}
+}
\ No newline at end of file
index dc7344a..47b9ba9 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
     "body": "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}"
   }
-}
\ No newline at end of file
+}
index ef55118..ea1dfd2 100644 (file)
@@ -1,10 +1,10 @@
 {
   "simulatorRequest": {
     "method": "POST",
-    "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+    "path": "/mso/serviceInstantiation/v./serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
   } ,
   "simulatorResponse": {
     "responseCode": 202,
     "body": "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}"
   }
-}
\ No newline at end of file
+}
index e9f90f0..13638ef 100644 (file)
@@ -2,7 +2,7 @@
   {
     "simulatorRequest": {
       "method": "POST",
-      "path": "/mso/serviceInstances/v."
+      "path": "/mso/serviceInstantiation/v./serviceInstances"
     },
     "simulatorResponse": {
       "responseCode": 202,
@@ -19,4 +19,4 @@
       "body": {"request":{"requestId":"c0011670-0e1a-4b74-945d-8bf5aede1d9c","startTime":"Mon, 11 Dec 2017 07:27:49 GMT","requestScope":"service","requestType":"createInstance","instanceReferences":{"serviceInstanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb","serviceInstanceName":"asdfasdf234234asdf","requestorId":"il883e"},"requestStatus":{"requestState":"COMPLETE","statusMessage":"Service Instance was created successfully.","percentProgress":100,"finishTime":"Mon, 11 Dec 2017 07:27:53 GMT"}}}
     }
   }
-]
\ No newline at end of file
+]
index 13c4464..3e90e2b 100644 (file)
@@ -7,7 +7,11 @@ import * as _ from 'lodash';
 describe('A la carte', function () {
   describe('check service name', () => {
     let jsonBuilderAAIService: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
-
+    const SERVICE_ID: string = '4d71990b-d8ad-4510-ac61-496288d9078e';
+    const SERVICE_INVARIANT_ID: string = 'd27e42cf-087e-4d31-88ac-6c4b7585f800';
+    const INSTANCE_NAME_MANDATORY_MESSAGE: string = 'Missing data ("Instance Name" and 3 other fields';
+    const INSTANCE_NAME_NOT_MANDATORY_MESSAGE: string = 'Missing data ("Subscriber Name" and 2 other fields)';
+    const CONFIRM_BUTTON: string = 'confirmButton';
 
     beforeEach(() => {
       cy.window().then((win) => {
@@ -15,7 +19,7 @@ describe('A la carte', function () {
         cy.setReduxState();
         cy.preventErrorsOnLoading();
         cy.initAAIMock();
-        cy.initVidMock();
+        cy.initVidMock({serviceUuid:SERVICE_ID, invariantId: SERVICE_INVARIANT_ID});
         cy.initAlaCarteService();
         cy.initZones();
         cy.login();
@@ -26,16 +30,12 @@ describe('A la carte', function () {
       cy.screenshot();
     });
 
-    const SERVICE_ID: string = '4d71990b-d8ad-4510-ac61-496288d9078e';
-    const INSTANCE_NAME_MANDATORY_MESSAGE: string = 'Missing data ("Instance Name" and 3 other fields';
-    const INSTANCE_NAME_NOT_MANDATORY_MESSAGE: string = 'Missing data ("Subscriber Name" and 2 other fields)';
-    const CONFIRM_BUTTON: string = 'confirmButton';
 
 
     it(`service name should be mandatory : serviceEcompNaming = true`, ()=> {
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(res,
-          Cypress.config('baseUrl') + '/rest/models/services/4d71990b-d8ad-4510-ac61-496288d9078e',
+          Cypress.config('baseUrl') + '/rest/models/services/' + SERVICE_ID,
           200,
           0,
           SERVICE_ID + ' - service',
@@ -130,10 +130,10 @@ describe('A la carte', function () {
               cy.getReduxState().then((state) => {
 
                 const vnf = state.service.serviceInstance['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'];
-
                 cy.readFile('../vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json').then((file) => {
                   file.vnfs['2017-488_PASQUALE-vPE 0'].trackById = vnf.trackById;
                   file.vnfs['2017-488_PASQUALE-vPE 0'].vfModules = {};
+                  file.vnfs['2017-488_PASQUALE-vPE 0'].upgradedVFMSonsCounter = 0;
                   cy.deepCompare(vnf, file.vnfs['2017-488_PASQUALE-vPE 0'])
                 });
               });
@@ -232,6 +232,7 @@ describe('A la carte', function () {
                             for (let vfModulesName of vfModulesNames) {
                               const vfModule = vfModules[vfModulesName];
                               let vfModuleObject = vfModule[Object.keys(vfModule)[0]];
+                              file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName].action = "Create";
                               cy.deepCompare(vfModuleObject, file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName]);
                             }
                           });
@@ -261,7 +262,7 @@ describe('A la carte', function () {
         .get('.error').contains(INSTANCE_NAME_NOT_MANDATORY_MESSAGE);
     }
 
-    function addVfModule(vnfName: string, vfModuleName: string, instanceName: string, lcpRegion: string, legacyRegion: string, tenant: string, rollback: boolean, sdncPreLoad: boolean, deleteVgName: boolean): Chainable<any> {
+    function addVfModule (vnfName: string, vfModuleName: string, instanceName: string, lcpRegion: string, legacyRegion: string, tenant: string, rollback: boolean, sdncPreLoad: boolean, deleteVgName: boolean): Chainable<any> {
       return cy.getElementByDataTestsId('node-' + vnfName).click({force: true}).then(() => {
         cy.getElementByDataTestsId('node-' + vfModuleName + '-add-btn').click({force: true}).then(() => {
           cy.getElementByDataTestsId('instanceName').clear().type(instanceName, {force: true}).then(() => {
@@ -284,5 +285,6 @@ describe('A la carte', function () {
       });
     }
 
+
   });
 });
index 796755c..d598713 100644 (file)
@@ -6,7 +6,7 @@ import {ServiceModel} from "../../support/jsonBuilders/models/service.model";
 describe('Drawing board : Collection resource', function () {
 
   let jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
-
+  const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
   beforeEach(() => {
     cy.window().then((win) => {
       win.sessionStorage.clear();
@@ -24,7 +24,7 @@ describe('Drawing board : Collection resource', function () {
 
   describe('should show collection resource model correctly', () => {
     it('collection type + name', () => {
-      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+
       const collectionResourceName: string = "CR_sanity 0";
       initDrawingBoardWithColectionResource(serviceModelId, collectionResourceName);
       cy.get('.vf-type').contains('CR');
@@ -32,7 +32,6 @@ describe('Drawing board : Collection resource', function () {
     });
 
     it('collection resource component info', () => {
-      const serviceModelId: string = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
       const collectionResourceName: string = "CR_sanity 0";
       const redux = initDrawingBoardWithColectionResource(serviceModelId, collectionResourceName)
       cy.getElementByDataTestsId(`node-${collectionResourceName}`).click().then(()=>{
index 503900c..e150b93 100644 (file)
@@ -1,4 +1,3 @@
-
 ///<reference path="../../../node_modules/cypress/types/index.d.ts"/>
 import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder";
 import {ServiceModel} from "../../support/jsonBuilders/models/service.model";
@@ -1822,128 +1821,8 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -1951,16 +1830,6 @@ describe('Drawing board', function () {
                 "name": "ro-T112",
                 "isPermitted": true
               },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -2271,6555 +2140,817 @@ describe('Drawing board', function () {
             "name": "UUUAIAAI-YYY1"
           },
           {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
           },
           {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
-          {
-            "id": "AVT1",
-            "name": "AVTRFLHD-AVT1"
-          },
-          {
-            "id": "ATL34",
-            "name": "ATLSANAI-ATL34"
-          }
-        ],
-        "categoryParameters": {
-          "owningEntityList": [
-            {
-              "id": "aaa1",
-              "name": "aaa1"
-            },
-            {
-              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-              "name": "WayneHolland"
-            },
-            {
-              "id": "Melissa",
-              "name": "Melissa"
-            }
-          ],
-          "projectList": [
-            {
-              "id": "WATKINS",
-              "name": "WATKINS"
-            },
-            {
-              "id": "x1",
-              "name": "x1"
-            },
-            {
-              "id": "yyy1",
-              "name": "yyy1"
-            }
-          ],
-          "lineOfBusinessList": [
-            {
-              "id": "ONAP",
-              "name": "ONAP"
-            },
-            {
-              "id": "zzz1",
-              "name": "zzz1"
-            }
-          ],
-          "platformList": [
-            {
-              "id": "platform",
-              "name": "platform"
-            },
-            {
-              "id": "xxx1",
-              "name": "xxx1"
-            }
-          ]
-        },
-        "type": "[CATEGORY_PARAMETERS] Update"
-      }
-    }
-  }
-
-  function getReduxWithVNFMissingData() {
-    return {
-      "global": {
-        "name": null,
-        "flags": {
-          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_SHOW_ASSIGNMENTS": true,
-          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
-          "FLAG_ADD_MSO_TESTAPI_FIELD": true
-        },
-        "type": "[FLAGS] Update"
-      },
-      "service": {
-        "serviceHierarchy": {
-          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
-            "service": {
-              "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "name": "PASQUALE vMX vPE_BV Service 488",
-              "version": "1.0",
-              "toscaModelURL": null,
-              "category": "Network L1-3",
-              "serviceType": "",
-              "serviceRole": "",
-              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
-              "serviceEcompNaming": "true",
-              "instantiationType": "Macro",
-              "vidNotions": {
-                "instantiationType": "Macro"
-              },
-              "inputs": {
-                "2017488_pasqualevpe0_ASN": {
-                  "type": "string",
-                  "description": "AV/PE",
-                  "entry_schema": null,
-                  "inputProperties": null,
-                  "constraints": [],
-                  "required": true,
-                  "default": "AV_vPE"
-                }
-              }
-            },
-            "vnfs": {
-              "2017-488_PASQUALE-vPE 0": {
-                "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
-                "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                "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": {
-                  "vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "10"
-                  },
-                  "AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  },
-                  "availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  },
-                  "ASN": {
-                    "type": "string",
-                    "description": "AV/PE",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "AV_vPE"
-                  },
-                  "vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "mtnj309me6"
-                  }
-                },
-                "commands": {
-                  "vnf_config_template_version": {
-                    "displayName": "vnf_config_template_version",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-                  },
-                  "bandwidth_units": {
-                    "displayName": "bandwidth_units",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
-                  },
-                  "bandwidth": {
-                    "displayName": "bandwidth",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_bandwidth"
-                  },
-                  "AIC_CLLI": {
-                    "displayName": "AIC_CLLI",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-                  },
-                  "availability_zone_0": {
-                    "displayName": "availability_zone_0",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
-                  },
-                  "ASN": {
-                    "displayName": "ASN",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_ASN"
-                  },
-                  "vnf_instance_name": {
-                    "displayName": "vnf_instance_name",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-                  }
-                },
-                "properties": {
-                  "vmxvre_retype": "RE-VMX",
-                  "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": "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": "10.0.0.10",
-                  "is_AVPN_service": "false",
-                  "vmx_RSG_name": "vREXI-affinity",
-                  "vmx_int_ctl_forwarding": "l2",
-                  "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",
-                  "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-                  "vmxvre_image_name_0": "vre172_nova_img",
-                  "vmxvre_instance": "0",
-                  "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-                  "vmxvre_flavor_name": "ns.c1r16d32.v5",
-                  "vmxvpfe_volume_size_0": "40.0",
-                  "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-                  "nf_naming": "{ecomp_generated_naming=true}",
-                  "multi_stage_design": "false",
-                  "nf_naming_code": "me6",
-                  "vmxvre_name_0": "vREXI",
-                  "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-                  "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-                  "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-                  "vmxvpfe_image_name_0": "vpfe172_nova_img",
-                  "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-                  "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-                  "vmxvre_console": "vidconsole",
-                  "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-                  "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-                  "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-                  "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-                  "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-                  "vf_module_id": "123",
-                  "nf_function": "PASQUALE vPE",
-                  "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-                  "vmxvre_int_ctl_ip_0": "10.0.0.10",
-                  "ecomp_generated_naming": "true",
-                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-                  "vnf_name": "mtnj309me6vre",
-                  "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-                  "vmxvre_volume_type_1": "HITACHI",
-                  "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-                  "vmxvre_volume_type_0": "HITACHI",
-                  "vmxvpfe_volume_type_0": "HITACHI",
-                  "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
-                  "vnf_id": "123",
-                  "vmxvre_oam_prefix": "24",
-                  "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_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.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_pasqualevpe0_vnf_instance_name",
-                  "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-                  "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-                  "vmx_int_ctl_len": "24",
-                  "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-                  "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-                  "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-                  "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-                  "nf_role": "vPE",
-                  "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-                  "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-                  "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-                },
-                "type": "VF",
-                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-                "vfModules": {
-                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "properties": {
-                      "minCountInstances": 2,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vRE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_bandwidth_units": {
-                        "type": "string",
-                        "description": "Units of bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth_units"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "Gbps"
-                      },
-                      "2017488_pasqualevpe0_bandwidth": {
-                        "type": "string",
-                        "description": "Requested VPE bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "10"
-                      },
-                      "2017488_pasqualevpe0_vnf_instance_name": {
-                        "type": "string",
-                        "description": "The hostname assigned to the vpe.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_instance_name"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtnj309me6"
-                      },
-                      "2017488_pasqualevpe0_vnf_config_template_version": {
-                        "type": "string",
-                        "description": "VPE Software Version",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_config_template_version"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "17.2"
-                      },
-                      "2017488_pasqualevpe0_AIC_CLLI": {
-                        "type": "string",
-                        "description": "AIC Site CLLI",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "AIC_CLLI"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "ATLMY8GA"
-                      }
-                    },
-                    "volumeGroupAllowed": true
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                    "version": "6",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vPFE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_availability_zone_0": {
-                        "type": "string",
-                        "description": "The Availability Zone to launch the instance.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vPFE_BV",
-                          "paramName": "availability_zone_0"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtpocfo-kvm-az01"
-                      }
-                    },
-                    "volumeGroupAllowed": true
-                  }
-                },
-                "volumeGroups": {
-                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vRE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_bandwidth_units": {
-                        "type": "string",
-                        "description": "Units of bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth_units"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "Gbps"
-                      },
-                      "2017488_pasqualevpe0_bandwidth": {
-                        "type": "string",
-                        "description": "Requested VPE bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "10"
-                      },
-                      "2017488_pasqualevpe0_vnf_instance_name": {
-                        "type": "string",
-                        "description": "The hostname assigned to the vpe.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_instance_name"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtnj309me6"
-                      },
-                      "2017488_pasqualevpe0_vnf_config_template_version": {
-                        "type": "string",
-                        "description": "VPE Software Version",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_config_template_version"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "17.2"
-                      },
-                      "2017488_pasqualevpe0_AIC_CLLI": {
-                        "type": "string",
-                        "description": "AIC Site CLLI",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "AIC_CLLI"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "ATLMY8GA"
-                      }
-                    }
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vPFE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_availability_zone_0": {
-                        "type": "string",
-                        "description": "The Availability Zone to launch the instance.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vPFE_BV",
-                          "paramName": "availability_zone_0"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtpocfo-kvm-az01"
-                      }
-                    }
-                  }
-                },
-                "vfcInstanceGroups": {}
-              }
-            },
-            "networks": {},
-            "collectionResources": {},
-            "configurations": {},
-            "serviceProxies": {},
-            "vfModules": {
-              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vRE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth_units"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "2017488_pasqualevpe0_bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "10"
-                  },
-                  "2017488_pasqualevpe0_vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_instance_name"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtnj309me6"
-                  },
-                  "2017488_pasqualevpe0_vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_config_template_version"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "2017488_pasqualevpe0_AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "AIC_CLLI"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  }
-                },
-                "volumeGroupAllowed": true
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                "version": "6",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vPFE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vPFE_BV",
-                      "paramName": "availability_zone_0"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  }
-                },
-                "volumeGroupAllowed": true
-              }
-            },
-            "volumeGroups": {
-              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vRE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth_units"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "2017488_pasqualevpe0_bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "10"
-                  },
-                  "2017488_pasqualevpe0_vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_instance_name"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtnj309me6"
-                  },
-                  "2017488_pasqualevpe0_vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_config_template_version"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "2017488_pasqualevpe0_AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "AIC_CLLI"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  }
-                }
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vPFE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vPFE_BV",
-                      "paramName": "availability_zone_0"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  }
-                }
-              }
-            },
-            "pnfs": {}
-          },
-          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
-            "service": {
-              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-              "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-              "name": "ComplexService",
-              "version": "1.0",
-              "toscaModelURL": null,
-              "category": "Emanuel",
-              "serviceType": "",
-              "serviceRole": "",
-              "description": "ComplexService",
-              "serviceEcompNaming": "true",
-              "instantiationType": "Macro",
-              "vidNotions": {
-                "instantiationType": "Macro"
-              },
-              "inputs": {}
-            },
-            "vnfs": {
-              "VF_vGeraldine 0": {
-                "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
-                "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vGeraldine",
-                "name": "VF_vGeraldine",
-                "version": "2.0",
-                "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-egress_src_start_port": "0",
-                  "sctp-a-ipv6-egress_rule_application": "any",
-                  "Internal2_allow_transit": "true",
-                  "sctp-b-IPv6_ethertype": "IPv6",
-                  "sctp-a-egress_rule_application": "any",
-                  "sctp-b-ingress_action": "pass",
-                  "sctp-b-ingress_rule_protocol": "icmp",
-                  "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-ingress-src_start_port": "0.0",
-                  "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "fsb_volume_size_0": "320.0",
-                  "sctp-b-egress_src_addresses": "local",
-                  "sctp-a-ipv6-ingress_ethertype": "IPv4",
-                  "sctp-a-ipv6-ingress-dst_start_port": "0",
-                  "sctp-b-ipv6-ingress_rule_application": "any",
-                  "domain_name": "default-domain",
-                  "sctp-a-ingress_rule_protocol": "icmp",
-                  "sctp-b-egress-src_start_port": "0.0",
-                  "sctp-a-egress_src_addresses": "local",
-                  "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
-                  "sctp-a-egress-src_start_port": "0.0",
-                  "sctp-a-ingress_ethertype": "IPv4",
-                  "sctp-b-ipv6-ingress-dst_end_port": "65535",
-                  "sctp-b-dst_subnet_prefix_v6": "::",
-                  "nf_naming": "{ecomp_generated_naming=true}",
-                  "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
-                  "sctp-b-egress-dst_start_port": "0.0",
-                  "ncb_flavor_name": "nv.c20r64d1",
-                  "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-egress_dst_subnet_prefix_len": "0.0",
-                  "Internal2_net_cidr": "10.0.0.10",
-                  "sctp-a-ingress-dst_start_port": "0.0",
-                  "sctp-a-egress-dst_start_port": "0.0",
-                  "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-egress_ethertype": "IPv4",
-                  "vlc_st_service_mode": "in-network-nat",
-                  "sctp-a-ipv6-egress_ethertype": "IPv4",
-                  "sctp-a-egress-src_end_port": "65535.0",
-                  "sctp-b-ipv6-egress_rule_application": "any",
-                  "sctp-b-egress_action": "pass",
-                  "sctp-a-ingress-src_subnet_prefix_len": "0.0",
-                  "sctp-b-ipv6-ingress-src_end_port": "65535.0",
-                  "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
-                  "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-ipv6-ingress-src_start_port": "0.0",
-                  "sctp-b-ipv6-egress_ethertype": "IPv4",
-                  "Internal1_net_cidr": "10.0.0.10",
-                  "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
-                  "fsb_flavor_name": "nv.c20r64d1",
-                  "sctp_rule_protocol": "132",
-                  "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
-                  "sctp-a-ipv6-ingress_rule_application": "any",
-                  "ecomp_generated_naming": "true",
-                  "sctp-a-IPv6_ethertype": "IPv6",
-                  "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_virtualization_type": "virtual-machine",
-                  "sctp-b-ingress-dst_start_port": "0.0",
-                  "sctp-b-ingress-dst_end_port": "65535.0",
-                  "sctp-a-ipv6-ingress-src_end_port": "65535.0",
-                  "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
-                  "sctp-b-ingress_rule_application": "any",
-                  "int2_sec_group_name": "int2-sec-group",
-                  "vlc_flavor_name": "nd.c16r64d1",
-                  "sctp-b-ipv6-egress_src_addresses": "local",
-                  "vlc_st_interface_type_int1": "other1",
-                  "sctp-b-egress-src_end_port": "65535.0",
-                  "sctp-a-ipv6-egress-dst_start_port": "0",
-                  "vlc_st_interface_type_int2": "other2",
-                  "sctp-a-ipv6-egress_rule_protocol": "any",
-                  "Internal2_shared": "false",
-                  "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
-                  "Internal2_rpf": "disable",
-                  "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-egress_src_end_port": "65535",
-                  "sctp-a-ipv6-egress_src_addresses": "local",
-                  "sctp-a-ingress-dst_end_port": "65535.0",
-                  "sctp-a-ipv6-egress_src_end_port": "65535",
-                  "Internal1_forwarding_mode": "l2",
-                  "Internal2_dhcp": "false",
-                  "sctp-a-dst_subnet_prefix_v6": "::",
-                  "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
-                  "vlc_st_interface_type_gtp": "other0",
-                  "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-src_subnet_prefix_v6": "::",
-                  "sctp-a-egress_dst_subnet_prefix_len": "0.0",
-                  "int1_sec_group_name": "int1-sec-group",
-                  "Internal1_dhcp": "false",
-                  "sctp-a-ipv6-egress_dst_end_port": "65535",
-                  "Internal2_forwarding_mode": "l2",
-                  "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
-                  "Internal1_net_cidr_len": "17",
-                  "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ingress-src_subnet_prefix_len": "0.0",
-                  "sctp-a-ingress_dst_addresses": "local",
-                  "sctp-a-egress_action": "pass",
-                  "fsb_volume_type_0": "SF-Default-SSD",
-                  "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_interface_type_sctp_a": "left",
-                  "vlc_st_interface_type_sctp_b": "right",
-                  "sctp-a-src_subnet_prefix_v6": "::",
-                  "vlc_st_version": "2",
-                  "sctp-b-egress_ethertype": "IPv4",
-                  "sctp-a-ingress_rule_application": "any",
-                  "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "instance_ip_family_v6": "v6",
-                  "sctp-a-ipv6-egress_src_start_port": "0",
-                  "sctp-b-ingress-src_start_port": "0.0",
-                  "sctp-b-ingress_dst_addresses": "local",
-                  "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_interface_type_oam": "management",
-                  "multi_stage_design": "false",
-                  "oam_sec_group_name": "oam-sec-group",
-                  "Internal2_net_gateway": "10.0.0.10",
-                  "sctp-a-ipv6-ingress-dst_end_port": "65535",
-                  "sctp-b-ipv6-egress-dst_start_port": "0",
-                  "Internal1_net_gateway": "10.0.0.10",
-                  "sctp-b-ipv6-egress_rule_protocol": "any",
-                  "gtp_sec_group_name": "gtp-sec-group",
-                  "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
-                  "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
-                  "sctp-a-ipv6-ingress_dst_addresses": "local",
-                  "sctp-a-egress_rule_protocol": "icmp",
-                  "sctp-b-ipv6-egress_action": "pass",
-                  "sctp-a-ipv6-egress_action": "pass",
-                  "Internal1_shared": "false",
-                  "sctp-b-ipv6-ingress_rule_protocol": "any",
-                  "Internal2_net_cidr_len": "17",
-                  "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
-                  "sctp-a-ingress-src_end_port": "65535.0",
-                  "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-egress-dst_end_port": "65535.0",
-                  "sctp-a-ingress_action": "pass",
-                  "sctp-b-egress_rule_protocol": "icmp",
-                  "sctp-b-ipv6-ingress_action": "pass",
-                  "vlc_st_service_type": "firewall",
-                  "sctp-b-ipv6-egress_dst_end_port": "65535",
-                  "sctp-b-ipv6-ingress-dst_start_port": "0",
-                  "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_availability_zone": "true",
-                  "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
-                  "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
-                  "Internal1_allow_transit": "true",
-                  "gpb_flavor_name": "nv.c20r64d1",
-                  "availability_zone_max_count": "1",
-                  "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
-                  "sctp-b-ipv6-ingress_dst_addresses": "local",
-                  "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
-                  "sctp-b-ipv6-ingress_ethertype": "IPv4",
-                  "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-ipv6-ingress_action": "pass",
-                  "Internal1_rpf": "disable",
-                  "sctp-b-ingress_ethertype": "IPv4",
-                  "sctp-b-egress_rule_application": "any",
-                  "sctp-b-ingress-src_end_port": "65535.0",
-                  "sctp-a-ipv6-ingress_rule_protocol": "any",
-                  "sctp-a-ingress-src_start_port": "0.0",
-                  "sctp-b-egress-dst_end_port": "65535.0"
-                },
-                "type": "VF",
-                "modelCustomizationName": "VF_vGeraldine 0",
-                "vfModules": {
-                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
-                    "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                    "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
-                    "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
-                    "description": null,
-                    "name": "VfVgeraldine..vflorence_vlc..module-1",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "vflorence_vlc"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
-                    "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
-                    "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
-                    "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
-                    "description": null,
-                    "name": "VfVgeraldine..vflorence_gpb..module-2",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "vflorence_gpb"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                    "description": null,
-                    "name": "VfVgeraldine..base_vflorence..module-0",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "base_vflorence"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": true
-                  }
-                },
-                "volumeGroups": {
-                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                    "description": null,
-                    "name": "VfVgeraldine..base_vflorence..module-0",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "base_vflorence"
-                    },
-                    "inputs": {}
-                  }
-                },
-                "vfcInstanceGroups": {}
-              }
-            },
-            "networks": {
-              "ExtVL 0": {
-                "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
-                "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
-                "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
-                "name": "ExtVL",
-                "version": "37.0",
-                "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
-                  "exVL_naming": "{ecomp_generated_naming=true}",
-                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
-                  "network_homing": "{ecomp_selected_instance_node_target=false}"
-                },
-                "type": "VL",
-                "modelCustomizationName": "ExtVL 0"
-              }
-            },
-            "collectionResources": {},
-            "configurations": {
-              "Port Mirroring Configuration By Policy 0": {
-                "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
-                "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
-                "description": "A port mirroring configuration by policy object",
-                "name": "Port Mirroring Configuration By Policy",
-                "version": "27.0",
-                "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
-                "inputs": {},
-                "commands": {},
-                "properties": {},
-                "type": "Configuration",
-                "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
-                "sourceNodes": [],
-                "collectorNodes": null,
-                "configurationByPolicy": false
-              }
-            },
-            "serviceProxies": {},
-            "vfModules": {
-              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
-                "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
-                "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
-                "description": null,
-                "name": "VfVgeraldine..vflorence_vlc..module-1",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "vflorence_vlc"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
-                "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
-                "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
-                "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
-                "description": null,
-                "name": "VfVgeraldine..vflorence_gpb..module-2",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "vflorence_gpb"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                "description": null,
-                "name": "VfVgeraldine..base_vflorence..module-0",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "base_vflorence"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": true
-              }
-            },
-            "volumeGroups": {
-              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                "description": null,
-                "name": "VfVgeraldine..base_vflorence..module-0",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "base_vflorence"
-                },
-                "inputs": {}
-              }
-            },
-            "pnfs": {}
-          }
-        },
-        "serviceInstance": {
-          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
-            "vnfs": {
-              "2017-488_PASQUALE-vPE 0": {
-                "rollbackOnFailure": "true",
-                "vfModules": {
-                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
-                      "isMissingData": false,
-                      "sdncPreReload": null,
-                      "modelInfo": {
-                        "modelType": "VFmodule",
-                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                        "modelVersion": "6",
-                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
-                      },
-                      "instanceParams": [
-                        {}
-                      ],
-                      "trackById": "n2ydptuy9lj"
-                    }
-                  }
-                },
-                "isMissingData": false,
-                "originalName": null,
-                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-                "lcpCloudRegionId": null,
-                "tenantId": null,
-                "lineOfBusiness": null,
-                "platformName": null,
-                "modelInfo": {
-                  "modelType": "VF",
-                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_PASQUALE-vPE",
-                  "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
-                },
-                "trackById": "iapflwk8bip"
-              },
-              "2017-488_PASQUALE-vPE 0:0001": {
-                "rollbackOnFailure": "true",
-                "vfModules": {
-                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
-                      "isMissingData": false,
-                      "sdncPreReload": null,
-                      "modelInfo": {
-                        "modelType": "VFmodule",
-                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                        "modelVersion": "6",
-                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
-                      },
-                      "instanceParams": [
-                        {}
-                      ],
-                      "trackById": "wh18xgy0dc"
-                    }
-                  }
-                },
-                "isMissingData": true,
-                "originalName": "2017-488_PASQUALE-vPE 0",
-                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-                "lcpCloudRegionId": null,
-                "tenantId": null,
-                "lineOfBusiness": null,
-                "platformName": null,
-                "modelInfo": {
-                  "modelType": "VF",
-                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_PASQUALE-vPE",
-                  "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
-                },
-                "trackById": "iapflwk8bip"
-              }
-            },
-            "instanceParams": [
-              {
-                "2017488_pasqualevpe0_ASN": "AV_vPE"
-              }
-            ],
-            "validationCounter": 1,
-            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "AAIAIC25",
-            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
-            "aicZoneId": "JAG1",
-            "projectName": "x1",
-            "owningEntityId": "aaa1",
-            "rollbackOnFailure": "true",
-            "bulkSize": 1,
-            "modelInfo": {
-              "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "modelName": "PASQUALE vMX vPE_BV Service 488",
-              "modelVersion": "1.0"
-            },
-            "existingVNFCounterMap": {
-              "91415b44-753d-494c-926a-456a9172bbb9": 1
-            },
-            "existingNetworksCounterMap": {},
-            "tenantName": "USP-SIP-IC-24335-T-01",
-            "aicZoneName": "YUDFJULP-JAG1"
-          }
-        },
-        "lcpRegionsAndTenants": {
-          "lcpRegionList": [
-            {
-              "id": "AAIAIC25",
-              "name": "AAIAIC25",
-              "isPermitted": true
-            },
-            {
-              "id": "hvf6",
-              "name": "hvf6",
-              "isPermitted": true
-            }
-          ],
-          "lcpRegionsTenantsMap": {
-            "AAIAIC25": [
-              {
-                "id": "092eb9e8e4b7412e8787dd091bc58e86",
-                "name": "USP-SIP-IC-24335-T-01",
-                "isPermitted": true
-              }
-            ],
-            "hvf6": [
-              {
-                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
-                "name": "AIN Web Tool-15-D-testalexandria",
-                "isPermitted": true
-              },
-              {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
-                "isPermitted": true
-              },
-              {
-                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
-                "name": "ro-T112",
-                "isPermitted": true
-              },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
-              {
-                "id": "cbb99fe4ada84631b7baf046b6fd2044",
-                "name": "DN5242-Nov16-T3",
-                "isPermitted": true
-              }
-            ]
-          }
-        },
-        "subscribers": [
-          {
-            "id": "CAR_2020_ER",
-            "name": "CAR_2020_ER",
-            "isPermitted": true
-          },
-          {
-            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
-            "name": "JULIO ERICKSON",
-            "isPermitted": false
-          },
-          {
-            "id": "DHV1707-TestSubscriber-2",
-            "name": "DALE BRIDGES",
-            "isPermitted": false
-          },
-          {
-            "id": "DHV1707-TestSubscriber-1",
-            "name": "LLOYD BRIDGES",
-            "isPermitted": false
-          },
-          {
-            "id": "jimmy-example",
-            "name": "JimmyExampleCust-20161102",
-            "isPermitted": false
-          },
-          {
-            "id": "jimmy-example2",
-            "name": "JimmyExampleCust-20161103",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-102",
-            "name": "ERICA5779-TestSub-PWT-102",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-101",
-            "name": "ERICA5779-TestSub-PWT-101",
-            "isPermitted": false
-          },
-          {
-            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "name": "Emanuel",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-Subscriber-4",
-            "name": "ERICA5779-Subscriber-5",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-103",
-            "name": "ERICA5779-TestSub-PWT-103",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-Subscriber-2",
-            "name": "ERICA5779-Subscriber-2",
-            "isPermitted": false
-          },
-          {
-            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "name": "SILVIA ROBBINS",
-            "isPermitted": true
-          },
-          {
-            "id": "ERICA5779-Subscriber-3",
-            "name": "ERICA5779-Subscriber-3",
-            "isPermitted": false
-          },
-          {
-            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
-            "name": "CRAIG/ROBERTS",
-            "isPermitted": false
-          }
-        ],
-        "productFamilies": [
-          {
-            "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "ERICA",
-            "isPermitted": true
-          },
-          {
-            "id": "17cc1042-527b-11e6-beb8-9e71128cae77",
-            "name": "IGNACIO",
-            "isPermitted": true
-          },
-          {
-            "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
-            "name": "Christie",
-            "isPermitted": true
-          },
-          {
-            "id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7",
-            "name": "Enhanced Services",
-            "isPermitted": true
-          },
-          {
-            "id": "vTerrance",
-            "name": "vTerrance",
-            "isPermitted": true
-          },
-          {
-            "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vEsmeralda",
-            "isPermitted": true
-          },
-          {
-            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "name": "Emanuel",
-            "isPermitted": true
-          },
-          {
-            "id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
-            "name": "BVOIP",
-            "isPermitted": true
-          },
-          {
-            "id": "db171b8f-115c-4992-a2e3-ee04cae357e0",
-            "name": "LINDSEY",
-            "isPermitted": true
-          },
-          {
-            "id": "LRSI-OSPF",
-            "name": "LRSI-OSPF",
-            "isPermitted": true
-          },
-          {
-            "id": "vRosemarie",
-            "name": "HNGATEWAY",
-            "isPermitted": true
-          },
-          {
-            "id": "vHNPaas",
-            "name": "WILKINS",
-            "isPermitted": true
-          },
-          {
-            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "name": "TYLER SILVIA",
-            "isPermitted": true
-          },
-          {
-            "id": "b6a3f28c-eebf-494c-a900-055cc7c874ce",
-            "name": "VROUTER",
-            "isPermitted": true
-          },
-          {
-            "id": "vMuriel",
-            "name": "vMuriel",
-            "isPermitted": true
-          },
-          {
-            "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1",
-            "name": "CARA Griffin",
-            "isPermitted": true
-          },
-          {
-            "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
-            "name": "DARREN MCGEE",
-            "isPermitted": true
-          },
-          {
-            "id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1",
-            "name": "Transport",
-            "isPermitted": true
-          },
-          {
-            "id": "vSalvatore",
-            "name": "vSalvatore",
-            "isPermitted": true
-          },
-          {
-            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "JOSEFINA",
-            "isPermitted": true
-          },
-          {
-            "id": "vHubbard",
-            "name": "vHubbard",
-            "isPermitted": true
-          },
-          {
-            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
-            "name": "DARREN MCGEE",
-            "isPermitted": true
-          }
-        ],
-        "serviceTypes": {
-          "e433710f-9217-458d-a79d-1c7aff376d89": [
-            {
-              "id": "0",
-              "name": "vRichardson",
-              "isPermitted": false
-            },
-            {
-              "id": "1",
-              "name": "TYLER SILVIA",
-              "isPermitted": true
-            },
-            {
-              "id": "2",
-              "name": "Emanuel",
-              "isPermitted": false
-            },
-            {
-              "id": "3",
-              "name": "vJamie",
-              "isPermitted": false
-            },
-            {
-              "id": "4",
-              "name": "vVoiceMail",
-              "isPermitted": false
-            },
-            {
-              "id": "5",
-              "name": "Kennedy",
-              "isPermitted": false
-            },
-            {
-              "id": "6",
-              "name": "vPorfirio",
-              "isPermitted": false
-            },
-            {
-              "id": "7",
-              "name": "vVM",
-              "isPermitted": false
-            },
-            {
-              "id": "8",
-              "name": "vOTA",
-              "isPermitted": false
-            },
-            {
-              "id": "9",
-              "name": "vFLORENCE",
-              "isPermitted": false
-            },
-            {
-              "id": "10",
-              "name": "vMNS",
-              "isPermitted": false
-            },
-            {
-              "id": "11",
-              "name": "vEsmeralda",
-              "isPermitted": false
-            },
-            {
-              "id": "12",
-              "name": "VPMS",
-              "isPermitted": false
-            },
-            {
-              "id": "13",
-              "name": "vWINIFRED",
-              "isPermitted": false
-            },
-            {
-              "id": "14",
-              "name": "SSD",
-              "isPermitted": false
-            },
-            {
-              "id": "15",
-              "name": "vMOG",
-              "isPermitted": false
-            },
-            {
-              "id": "16",
-              "name": "LINDSEY",
-              "isPermitted": false
-            },
-            {
-              "id": "17",
-              "name": "JOHANNA_SANTOS",
-              "isPermitted": false
-            },
-            {
-              "id": "18",
-              "name": "vCarroll",
-              "isPermitted": false
-            }
-          ]
-        },
-        "aicZones": [
-          {
-            "id": "NFT1",
-            "name": "NFTJSSSS-NFT1"
-          },
-          {
-            "id": "JAG1",
-            "name": "YUDFJULP-JAG1"
-          },
-          {
-            "id": "YYY1",
-            "name": "UUUAIAAI-YYY1"
-          },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
-          {
-            "id": "AVT1",
-            "name": "AVTRFLHD-AVT1"
-          },
-          {
-            "id": "ATL34",
-            "name": "ATLSANAI-ATL34"
-          }
-        ],
-        "categoryParameters": {
-          "owningEntityList": [
-            {
-              "id": "aaa1",
-              "name": "aaa1"
-            },
-            {
-              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-              "name": "WayneHolland"
-            },
-            {
-              "id": "Melissa",
-              "name": "Melissa"
-            }
-          ],
-          "projectList": [
-            {
-              "id": "WATKINS",
-              "name": "WATKINS"
-            },
-            {
-              "id": "x1",
-              "name": "x1"
-            },
-            {
-              "id": "yyy1",
-              "name": "yyy1"
-            }
-          ],
-          "lineOfBusinessList": [
-            {
-              "id": "ONAP",
-              "name": "ONAP"
-            },
-            {
-              "id": "zzz1",
-              "name": "zzz1"
-            }
-          ],
-          "platformList": [
-            {
-              "id": "platform",
-              "name": "platform"
-            },
-            {
-              "id": "xxx1",
-              "name": "xxx1"
-            }
-          ]
-        },
-        "type": "[LCP_REGIONS_AND_TENANTS] Update"
-      }
-    }
-  }
-
-  function getReduxWithVFModuleMissingData() {
-    return {
-      "global": {
-        "name": null,
-        "flags": {
-          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_SHOW_ASSIGNMENTS": true,
-          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
-          "EMPTY_DRAWING_BOARD_TEST": false,
-          "FLAG_ADD_MSO_TESTAPI_FIELD": true
-        },
-        "type": "[FLAGS] Update"
-      },
-      "service": {
-        "serviceHierarchy": {
-          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
-            "service": {
-              "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "name": "PASQUALE vMX vPE_BV Service 488",
-              "version": "1.0",
-              "toscaModelURL": null,
-              "category": "Network L1-3",
-              "serviceType": "",
-              "serviceRole": "",
-              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
-              "serviceEcompNaming": "true",
-              "instantiationType": "Macro",
-              "vidNotions": {
-                "instantiationType": "Macro"
-              },
-              "inputs": {
-                "2017488_pasqualevpe0_ASN": {
-                  "type": "string",
-                  "description": "AV/PE",
-                  "entry_schema": null,
-                  "inputProperties": null,
-                  "constraints": [],
-                  "required": true,
-                  "default": "AV_vPE"
-                }
-              }
-            },
-            "vnfs": {
-              "2017-488_PASQUALE-vPE 0": {
-                "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
-                "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                "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": {
-                  "vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "10"
-                  },
-                  "AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  },
-                  "availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  },
-                  "ASN": {
-                    "type": "string",
-                    "description": "AV/PE",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "AV_vPE"
-                  },
-                  "vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": null,
-                    "constraints": [],
-                    "required": true,
-                    "default": "mtnj309me6"
-                  }
-                },
-                "commands": {
-                  "vnf_config_template_version": {
-                    "displayName": "vnf_config_template_version",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
-                  },
-                  "bandwidth_units": {
-                    "displayName": "bandwidth_units",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
-                  },
-                  "bandwidth": {
-                    "displayName": "bandwidth",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_bandwidth"
-                  },
-                  "AIC_CLLI": {
-                    "displayName": "AIC_CLLI",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
-                  },
-                  "availability_zone_0": {
-                    "displayName": "availability_zone_0",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
-                  },
-                  "ASN": {
-                    "displayName": "ASN",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_ASN"
-                  },
-                  "vnf_instance_name": {
-                    "displayName": "vnf_instance_name",
-                    "command": "get_input",
-                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
-                  }
-                },
-                "properties": {
-                  "vmxvre_retype": "RE-VMX",
-                  "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": "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": "10.0.0.10",
-                  "is_AVPN_service": "false",
-                  "vmx_RSG_name": "vREXI-affinity",
-                  "vmx_int_ctl_forwarding": "l2",
-                  "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",
-                  "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
-                  "vmxvre_image_name_0": "vre172_nova_img",
-                  "vmxvre_instance": "0",
-                  "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
-                  "vmxvre_flavor_name": "ns.c1r16d32.v5",
-                  "vmxvpfe_volume_size_0": "40.0",
-                  "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
-                  "nf_naming": "{ecomp_generated_naming=true}",
-                  "multi_stage_design": "false",
-                  "nf_naming_code": "me6",
-                  "vmxvre_name_0": "vREXI",
-                  "vmxvpfe_sriov42_0_port_vlanstrip": "false",
-                  "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
-                  "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
-                  "vmxvpfe_image_name_0": "vpfe172_nova_img",
-                  "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
-                  "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
-                  "vmxvre_console": "vidconsole",
-                  "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
-                  "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
-                  "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
-                  "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
-                  "vmxvpfe_sriov44_0_port_vlanstrip": "false",
-                  "vf_module_id": "123",
-                  "nf_function": "PASQUALE vPE",
-                  "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
-                  "vmxvre_int_ctl_ip_0": "10.0.0.10",
-                  "ecomp_generated_naming": "true",
-                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
-                  "vnf_name": "mtnj309me6vre",
-                  "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
-                  "vmxvre_volume_type_1": "HITACHI",
-                  "vmxvpfe_sriov44_0_port_broadcastallow": "true",
-                  "vmxvre_volume_type_0": "HITACHI",
-                  "vmxvpfe_volume_type_0": "HITACHI",
-                  "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
-                  "vnf_id": "123",
-                  "vmxvre_oam_prefix": "24",
-                  "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_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.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_pasqualevpe0_vnf_instance_name",
-                  "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
-                  "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
-                  "vmx_int_ctl_len": "24",
-                  "vmxvpfe_sriov43_0_port_vlanstrip": "false",
-                  "vmxvpfe_sriov41_0_port_broadcastallow": "true",
-                  "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
-                  "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
-                  "nf_role": "vPE",
-                  "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
-                  "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
-                  "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
-                },
-                "type": "VF",
-                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
-                "vfModules": {
-                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "properties": {
-                      "minCountInstances": 2,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vRE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_bandwidth_units": {
-                        "type": "string",
-                        "description": "Units of bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth_units"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "Gbps"
-                      },
-                      "2017488_pasqualevpe0_bandwidth": {
-                        "type": "string",
-                        "description": "Requested VPE bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "10"
-                      },
-                      "2017488_pasqualevpe0_vnf_instance_name": {
-                        "type": "string",
-                        "description": "The hostname assigned to the vpe.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_instance_name"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtnj309me6"
-                      },
-                      "2017488_pasqualevpe0_vnf_config_template_version": {
-                        "type": "string",
-                        "description": "VPE Software Version",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_config_template_version"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "17.2"
-                      },
-                      "2017488_pasqualevpe0_AIC_CLLI": {
-                        "type": "string",
-                        "description": "AIC Site CLLI",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "AIC_CLLI"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "ATLMY8GA"
-                      }
-                    },
-                    "volumeGroupAllowed": true
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                    "version": "6",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vPFE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_availability_zone_0": {
-                        "type": "string",
-                        "description": "The Availability Zone to launch the instance.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vPFE_BV",
-                          "paramName": "availability_zone_0"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtpocfo-kvm-az01"
-                      }
-                    },
-                    "volumeGroupAllowed": true
-                  }
-                },
-                "volumeGroups": {
-                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vRE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_bandwidth_units": {
-                        "type": "string",
-                        "description": "Units of bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth_units"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "Gbps"
-                      },
-                      "2017488_pasqualevpe0_bandwidth": {
-                        "type": "string",
-                        "description": "Requested VPE bandwidth",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "bandwidth"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "10"
-                      },
-                      "2017488_pasqualevpe0_vnf_instance_name": {
-                        "type": "string",
-                        "description": "The hostname assigned to the vpe.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_instance_name"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtnj309me6"
-                      },
-                      "2017488_pasqualevpe0_vnf_config_template_version": {
-                        "type": "string",
-                        "description": "VPE Software Version",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "vnf_config_template_version"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "17.2"
-                      },
-                      "2017488_pasqualevpe0_AIC_CLLI": {
-                        "type": "string",
-                        "description": "AIC Site CLLI",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vRE_BV",
-                          "paramName": "AIC_CLLI"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "ATLMY8GA"
-                      }
-                    }
-                  },
-                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "version": "8",
-                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "PASQUALE_vPFE_BV"
-                    },
-                    "inputs": {
-                      "2017488_pasqualevpe0_availability_zone_0": {
-                        "type": "string",
-                        "description": "The Availability Zone to launch the instance.",
-                        "entry_schema": null,
-                        "inputProperties": {
-                          "sourceType": "HEAT",
-                          "vfModuleLabel": "PASQUALE_vPFE_BV",
-                          "paramName": "availability_zone_0"
-                        },
-                        "constraints": null,
-                        "required": true,
-                        "default": "mtpocfo-kvm-az01"
-                      }
-                    }
-                  }
-                },
-                "vfcInstanceGroups": {}
-              }
-            },
-            "networks": {},
-            "collectionResources": {},
-            "configurations": {},
-            "serviceProxies": {},
-            "vfModules": {
-              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vRE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth_units"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "2017488_pasqualevpe0_bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "10"
-                  },
-                  "2017488_pasqualevpe0_vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_instance_name"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtnj309me6"
-                  },
-                  "2017488_pasqualevpe0_vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_config_template_version"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "2017488_pasqualevpe0_AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "AIC_CLLI"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  }
-                },
-                "volumeGroupAllowed": true
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                "version": "6",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vPFE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vPFE_BV",
-                      "paramName": "availability_zone_0"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  }
-                },
-                "volumeGroupAllowed": true
-              }
-            },
-            "volumeGroups": {
-              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vRE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_bandwidth_units": {
-                    "type": "string",
-                    "description": "Units of bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth_units"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "Gbps"
-                  },
-                  "2017488_pasqualevpe0_bandwidth": {
-                    "type": "string",
-                    "description": "Requested VPE bandwidth",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "bandwidth"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "10"
-                  },
-                  "2017488_pasqualevpe0_vnf_instance_name": {
-                    "type": "string",
-                    "description": "The hostname assigned to the vpe.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_instance_name"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtnj309me6"
-                  },
-                  "2017488_pasqualevpe0_vnf_config_template_version": {
-                    "type": "string",
-                    "description": "VPE Software Version",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "vnf_config_template_version"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "17.2"
-                  },
-                  "2017488_pasqualevpe0_AIC_CLLI": {
-                    "type": "string",
-                    "description": "AIC Site CLLI",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vRE_BV",
-                      "paramName": "AIC_CLLI"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "ATLMY8GA"
-                  }
-                }
-              },
-              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "version": "8",
-                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "PASQUALE_vPFE_BV"
-                },
-                "inputs": {
-                  "2017488_pasqualevpe0_availability_zone_0": {
-                    "type": "string",
-                    "description": "The Availability Zone to launch the instance.",
-                    "entry_schema": null,
-                    "inputProperties": {
-                      "sourceType": "HEAT",
-                      "vfModuleLabel": "PASQUALE_vPFE_BV",
-                      "paramName": "availability_zone_0"
-                    },
-                    "constraints": null,
-                    "required": true,
-                    "default": "mtpocfo-kvm-az01"
-                  }
-                }
-              }
-            },
-            "pnfs": {}
-          },
-          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
-            "service": {
-              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-              "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-              "name": "ComplexService",
-              "version": "1.0",
-              "toscaModelURL": null,
-              "category": "Emanuel",
-              "serviceType": "",
-              "serviceRole": "",
-              "description": "ComplexService",
-              "serviceEcompNaming": "true",
-              "instantiationType": "Macro",
-              "vidNotions": {
-                "instantiationType": "Macro"
-              },
-              "inputs": {}
-            },
-            "vnfs": {
-              "VF_vGeraldine 0": {
-                "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
-                "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
-                "description": "VSP_vGeraldine",
-                "name": "VF_vGeraldine",
-                "version": "2.0",
-                "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-egress_src_start_port": "0",
-                  "sctp-a-ipv6-egress_rule_application": "any",
-                  "Internal2_allow_transit": "true",
-                  "sctp-b-IPv6_ethertype": "IPv6",
-                  "sctp-a-egress_rule_application": "any",
-                  "sctp-b-ingress_action": "pass",
-                  "sctp-b-ingress_rule_protocol": "icmp",
-                  "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-ingress-src_start_port": "0.0",
-                  "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "fsb_volume_size_0": "320.0",
-                  "sctp-b-egress_src_addresses": "local",
-                  "sctp-a-ipv6-ingress_ethertype": "IPv4",
-                  "sctp-a-ipv6-ingress-dst_start_port": "0",
-                  "sctp-b-ipv6-ingress_rule_application": "any",
-                  "domain_name": "default-domain",
-                  "sctp-a-ingress_rule_protocol": "icmp",
-                  "sctp-b-egress-src_start_port": "0.0",
-                  "sctp-a-egress_src_addresses": "local",
-                  "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
-                  "sctp-a-egress-src_start_port": "0.0",
-                  "sctp-a-ingress_ethertype": "IPv4",
-                  "sctp-b-ipv6-ingress-dst_end_port": "65535",
-                  "sctp-b-dst_subnet_prefix_v6": "::",
-                  "nf_naming": "{ecomp_generated_naming=true}",
-                  "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
-                  "sctp-b-egress-dst_start_port": "0.0",
-                  "ncb_flavor_name": "nv.c20r64d1",
-                  "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-egress_dst_subnet_prefix_len": "0.0",
-                  "Internal2_net_cidr": "10.0.0.10",
-                  "sctp-a-ingress-dst_start_port": "0.0",
-                  "sctp-a-egress-dst_start_port": "0.0",
-                  "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-egress_ethertype": "IPv4",
-                  "vlc_st_service_mode": "in-network-nat",
-                  "sctp-a-ipv6-egress_ethertype": "IPv4",
-                  "sctp-a-egress-src_end_port": "65535.0",
-                  "sctp-b-ipv6-egress_rule_application": "any",
-                  "sctp-b-egress_action": "pass",
-                  "sctp-a-ingress-src_subnet_prefix_len": "0.0",
-                  "sctp-b-ipv6-ingress-src_end_port": "65535.0",
-                  "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
-                  "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-ipv6-ingress-src_start_port": "0.0",
-                  "sctp-b-ipv6-egress_ethertype": "IPv4",
-                  "Internal1_net_cidr": "10.0.0.10",
-                  "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
-                  "fsb_flavor_name": "nv.c20r64d1",
-                  "sctp_rule_protocol": "132",
-                  "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
-                  "sctp-a-ipv6-ingress_rule_application": "any",
-                  "ecomp_generated_naming": "true",
-                  "sctp-a-IPv6_ethertype": "IPv6",
-                  "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_virtualization_type": "virtual-machine",
-                  "sctp-b-ingress-dst_start_port": "0.0",
-                  "sctp-b-ingress-dst_end_port": "65535.0",
-                  "sctp-a-ipv6-ingress-src_end_port": "65535.0",
-                  "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
-                  "sctp-b-ingress_rule_application": "any",
-                  "int2_sec_group_name": "int2-sec-group",
-                  "vlc_flavor_name": "nd.c16r64d1",
-                  "sctp-b-ipv6-egress_src_addresses": "local",
-                  "vlc_st_interface_type_int1": "other1",
-                  "sctp-b-egress-src_end_port": "65535.0",
-                  "sctp-a-ipv6-egress-dst_start_port": "0",
-                  "vlc_st_interface_type_int2": "other2",
-                  "sctp-a-ipv6-egress_rule_protocol": "any",
-                  "Internal2_shared": "false",
-                  "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
-                  "Internal2_rpf": "disable",
-                  "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ipv6-egress_src_end_port": "65535",
-                  "sctp-a-ipv6-egress_src_addresses": "local",
-                  "sctp-a-ingress-dst_end_port": "65535.0",
-                  "sctp-a-ipv6-egress_src_end_port": "65535",
-                  "Internal1_forwarding_mode": "l2",
-                  "Internal2_dhcp": "false",
-                  "sctp-a-dst_subnet_prefix_v6": "::",
-                  "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
-                  "vlc_st_interface_type_gtp": "other0",
-                  "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-src_subnet_prefix_v6": "::",
-                  "sctp-a-egress_dst_subnet_prefix_len": "0.0",
-                  "int1_sec_group_name": "int1-sec-group",
-                  "Internal1_dhcp": "false",
-                  "sctp-a-ipv6-egress_dst_end_port": "65535",
-                  "Internal2_forwarding_mode": "l2",
-                  "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
-                  "Internal1_net_cidr_len": "17",
-                  "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "sctp-b-ingress-src_subnet_prefix_len": "0.0",
-                  "sctp-a-ingress_dst_addresses": "local",
-                  "sctp-a-egress_action": "pass",
-                  "fsb_volume_type_0": "SF-Default-SSD",
-                  "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_interface_type_sctp_a": "left",
-                  "vlc_st_interface_type_sctp_b": "right",
-                  "sctp-a-src_subnet_prefix_v6": "::",
-                  "vlc_st_version": "2",
-                  "sctp-b-egress_ethertype": "IPv4",
-                  "sctp-a-ingress_rule_application": "any",
-                  "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "instance_ip_family_v6": "v6",
-                  "sctp-a-ipv6-egress_src_start_port": "0",
-                  "sctp-b-ingress-src_start_port": "0.0",
-                  "sctp-b-ingress_dst_addresses": "local",
-                  "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_interface_type_oam": "management",
-                  "multi_stage_design": "false",
-                  "oam_sec_group_name": "oam-sec-group",
-                  "Internal2_net_gateway": "10.0.0.10",
-                  "sctp-a-ipv6-ingress-dst_end_port": "65535",
-                  "sctp-b-ipv6-egress-dst_start_port": "0",
-                  "Internal1_net_gateway": "10.0.0.10",
-                  "sctp-b-ipv6-egress_rule_protocol": "any",
-                  "gtp_sec_group_name": "gtp-sec-group",
-                  "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
-                  "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
-                  "sctp-a-ipv6-ingress_dst_addresses": "local",
-                  "sctp-a-egress_rule_protocol": "icmp",
-                  "sctp-b-ipv6-egress_action": "pass",
-                  "sctp-a-ipv6-egress_action": "pass",
-                  "Internal1_shared": "false",
-                  "sctp-b-ipv6-ingress_rule_protocol": "any",
-                  "Internal2_net_cidr_len": "17",
-                  "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
-                  "sctp-a-ingress-src_end_port": "65535.0",
-                  "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-egress-dst_end_port": "65535.0",
-                  "sctp-a-ingress_action": "pass",
-                  "sctp-b-egress_rule_protocol": "icmp",
-                  "sctp-b-ipv6-ingress_action": "pass",
-                  "vlc_st_service_type": "firewall",
-                  "sctp-b-ipv6-egress_dst_end_port": "65535",
-                  "sctp-b-ipv6-ingress-dst_start_port": "0",
-                  "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "vlc_st_availability_zone": "true",
-                  "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
-                  "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
-                  "Internal1_allow_transit": "true",
-                  "gpb_flavor_name": "nv.c20r64d1",
-                  "availability_zone_max_count": "1",
-                  "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
-                  "sctp-b-ipv6-ingress_dst_addresses": "local",
-                  "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
-                  "sctp-b-ipv6-ingress_ethertype": "IPv4",
-                  "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
-                  "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
-                  "sctp-a-ipv6-ingress_action": "pass",
-                  "Internal1_rpf": "disable",
-                  "sctp-b-ingress_ethertype": "IPv4",
-                  "sctp-b-egress_rule_application": "any",
-                  "sctp-b-ingress-src_end_port": "65535.0",
-                  "sctp-a-ipv6-ingress_rule_protocol": "any",
-                  "sctp-a-ingress-src_start_port": "0.0",
-                  "sctp-b-egress-dst_end_port": "65535.0"
-                },
-                "type": "VF",
-                "modelCustomizationName": "VF_vGeraldine 0",
-                "vfModules": {
-                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
-                    "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                    "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
-                    "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
-                    "description": null,
-                    "name": "VfVgeraldine..vflorence_vlc..module-1",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "vflorence_vlc"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
-                    "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
-                    "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
-                    "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
-                    "description": null,
-                    "name": "VfVgeraldine..vflorence_gpb..module-2",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
-                    "properties": {
-                      "minCountInstances": 0,
-                      "maxCountInstances": null,
-                      "initialCount": 0,
-                      "vfModuleLabel": "vflorence_gpb"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": false
-                  },
-                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                    "description": null,
-                    "name": "VfVgeraldine..base_vflorence..module-0",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "base_vflorence"
-                    },
-                    "inputs": {},
-                    "volumeGroupAllowed": true
-                  }
-                },
-                "volumeGroups": {
-                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                    "description": null,
-                    "name": "VfVgeraldine..base_vflorence..module-0",
-                    "version": "2",
-                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                    "properties": {
-                      "minCountInstances": 1,
-                      "maxCountInstances": 1,
-                      "initialCount": 1,
-                      "vfModuleLabel": "base_vflorence"
-                    },
-                    "inputs": {}
-                  }
-                },
-                "vfcInstanceGroups": {}
-              }
-            },
-            "networks": {
-              "ExtVL 0": {
-                "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
-                "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
-                "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
-                "name": "ExtVL",
-                "version": "37.0",
-                "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
-                  "exVL_naming": "{ecomp_generated_naming=true}",
-                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
-                  "network_homing": "{ecomp_selected_instance_node_target=false}"
-                },
-                "type": "VL",
-                "modelCustomizationName": "ExtVL 0"
-              }
-            },
-            "collectionResources": {},
-            "configurations": {
-              "Port Mirroring Configuration By Policy 0": {
-                "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
-                "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
-                "description": "A port mirroring configuration by policy object",
-                "name": "Port Mirroring Configuration By Policy",
-                "version": "27.0",
-                "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
-                "inputs": {},
-                "commands": {},
-                "properties": {},
-                "type": "Configuration",
-                "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
-                "sourceNodes": [],
-                "collectorNodes": null,
-                "configurationByPolicy": false
-              }
-            },
-            "serviceProxies": {},
-            "vfModules": {
-              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
-                "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
-                "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
-                "description": null,
-                "name": "VfVgeraldine..vflorence_vlc..module-1",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "vflorence_vlc"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
-                "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
-                "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
-                "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
-                "description": null,
-                "name": "VfVgeraldine..vflorence_gpb..module-2",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
-                "properties": {
-                  "minCountInstances": 0,
-                  "maxCountInstances": null,
-                  "initialCount": 0,
-                  "vfModuleLabel": "vflorence_gpb"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": false
-              },
-              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                "description": null,
-                "name": "VfVgeraldine..base_vflorence..module-0",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "base_vflorence"
-                },
-                "inputs": {},
-                "volumeGroupAllowed": true
-              }
-            },
-            "volumeGroups": {
-              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
-                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
-                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
-                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
-                "description": null,
-                "name": "VfVgeraldine..base_vflorence..module-0",
-                "version": "2",
-                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
-                "properties": {
-                  "minCountInstances": 1,
-                  "maxCountInstances": 1,
-                  "initialCount": 1,
-                  "vfModuleLabel": "base_vflorence"
-                },
-                "inputs": {}
-              }
-            },
-            "pnfs": {}
-          }
-        },
-        "serviceInstance": {
-          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
-            "vnfs": {
-              "2017-488_PASQUALE-vPE 0": {
-                "rollbackOnFailure": "true",
-                "vfModules": {
-                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
-                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
-                      "isMissingData": true,
-                      "sdncPreReload": null,
-                      "modelInfo": {
-                        "modelType": "VFmodule",
-                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
-                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
-                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
-                        "modelVersion": "6",
-                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
-                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
-                      },
-                      "instanceParams": [
-                        {}
-                      ],
-                      "trackById": "n2ydptuy9lj"
-                    }
-                  }
-                },
-                "isMissingData": false,
-                "originalName": "2017-488_PASQUALE-vPE 0",
-                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-                "lcpCloudRegionId": null,
-                "tenantId": null,
-                "lineOfBusiness": null,
-                "platformName": null,
-                "modelInfo": {
-                  "modelType": "VF",
-                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
-                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-                  "modelName": "2017-488_PASQUALE-vPE",
-                  "modelVersion": "9.0",
-                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
-                },
-                "trackById": "iapflwk8bip"
-              }
-            },
-            "instanceParams": [
-              {
-                "2017488_pasqualevpe0_ASN": "AV_vPE"
-              }
-            ],
-            "validationCounter": 1,
-            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "AAIAIC25",
-            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
-            "aicZoneId": "JAG1",
-            "projectName": "x1",
-            "owningEntityId": "aaa1",
-            "rollbackOnFailure": "true",
-            "bulkSize": 1,
-            "modelInfo": {
-              "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
-              "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
-              "modelName": "PASQUALE vMX vPE_BV Service 488",
-              "modelVersion": "1.0"
-            },
-            "existingVNFCounterMap": {
-              "41516cc6-5098-4b40-a619-f8d5f55fc4d8": 1
-            },
-            "existingNetworksCounterMap": {},
-            "tenantName": "USP-SIP-IC-24335-T-01",
-            "aicZoneName": "YUDFJULP-JAG1"
-          }
-        },
-        "lcpRegionsAndTenants": {
-          "lcpRegionList": [
-            {
-              "id": "AAIAIC25",
-              "name": "AAIAIC25",
-              "isPermitted": true
-            },
-            {
-              "id": "hvf6",
-              "name": "hvf6",
-              "isPermitted": true
-            }
-          ],
-          "lcpRegionsTenantsMap": {
-            "AAIAIC25": [
-              {
-                "id": "092eb9e8e4b7412e8787dd091bc58e86",
-                "name": "USP-SIP-IC-24335-T-01",
-                "isPermitted": true
-              }
-            ],
-            "hvf6": [
-              {
-                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
-                "name": "AIN Web Tool-15-D-testalexandria",
-                "isPermitted": true
-              },
-              {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
-                "isPermitted": true
-              },
-              {
-                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
-                "name": "ro-T112",
-                "isPermitted": true
-              },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
-              {
-                "id": "cbb99fe4ada84631b7baf046b6fd2044",
-                "name": "DN5242-Nov16-T3",
-                "isPermitted": true
-              }
-            ]
-          }
-        },
-        "subscribers": [
-          {
-            "id": "CAR_2020_ER",
-            "name": "CAR_2020_ER",
-            "isPermitted": true
-          },
-          {
-            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
-            "name": "JULIO ERICKSON",
-            "isPermitted": false
-          },
-          {
-            "id": "DHV1707-TestSubscriber-2",
-            "name": "DALE BRIDGES",
-            "isPermitted": false
-          },
-          {
-            "id": "DHV1707-TestSubscriber-1",
-            "name": "LLOYD BRIDGES",
-            "isPermitted": false
-          },
-          {
-            "id": "jimmy-example",
-            "name": "JimmyExampleCust-20161102",
-            "isPermitted": false
-          },
-          {
-            "id": "jimmy-example2",
-            "name": "JimmyExampleCust-20161103",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-102",
-            "name": "ERICA5779-TestSub-PWT-102",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-101",
-            "name": "ERICA5779-TestSub-PWT-101",
-            "isPermitted": false
-          },
-          {
-            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "name": "Emanuel",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-Subscriber-4",
-            "name": "ERICA5779-Subscriber-5",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-TestSub-PWT-103",
-            "name": "ERICA5779-TestSub-PWT-103",
-            "isPermitted": false
-          },
-          {
-            "id": "ERICA5779-Subscriber-2",
-            "name": "ERICA5779-Subscriber-2",
-            "isPermitted": false
-          },
-          {
-            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "name": "SILVIA ROBBINS",
-            "isPermitted": true
-          },
-          {
-            "id": "ERICA5779-Subscriber-3",
-            "name": "ERICA5779-Subscriber-3",
-            "isPermitted": false
-          },
-          {
-            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
-            "name": "CRAIG/ROBERTS",
-            "isPermitted": false
-          }
-        ],
-        "productFamilies": [
-          {
-            "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-            "name": "ERICA",
-            "isPermitted": true
-          },
-          {
-            "id": "17cc1042-527b-11e6-beb8-9e71128cae77",
-            "name": "IGNACIO",
-            "isPermitted": true
-          },
-          {
-            "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
-            "name": "Christie",
-            "isPermitted": true
-          },
-          {
-            "id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7",
-            "name": "Enhanced Services",
-            "isPermitted": true
-          },
-          {
-            "id": "vTerrance",
-            "name": "vTerrance",
-            "isPermitted": true
-          },
-          {
-            "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
-            "name": "vEsmeralda",
-            "isPermitted": true
-          },
-          {
-            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "name": "Emanuel",
-            "isPermitted": true
-          },
-          {
-            "id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
-            "name": "BVOIP",
-            "isPermitted": true
-          },
-          {
-            "id": "db171b8f-115c-4992-a2e3-ee04cae357e0",
-            "name": "LINDSEY",
-            "isPermitted": true
-          },
-          {
-            "id": "LRSI-OSPF",
-            "name": "LRSI-OSPF",
-            "isPermitted": true
-          },
-          {
-            "id": "vRosemarie",
-            "name": "HNGATEWAY",
-            "isPermitted": true
-          },
-          {
-            "id": "vHNPaas",
-            "name": "WILKINS",
-            "isPermitted": true
-          },
-          {
-            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "name": "TYLER SILVIA",
-            "isPermitted": true
-          },
-          {
-            "id": "b6a3f28c-eebf-494c-a900-055cc7c874ce",
-            "name": "VROUTER",
-            "isPermitted": true
-          },
-          {
-            "id": "vMuriel",
-            "name": "vMuriel",
-            "isPermitted": true
-          },
-          {
-            "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1",
-            "name": "CARA Griffin",
-            "isPermitted": true
-          },
-          {
-            "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
-            "name": "DARREN MCGEE",
-            "isPermitted": true
-          },
-          {
-            "id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1",
-            "name": "Transport",
-            "isPermitted": true
-          },
-          {
-            "id": "vSalvatore",
-            "name": "vSalvatore",
-            "isPermitted": true
-          },
-          {
-            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "JOSEFINA",
-            "isPermitted": true
-          },
-          {
-            "id": "vHubbard",
-            "name": "vHubbard",
-            "isPermitted": true
-          },
-          {
-            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
-            "name": "DARREN MCGEE",
-            "isPermitted": true
-          }
-        ],
-        "serviceTypes": {
-          "e433710f-9217-458d-a79d-1c7aff376d89": [
-            {
-              "id": "0",
-              "name": "vRichardson",
-              "isPermitted": false
-            },
-            {
-              "id": "1",
-              "name": "TYLER SILVIA",
-              "isPermitted": true
-            },
-            {
-              "id": "2",
-              "name": "Emanuel",
-              "isPermitted": false
-            },
-            {
-              "id": "3",
-              "name": "vJamie",
-              "isPermitted": false
-            },
-            {
-              "id": "4",
-              "name": "vVoiceMail",
-              "isPermitted": false
-            },
-            {
-              "id": "5",
-              "name": "Kennedy",
-              "isPermitted": false
-            },
-            {
-              "id": "6",
-              "name": "vPorfirio",
-              "isPermitted": false
-            },
-            {
-              "id": "7",
-              "name": "vVM",
-              "isPermitted": false
-            },
-            {
-              "id": "8",
-              "name": "vOTA",
-              "isPermitted": false
-            },
-            {
-              "id": "9",
-              "name": "vFLORENCE",
-              "isPermitted": false
-            },
-            {
-              "id": "10",
-              "name": "vMNS",
-              "isPermitted": false
-            },
-            {
-              "id": "11",
-              "name": "vEsmeralda",
-              "isPermitted": false
-            },
-            {
-              "id": "12",
-              "name": "VPMS",
-              "isPermitted": false
-            },
-            {
-              "id": "13",
-              "name": "vWINIFRED",
-              "isPermitted": false
-            },
-            {
-              "id": "14",
-              "name": "SSD",
-              "isPermitted": false
-            },
-            {
-              "id": "15",
-              "name": "vMOG",
-              "isPermitted": false
-            },
-            {
-              "id": "16",
-              "name": "LINDSEY",
-              "isPermitted": false
-            },
-            {
-              "id": "17",
-              "name": "JOHANNA_SANTOS",
-              "isPermitted": false
-            },
-            {
-              "id": "18",
-              "name": "vCarroll",
-              "isPermitted": false
-            }
-          ]
-        },
-        "aicZones": [
-          {
-            "id": "NFT1",
-            "name": "NFTJSSSS-NFT1"
-          },
-          {
-            "id": "JAG1",
-            "name": "YUDFJULP-JAG1"
-          },
-          {
-            "id": "YYY1",
-            "name": "UUUAIAAI-YYY1"
-          },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
-          {
-            "id": "AVT1",
-            "name": "AVTRFLHD-AVT1"
-          },
-          {
-            "id": "ATL34",
-            "name": "ATLSANAI-ATL34"
-          }
-        ],
-        "categoryParameters": {
-          "owningEntityList": [
-            {
-              "id": "aaa1",
-              "name": "aaa1"
-            },
-            {
-              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
-              "name": "WayneHolland"
-            },
-            {
-              "id": "Melissa",
-              "name": "Melissa"
-            }
-          ],
-          "projectList": [
-            {
-              "id": "WATKINS",
-              "name": "WATKINS"
-            },
-            {
-              "id": "x1",
-              "name": "x1"
-            },
-            {
-              "id": "yyy1",
-              "name": "yyy1"
-            }
-          ],
-          "lineOfBusinessList": [
-            {
-              "id": "ONAP",
-              "name": "ONAP"
-            },
-            {
-              "id": "zzz1",
-              "name": "zzz1"
-            }
-          ],
-          "platformList": [
-            {
-              "id": "platform",
-              "name": "platform"
-            },
-            {
-              "id": "xxx1",
-              "name": "xxx1"
-            }
-          ]
-        },
-        "type": "[LCP_REGIONS_AND_TENANTS] Update"
-      }
-    }
-  }
-
-  function getReduxWith2Networks() {
-    return {
-      "global": {
-        "name": null,
-        "type": "UPDATE_DRAWING_BOARD_STATUS",
-        "flags": {
-          "CREATE_INSTANCE_TEST": false,
-          "EMPTY_DRAWING_BOARD_TEST": false,
-          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
-          "FLAG_SERVICE_MODEL_CACHE": true,
-          "FLAG_SHOW_ASSIGNMENTS": true,
-          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_DEFAULT_VNF": true,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
-          "FLAG_A_LA_CARTE_AUDIT_INFO": true,
-          "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
-          "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
-          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false,
-          "FLAG_1902_NEW_VIEW_EDIT": false,
-          "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
-          "FLAG_1902_VNF_GROUPING": false,
-          "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_ASYNC_ALACARTE_VFMODULE": true,
-          "FLAG_ASYNC_ALACARTE_VNF": true,
-          "FLAG_1810_AAI_LOCAL_CACHE": true,
-          "FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER": false,
-          "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": false,
-          "FLAG_SUPPLEMENTARY_FILE": true,
-          "FLAG_5G_IN_NEW_INSTANTIATION_UI": true,
-          "FLAG_RESTRICTED_SELECT": false,
-          "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY": true
-        },
-        "drawingBoardStatus": "CREATE"
-      },
-      "service": {
-        "serviceHierarchy": {
-          "2ab1da67-39cc-425f-ba52-59a64d0ea04a": {
-            "service": {
-              "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
-              "invariantUuid": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
-              "name": "sgi_direct_net NC SRIOV network",
-              "version": "1.0",
-              "toscaModelURL": null,
-              "category": "Network Service",
-              "serviceType": "INFRASTRUCTURE",
-              "serviceRole": "PROVIDER-NETWORK",
-              "description": "SRIOV network model for NC 1.0, VLAN ID 103",
-              "serviceEcompNaming": "false",
-              "instantiationType": "A-La-Carte",
-              "inputs": {},
-              "vidNotions": {
-                "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
-                "modelCategory": "5G Provider Network",
-                "viewEditUI": "legacy",
-                "instantiationType": "ALaCarte"
-              }
-            },
-            "vnfs": {},
-            "networks": {
-              "SR-IOV Provider 2-1": {
-                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
-                "invariantUuid": "ffb9e45c-e674-4289-aad3-00040ad746e4",
-                "description": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                "name": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                "version": "1.0",
-                "customizationUuid": "42551d11-b8d1-460d-8795-3e1363ad7736",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "network_role": "sgi_direct_net_1",
-                  "network_assignments": "{is_external_network=false, is_shared_network=true, is_trunked=false, ipv4_subnet_default_assignment={dhcp_enabled=false, ip_version=4, min_subnets_count=1, use_ipv4=true}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={dhcp_enabled=false, use_ipv6=true, ip_version=6, min_subnets_count=1}, related_networks=[{related_network_role=sgi_direct_net_1_tenant}]}",
-                  "exVL_naming": "{ecomp_generated_naming=false}",
-                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
-                  "network_scope": "GLOBAL",
-                  "ecomp_generated_naming": "false",
-                  "network_type": "SR-IOV-PROVIDER2-1",
-                  "provider_network": "{physical_network_name=sriovnet1, is_provider_network=true}",
-                  "network_technology": "STANDARD-SR-IOV",
-                  "network_homing": "{ecomp_selected_instance_node_target=false}"
-                },
-                "type": "VL",
-                "modelCustomizationName": "SR-IOV Provider 2-1"
-              },
-              "SR-IOV Provider 2-2": {
-                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
-                "invariantUuid": "ffb9e45c-e674-4289-aad3-00040ad746e4",
-                "description": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                "name": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                "version": "1.0",
-                "customizationUuid": "14d2dc2b-4e85-4ef5-b4da-fe996e2a5d33",
-                "inputs": {},
-                "commands": {},
-                "properties": {
-                  "network_role": "sgi_direct_net_2",
-                  "network_assignments": "{is_external_network=false, is_shared_network=true, is_trunked=false, ipv4_subnet_default_assignment={dhcp_enabled=false, ip_version=4, min_subnets_count=1, use_ipv4=true}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={dhcp_enabled=false, use_ipv6=true, ip_version=6, min_subnets_count=1}, related_networks=[{related_network_role=sgi_direct_net_2_tenant}]}",
-                  "exVL_naming": "{ecomp_generated_naming=false}",
-                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
-                  "network_scope": "GLOBAL",
-                  "ecomp_generated_naming": "false",
-                  "network_type": "SR-IOV-PROVIDER2-2",
-                  "provider_network": "{physical_network_name=sriovnet2, is_provider_network=true}",
-                  "network_technology": "STANDARD-SR-IOV",
-                  "network_homing": "{ecomp_selected_instance_node_target=false}"
-                },
-                "type": "VL",
-                "modelCustomizationName": "SR-IOV Provider 2-2"
-              }
-            },
-            "collectionResources": {},
-            "configurations": {},
-            "fabricConfigurations": {},
-            "serviceProxies": {},
-            "vfModules": {},
-            "volumeGroups": {},
-            "pnfs": {},
-            "vnfGroups": {}
-          }
-        },
-        "serviceInstance": {
-          "2ab1da67-39cc-425f-ba52-59a64d0ea04a": {
-            "action": "Create",
-            "isDirty": false,
-            "vnfs": {},
-            "instanceParams": [
-              {}
-            ],
-            "validationCounter": 0,
-            "existingNames": {
-              "myname": ""
-            },
-            "existingVNFCounterMap": {},
-            "existingVnfGroupCounterMap": {},
-            "existingNetworksCounterMap": {
-              "01f4c475-3f89-4f00-a2f4-39a873dba0ae": 1
-            },
-            "optionalGroupMembersMap": {},
-            "networks": {
-              "SR-IOV Provider 2-2": {
-                "action": "Create",
-                "inMaint": false,
-                "rollbackOnFailure": "true",
-                "originalName": "SR-IOV Provider 2-2",
-                "isMissingData": false,
-                "trackById": "83ad9rv48px",
-                "networkStoreKey": "SR-IOV Provider 2-2",
-                "instanceName": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                "productFamilyId": null,
-                "lcpCloudRegionId": "olson5b",
-                "tenantId": "db1818f7f2e34862b378bfb2cc520f91",
-                "platformName": "APPLICATIONS-SERVICES",
-                "lineOfBusiness": null,
-                "instanceParams": [
-                  {}
-                ],
-                "modelInfo": {
-                  "modelInvariantId": "ffb9e45c-e674-4289-aad3-00040ad746e4",
-                  "modelVersionId": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
-                  "modelName": "NETWORK_CLOUD_PROVIDER_NETWORK",
-                  "modelVersion": "1.0",
-                  "modelCustomizationId": "14d2dc2b-4e85-4ef5-b4da-fe996e2a5d33",
-                  "modelCustomizationName": "SR-IOV Provider 2-2",
-                  "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae"
-                },
-                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae"
-              }
-            },
-            "vnfGroups": {},
-            "bulkSize": 1,
-            "instanceName": "myname",
-            "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "subscriptionServiceType": "LINDSEY",
-            "owningEntityId": "2d097967-10d4-4c7f-b23c-89978249ae17",
-            "projectName": null,
-            "rollbackOnFailure": "true",
-            "aicZoneName": null,
-            "owningEntityName": "CRAIG-ROBERTSELLANEOUS",
-            "testApi": "VNF_API",
-            "tenantName": null,
-            "modelInfo": {
-              "modelInvariantId": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
-              "modelVersionId": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
-              "modelName": "sgi_direct_net NC SRIOV network",
-              "modelVersion": "1.0",
-              "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a"
-            },
-            "isALaCarte": true,
-            "name": "sgi_direct_net NC SRIOV network",
-            "version": "1.0",
-            "description": "SRIOV network model for NC 1.0, VLAN ID 103",
-            "category": "Network Service",
-            "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
-            "invariantUuid": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
-            "serviceType": "INFRASTRUCTURE",
-            "serviceRole": "PROVIDER-NETWORK",
-            "vidNotions": {
-              "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
-              "modelCategory": "5G Provider Network",
-              "viewEditUI": "legacy"
-            },
-            "isEcompGeneratedNaming": false,
-            "isMultiStepDesign": false
-          }
-        },
-        "lcpRegionsAndTenants": {
-          "lcpRegionList": [
-            {
-              "id": "olson5a",
-              "name": "olson5a (AIC)",
-              "isPermitted": true,
-              "cloudOwner": "irma-aic"
-            },
-            {
-              "id": "olson5b",
-              "name": "olson5b (AIC)",
-              "isPermitted": true,
-              "cloudOwner": "irma-aic"
-            },
-            {
-              "id": "olson6a",
-              "name": "olson6a (AIC)",
-              "isPermitted": true,
-              "cloudOwner": "irma-aic"
-            }
-          ],
-          "lcpRegionsTenantsMap": {
-            "olson5a": [
-              {
-                "id": "51e7dc5db9bb4c7b94766aacb8a3e72f",
-                "name": "Mobitools-FN-27099-T-01",
-                "isPermitted": true,
-                "cloudOwner": "irma-aic"
-              },
-              {
-                "id": "d5b3c05cffa645dd9951bf2dd9ef5416",
-                "name": "Mobisupport-FN-27099-T-01",
-                "isPermitted": true,
-                "cloudOwner": "irma-aic"
-              }
-            ],
-            "olson5b": [
-              {
-                "id": "db1818f7f2e34862b378bfb2cc520f91",
-                "name": "Mobisupport-FN-27099-T-02",
-                "isPermitted": true,
-                "cloudOwner": "irma-aic"
-              }
-            ],
-            "olson6a": [
-              {
-                "id": "1dcd712850414fbd91f8a9fc9cca7fd4",
-                "name": "FNvEPC-27099-T-MS-olson6A",
-                "isPermitted": true,
-                "cloudOwner": "irma-aic"
-              },
-              {
-                "id": "26af9ed85a004932822a607d5e9973d5",
-                "name": "ssf-28239-T-olson6A",
-                "isPermitted": true,
-                "cloudOwner": "irma-aic"
-              }
-            ]
-          }
-        },
-        "subscribers": [
-          {
-            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
-            "name": "CRAIG/ROBERTS",
-            "isPermitted": false
-          },
-          {
-            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-            "name": "Emanuel",
-            "isPermitted": true
-          },
-          {
-            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
-            "name": "JULIO ERICKSON",
-            "isPermitted": false
-          },
-          {
-            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "name": "SILVIA ROBBINS",
-            "isPermitted": false
-          },
-          {
-            "id": "VidE2ETest",
-            "name": "VidTest20161020",
-            "isPermitted": false
-          }
-        ],
-        "productFamilies": null,
-        "serviceTypes": {
-          "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb": [
-            {
-              "id": "22",
-              "name": "JOHANNA_SANTOS",
-              "isPermitted": true
-            },
-            {
-              "id": "11",
-              "name": "RAMSEY",
-              "isPermitted": false
-            },
-            {
-              "id": "3",
-              "name": "LINDSEY",
-              "isPermitted": true
-            },
-            {
-              "id": "6",
-              "name": "INFRASTRUCTURE",
-              "isPermitted": false
-            },
-            {
-              "id": "4",
-              "name": "BROOKE-RODRIQUEZ",
-              "isPermitted": false
-            },
-            {
-              "id": "0",
-              "name": "Emanuel",
-              "isPermitted": true
-            },
-            {
-              "id": "15",
-              "name": "Kennedy",
-              "isPermitted": true
-            },
-            {
-              "id": "21",
-              "name": "SSD",
-              "isPermitted": true
-            },
-            {
-              "id": "18",
-              "name": "VPMS",
-              "isPermitted": true
-            },
-            {
-              "id": "1",
-              "name": "vJamie",
-              "isPermitted": true
-            },
-            {
-              "id": "27",
-              "name": "vEPDG",
-              "isPermitted": false
-            },
-            {
-              "id": "23",
-              "name": "vRichardson",
-              "isPermitted": true
-            },
-            {
-              "id": "7",
-              "name": "vGDF",
-              "isPermitted": false
-            },
-            {
-              "id": "2",
-              "name": "vCarroll",
-              "isPermitted": true
-            },
-            {
-              "id": "17",
-              "name": "vMGCF",
-              "isPermitted": false
-            },
-            {
-              "id": "9",
-              "name": "vFLORENCE",
-              "isPermitted": true
-            },
-            {
-              "id": "25",
-              "name": "vWINIFRED",
-              "isPermitted": true
-            },
-            {
-              "id": "8",
-              "name": "vMNS",
-              "isPermitted": true
-            },
-            {
-              "id": "14",
-              "name": "vMOG",
-              "isPermitted": true
-            },
-            {
-              "id": "10",
-              "name": "vOTA",
-              "isPermitted": true
-            },
-            {
-              "id": "16",
-              "name": "vEsmeralda",
-              "isPermitted": true
-            },
-            {
-              "id": "24",
-              "name": "vPorfirio",
-              "isPermitted": true
-            },
-            {
-              "id": "12",
-              "name": "vSILB",
-              "isPermitted": false
-            },
-            {
-              "id": "19",
-              "name": "vSON",
-              "isPermitted": false
-            },
-            {
-              "id": "13",
-              "name": "vSSF",
-              "isPermitted": false
-            },
-            {
-              "id": "26",
-              "name": "vUDR",
-              "isPermitted": false
-            },
-            {
-              "id": "20",
-              "name": "vVM",
-              "isPermitted": true
-            },
-            {
-              "id": "5",
-              "name": "vVoiceMail",
-              "isPermitted": true
-            }
-          ]
-        },
-        "aicZones": null,
-        "categoryParameters": {
-          "owningEntityList": [
-            {
-              "id": "1ae27f5e-c0b3-4daf-8561-b25fc1c716e4",
-              "name": "AIC-ECOMP"
-            },
-            {
-              "id": "2e51ed6c-1fac-43d4-8f84-9ec405eb7f35",
-              "name": "ENTERTAINMENT-VIDEO"
-            },
-            {
-              "id": "2d097967-10d4-4c7f-b23c-89978249ae17",
-              "name": "CRAIG-ROBERTSELLANEOUS"
-            },
-            {
-              "id": "aedf37e2-acda-4976-b89b-fd6d4ddffbc6",
-              "name": "IP-COMMUNICATIONS"
-            },
-            {
-              "id": "9463675f-6a75-4cc8-8054-c6cb2e67ad51",
-              "name": "METRO-JULIO-ERICKSON"
-            },
-            {
-              "id": "92ddf9af-acae-484c-a786-ad7e9c0da26f",
-              "name": "EMANUEL-ACCESS"
-            },
-            {
-              "id": "10c645f5-9924-4b89-bec0-b17cf49d3cad",
-              "name": "EMANUEL-CORE"
-            },
-            {
-              "id": "048eb6e7-fa94-4f3b-ae03-3175a750dc57",
-              "name": "OPTICAL-TRANSPORT"
-            },
-            {
-              "id": "0efc70be-d674-4777-a0fa-329eae187ca0",
-              "name": "JULIO-ERICKSON"
-            },
-            {
-              "id": "0463287b-b133-46ef-a0f5-9ce62be3a053",
-              "name": "PREMISES"
-            },
-            {
-              "id": "ae4505ad-2961-4395-8659-df2253af4fa8",
-              "name": "WIRELINE-ACCESS"
-            }
-          ],
-          "projectList": [
-            {
-              "id": "G.FAST",
-              "name": "G.FAST"
-            },
-            {
-              "id": "GigaPower",
-              "name": "GigaPower"
-            },
-            {
-              "id": "Kennedy",
-              "name": "Kennedy"
-            },
-            {
-              "id": "Trinity",
-              "name": "Trinity"
-            },
-            {
-              "id": "USP",
-              "name": "USP"
-            }
-          ],
-          "lineOfBusinessList": [
-            {
-              "id": "",
-              "name": ""
-            },
-            {
-              "id": "ADI",
-              "name": "ADI"
-            },
-            {
-              "id": "ADIG",
-              "name": "ADIG"
-            },
-            {
-              "id": "PASQUALE",
-              "name": "PASQUALE"
-            },
-            {
-              "id": "AT&TLEGACYDATASERVICES",
-              "name": "AT&TLEGACYDATASERVICES"
-            },
-            {
-              "id": "AT&TSWITCHEDETHERNET",
-              "name": "AT&TSWITCHEDETHERNET"
-            },
-            {
-              "id": "AVPN",
-              "name": "AVPN"
-            },
-            {
-              "id": "AVPN-MOW",
-              "name": "AVPN-MOW"
-            },
-            {
-              "id": "CALEA",
-              "name": "CALEA"
-            },
-            {
-              "id": "COLLABORATE",
-              "name": "COLLABORATE"
-            },
-            {
-              "id": "DIRECT-TV",
-              "name": "DIRECT-TV"
-            },
-            {
-              "id": "LINDSEY",
-              "name": "LINDSEY"
-            },
-            {
-              "id": "FLEXWARE",
-              "name": "FLEXWARE"
-            },
-            {
-              "id": "INFRASTRUCTURE",
-              "name": "INFRASTRUCTURE"
-            },
-            {
-              "id": "IOT",
-              "name": "IOT"
-            },
-            {
-              "id": "IP-FLEXIBLE-REACH",
-              "name": "IP-FLEXIBLE-REACH"
-            },
-            {
-              "id": "IP-TOLL-FREE",
-              "name": "IP-TOLL-FREE"
-            },
-            {
-              "id": "EMANUEL-ABS",
-              "name": "EMANUEL-ABS"
-            },
-            {
-              "id": "EMANUEL-CONSUMER",
-              "name": "EMANUEL-CONSUMER"
-            },
-            {
-              "id": "EMANUEL-RESELLER",
-              "name": "EMANUEL-RESELLER"
-            },
-            {
-              "id": "NETBOND",
-              "name": "NETBOND"
-            },
-            {
-              "id": "SD-WAN",
-              "name": "SD-WAN"
-            },
-            {
-              "id": "UVERSE",
-              "name": "UVERSE"
-            },
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
+        "categoryParameters": {
+          "owningEntityList": [
             {
-              "id": "UVERSE-VOICE",
-              "name": "UVERSE-VOICE"
+              "id": "aaa1",
+              "name": "aaa1"
             },
             {
-              "id": "VIRTUAL-EDGE",
-              "name": "VIRTUAL-EDGE"
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
             },
             {
-              "id": "VOLTE",
-              "name": "VOLTE"
+              "id": "Melissa",
+              "name": "Melissa"
             }
           ],
-          "platformList": [
-            {
-              "id": "3rdPartyCloud",
-              "name": "3rdPartyCloud"
-            },
-            {
-              "id": "ACCESS",
-              "name": "ACCESS"
-            },
-            {
-              "id": "AIC",
-              "name": "AIC"
-            },
-            {
-              "id": "APPLICATIONS-SERVICES",
-              "name": "APPLICATIONS-SERVICES"
-            },
-            {
-              "id": "BVOIP",
-              "name": "BVOIP"
-            },
-            {
-              "id": "CALEA-DEDICATED",
-              "name": "CALEA-DEDICATED"
-            },
-            {
-              "id": "CBB-MPLS-CORE",
-              "name": "CBB-MPLS-CORE"
-            },
-            {
-              "id": "D1",
-              "name": "D1"
-            },
+          "projectList": [
             {
-              "id": "D1.5",
-              "name": "D1.5"
+              "id": "WATKINS",
+              "name": "WATKINS"
             },
             {
-              "id": "EPC",
-              "name": "EPC"
+              "id": "x1",
+              "name": "x1"
             },
             {
-              "id": "FIRSTNET-DEDICATED",
-              "name": "FIRSTNET-DEDICATED"
-            },
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
             {
-              "id": "IMS-USP",
-              "name": "IMS-USP"
+              "id": "ONAP",
+              "name": "ONAP"
             },
             {
-              "id": "IPAG",
-              "name": "IPAG"
-            },
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
             {
-              "id": "MNS",
-              "name": "MNS"
+              "id": "platform",
+              "name": "platform"
             },
             {
-              "id": "NETWORK-CLOUD",
-              "name": "NETWORK-CLOUD"
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "[CATEGORY_PARAMETERS] Update"
+      }
+    }
+  }
+
+  function getReduxWithVNFMissingData() {
+    return {
+      "global": {
+        "name": null,
+        "flags": {
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_SHOW_VERIFY_SERVICE": false,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "CREATE_INSTANCE_TEST": false,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true
+        },
+        "type": "[FLAGS] Update"
+      },
+      "service": {
+        "serviceHierarchy": {
+          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
+            "service": {
+              "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+              "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "name": "PASQUALE vMX vPE_BV Service 488",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Network L1-3",
+              "serviceType": "",
+              "serviceRole": "",
+              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
+              "inputs": {
+                "2017488_pasqualevpe0_ASN": {
+                  "type": "string",
+                  "description": "AV/PE",
+                  "entry_schema": null,
+                  "inputProperties": null,
+                  "constraints": [],
+                  "required": true,
+                  "default": "AV_vPE"
+                }
+              }
             },
-            {
-              "id": "RADIO-WIRELESSENGINEERING",
-              "name": "RADIO-WIRELESSENGINEERING"
+            "vnfs": {
+              "2017-488_PASQUALE-vPE 0": {
+                "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
+                "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
+                "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": {
+                  "vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "10"
+                  },
+                  "AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  },
+                  "availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  },
+                  "ASN": {
+                    "type": "string",
+                    "description": "AV/PE",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "AV_vPE"
+                  },
+                  "vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "mtnj309me6"
+                  }
+                },
+                "commands": {
+                  "vnf_config_template_version": {
+                    "displayName": "vnf_config_template_version",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
+                  },
+                  "bandwidth_units": {
+                    "displayName": "bandwidth_units",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
+                  },
+                  "bandwidth": {
+                    "displayName": "bandwidth",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_bandwidth"
+                  },
+                  "AIC_CLLI": {
+                    "displayName": "AIC_CLLI",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
+                  },
+                  "availability_zone_0": {
+                    "displayName": "availability_zone_0",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
+                  },
+                  "ASN": {
+                    "displayName": "ASN",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_ASN"
+                  },
+                  "vnf_instance_name": {
+                    "displayName": "vnf_instance_name",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
+                  }
+                },
+                "properties": {
+                  "vmxvre_retype": "RE-VMX",
+                  "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": "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": "10.0.0.10",
+                  "is_AVPN_service": "false",
+                  "vmx_RSG_name": "vREXI-affinity",
+                  "vmx_int_ctl_forwarding": "l2",
+                  "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",
+                  "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
+                  "vmxvre_image_name_0": "vre172_nova_img",
+                  "vmxvre_instance": "0",
+                  "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
+                  "vmxvre_flavor_name": "ns.c1r16d32.v5",
+                  "vmxvpfe_volume_size_0": "40.0",
+                  "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
+                  "nf_naming": "{ecomp_generated_naming=true}",
+                  "multi_stage_design": "false",
+                  "nf_naming_code": "me6",
+                  "vmxvre_name_0": "vREXI",
+                  "vmxvpfe_sriov42_0_port_vlanstrip": "false",
+                  "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
+                  "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
+                  "vmxvpfe_image_name_0": "vpfe172_nova_img",
+                  "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
+                  "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
+                  "vmxvre_console": "vidconsole",
+                  "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
+                  "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
+                  "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
+                  "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
+                  "vmxvpfe_sriov44_0_port_vlanstrip": "false",
+                  "vf_module_id": "123",
+                  "nf_function": "PASQUALE vPE",
+                  "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
+                  "vmxvre_int_ctl_ip_0": "10.0.0.10",
+                  "ecomp_generated_naming": "true",
+                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
+                  "vnf_name": "mtnj309me6vre",
+                  "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
+                  "vmxvre_volume_type_1": "HITACHI",
+                  "vmxvpfe_sriov44_0_port_broadcastallow": "true",
+                  "vmxvre_volume_type_0": "HITACHI",
+                  "vmxvpfe_volume_type_0": "HITACHI",
+                  "vmxvpfe_sriov43_0_port_broadcastallow": "true",
+                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
+                  "vnf_id": "123",
+                  "vmxvre_oam_prefix": "24",
+                  "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_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.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_pasqualevpe0_vnf_instance_name",
+                  "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
+                  "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
+                  "vmx_int_ctl_len": "24",
+                  "vmxvpfe_sriov43_0_port_vlanstrip": "false",
+                  "vmxvpfe_sriov41_0_port_broadcastallow": "true",
+                  "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
+                  "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
+                  "nf_role": "vPE",
+                  "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
+                  "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
+                  "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
+                },
+                "type": "VF",
+                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+                "vfModules": {
+                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "properties": {
+                      "minCountInstances": 2,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
+                        "type": "string",
+                        "description": "Units of bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth_units"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "Gbps"
+                      },
+                      "2017488_pasqualevpe0_bandwidth": {
+                        "type": "string",
+                        "description": "Requested VPE bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "10"
+                      },
+                      "2017488_pasqualevpe0_vnf_instance_name": {
+                        "type": "string",
+                        "description": "The hostname assigned to the vpe.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_instance_name"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtnj309me6"
+                      },
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
+                        "type": "string",
+                        "description": "VPE Software Version",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_config_template_version"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "17.2"
+                      },
+                      "2017488_pasqualevpe0_AIC_CLLI": {
+                        "type": "string",
+                        "description": "AIC Site CLLI",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "AIC_CLLI"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "ATLMY8GA"
+                      }
+                    },
+                    "volumeGroupAllowed": true
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                    "version": "6",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
+                        "type": "string",
+                        "description": "The Availability Zone to launch the instance.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
+                          "paramName": "availability_zone_0"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtpocfo-kvm-az01"
+                      }
+                    },
+                    "volumeGroupAllowed": true
+                  }
+                },
+                "volumeGroups": {
+                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
+                        "type": "string",
+                        "description": "Units of bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth_units"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "Gbps"
+                      },
+                      "2017488_pasqualevpe0_bandwidth": {
+                        "type": "string",
+                        "description": "Requested VPE bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "10"
+                      },
+                      "2017488_pasqualevpe0_vnf_instance_name": {
+                        "type": "string",
+                        "description": "The hostname assigned to the vpe.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_instance_name"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtnj309me6"
+                      },
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
+                        "type": "string",
+                        "description": "VPE Software Version",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_config_template_version"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "17.2"
+                      },
+                      "2017488_pasqualevpe0_AIC_CLLI": {
+                        "type": "string",
+                        "description": "AIC Site CLLI",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "AIC_CLLI"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "ATLMY8GA"
+                      }
+                    }
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
+                        "type": "string",
+                        "description": "The Availability Zone to launch the instance.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
+                          "paramName": "availability_zone_0"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtpocfo-kvm-az01"
+                      }
+                    }
+                  }
+                },
+                "vfcInstanceGroups": {}
+              }
             },
-            {
-              "id": "RAN",
-              "name": "RAN"
+            "networks": {},
+            "collectionResources": {},
+            "configurations": {},
+            "serviceProxies": {},
+            "vfModules": {
+              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth_units"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "2017488_pasqualevpe0_bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "10"
+                  },
+                  "2017488_pasqualevpe0_vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_instance_name"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtnj309me6"
+                  },
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_config_template_version"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "2017488_pasqualevpe0_AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "AIC_CLLI"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  }
+                },
+                "volumeGroupAllowed": true
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                "version": "6",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
+                      "paramName": "availability_zone_0"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  }
+                },
+                "volumeGroupAllowed": true
+              }
             },
-            {
-              "id": "UCPE",
-              "name": "UCPE"
+            "volumeGroups": {
+              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth_units"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "2017488_pasqualevpe0_bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "10"
+                  },
+                  "2017488_pasqualevpe0_vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_instance_name"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtnj309me6"
+                  },
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_config_template_version"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "2017488_pasqualevpe0_AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "AIC_CLLI"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  }
+                }
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
+                      "paramName": "availability_zone_0"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  }
+                }
+              }
             },
-            {
-              "id": "VNI",
-              "name": "VNI"
-            }
-          ]
-        },
-        "type": "UPDATE_LCP_REGIONS_AND_TENANTS"
-      }
-    }
-  }
-
-  function getReduxWithVNFS(isEcompGeneratedNaming: boolean) {
-    return {
-      "global": {
-        "name": null,
-        "flags": {
-          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
-          "FLAG_SHOW_ASSIGNMENTS": true,
-          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
-          "FLAG_SHOW_VERIFY_SERVICE": false,
-          "FLAG_SERVICE_MODEL_CACHE": true,
-          "CREATE_INSTANCE_TEST": false,
-          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
-          "EMPTY_DRAWING_BOARD_TEST": false,
-          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
-          "FLAG_SUPPLEMENTARY_FILE": true
-        },
-        "type": "[FLAGS] Update"
-      },
-      "service": {
-        "serviceHierarchy": {
+            "pnfs": {}
+          },
           "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
             "service": {
               "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
@@ -8849,8 +2980,6 @@ describe('Drawing board', function () {
                 "inputs": {},
                 "commands": {},
                 "properties": {
-                  "max_instances": 10,
-                  "min_instances": 1,
                   "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
                   "sctp-b-ipv6-egress_src_start_port": "0",
                   "sctp-a-ipv6-egress_rule_application": "any",
@@ -8904,7 +3033,7 @@ describe('Drawing board', function () {
                   "sctp_rule_protocol": "132",
                   "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
                   "sctp-a-ipv6-ingress_rule_application": "any",
-                  "ecomp_generated_naming": isEcompGeneratedNaming.toString(),
+                  "ecomp_generated_naming": "true",
                   "sctp-a-IPv6_ethertype": "IPv6",
                   "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
                   "vlc_st_virtualization_type": "virtual-machine",
@@ -9100,7 +3229,6 @@ describe('Drawing board', function () {
                 "inputs": {},
                 "commands": {},
                 "properties": {
-                  "ecomp_generated_naming": "false",
                   "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
                   "exVL_naming": "{ecomp_generated_naming=true}",
                   "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
@@ -9205,90 +3333,117 @@ describe('Drawing board', function () {
           }
         },
         "serviceInstance": {
-          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
             "vnfs": {
-              "VF_vGeraldine 0": {
-                "originalName": "VF_vGeraldine 0",
+              "2017-488_PASQUALE-vPE 0": {
                 "rollbackOnFailure": "true",
-                "instanceName": "",
                 "vfModules": {
-                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
-                    "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1dcudx": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
+                      "isMissingData": false,
+                      "sdncPreReload": null,
                       "modelInfo": {
-                        "modelInvariantId": "98a7c88b-b577-476a-90e4-e25a5871e02b",
-                        "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
-                        "modelName": "VfVgeraldine..vflorence_vlc..module-1",
-                        "modelVersion": "2",
-                        "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
-                        "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1"
+                        "modelType": "VFmodule",
+                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                        "modelVersion": "6",
+                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
+                      "instanceParams": [
+                        {}
+                      ],
+                      "trackById": "n2ydptuy9lj"
+                    }
+                  }
+                },
+                "isMissingData": false,
+                "originalName": null,
+                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+                "lcpCloudRegionId": null,
+                "tenantId": null,
+                "lineOfBusiness": null,
+                "platformName": null,
+                "modelInfo": {
+                  "modelType": "VF",
+                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
+                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+                  "modelName": "2017-488_PASQUALE-vPE",
+                  "modelVersion": "9.0",
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
+                },
+                "trackById": "iapflwk8bip"
+              },
+              "2017-488_PASQUALE-vPE 0:0001": {
+                "rollbackOnFailure": "true",
+                "vfModules": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
                       "isMissingData": false,
-                      "supplementaryFile": "C:\\fakepath\\sample.json",
-                      "supplementaryFile_hidden": {},
-                      "supplementaryFile_hidden_content": "{\r\n  \"name\": \"a\",\r\n  \"value\": \"32\"\r\n}",
-                      "supplementaryFileContent": {
-                        "name": "a",
-                          "value": "32"
+                      "sdncPreReload": null,
+                      "modelInfo": {
+                        "modelType": "VFmodule",
+                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                        "modelVersion": "6",
+                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
                       },
-                      "supplementaryFileName": "sample.json",
                       "instanceParams": [
                         {}
-                      ]
+                      ],
+                      "trackById": "wh18xgy0dc"
                     }
                   }
                 },
-                "isMissingData": false,
-                "modelName": "VF_vGeraldine 0",
-                "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
-                "lcpCloudRegionId": "hvf6",
-                "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
-                "lineOfBusiness": "zzz1",
-                "platformName": "platform",
+                "isMissingData": true,
+                "originalName": "2017-488_PASQUALE-vPE 0",
+                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+                "lcpCloudRegionId": null,
+                "tenantId": null,
+                "lineOfBusiness": null,
+                "platformName": null,
                 "modelInfo": {
-                  "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
-                  "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
-                  "modelName": "VF_vGeraldine",
-                  "modelVersion": "2.0",
-                  "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
-                  "modelCustomizationName": "VF_vGeraldine 0"
+                  "modelType": "VF",
+                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
+                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+                  "modelName": "2017-488_PASQUALE-vPE",
+                  "modelVersion": "9.0",
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
                 },
-                "legacyRegion": null
+                "trackById": "iapflwk8bip"
               }
             },
-            "networks": {},
             "instanceParams": [
-              {}
+              {
+                "2017488_pasqualevpe0_ASN": "AV_vPE"
+              }
             ],
-            "validationCounter": 0,
+            "validationCounter": 1,
             "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
-            "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+            "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
             "subscriptionServiceType": "TYLER SILVIA",
-            "lcpCloudRegionId": "hvf6",
-            "tenantId": "1178612d2b394be4834ad77f567c0af2",
-            "aicZoneId": "YYY1",
-            "projectName": "yyy1",
+            "lcpCloudRegionId": "AAIAIC25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+            "aicZoneId": "JAG1",
+            "projectName": "x1",
             "owningEntityId": "aaa1",
-            "owningEntityName": "aaa1",
             "rollbackOnFailure": "true",
-            "isALaCarte": false,
             "bulkSize": 1,
             "modelInfo": {
-              "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
-              "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-              "modelName": "ComplexService",
+              "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+              "modelName": "PASQUALE vMX vPE_BV Service 488",
               "modelVersion": "1.0"
             },
-            "instanceName": "",
-            "existingNames": {
-              "serviceinstancename": "",
-              "vfvgeraldine00001": ""
-            },
             "existingVNFCounterMap": {
               "91415b44-753d-494c-926a-456a9172bbb9": 1
             },
             "existingNetworksCounterMap": {},
-            "tenantName": "AIN Web Tool-15-D-SSPtestcustome",
-            "aicZoneName": "UUUAIAAI-YYY1"
+            "tenantName": "USP-SIP-IC-24335-T-01",
+            "aicZoneName": "YUDFJULP-JAG1"
           }
         },
         "lcpRegionsAndTenants": {
@@ -9319,128 +3474,8 @@ describe('Drawing board', function () {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -9448,16 +3483,6 @@ describe('Drawing board', function () {
                 "name": "ro-T112",
                 "isPermitted": true
               },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -9635,885 +3660,3607 @@ describe('Drawing board', function () {
             "isPermitted": true
           },
           {
-            "id": "vSalvatore",
-            "name": "vSalvatore",
-            "isPermitted": true
+            "id": "vSalvatore",
+            "name": "vSalvatore",
+            "isPermitted": true
+          },
+          {
+            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+            "name": "JOSEFINA",
+            "isPermitted": true
+          },
+          {
+            "id": "vHubbard",
+            "name": "vHubbard",
+            "isPermitted": true
+          },
+          {
+            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+            "name": "DARREN MCGEE",
+            "isPermitted": true
+          }
+        ],
+        "serviceTypes": {
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
           },
           {
-            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
-            "name": "JOSEFINA",
-            "isPermitted": true
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
           },
           {
-            "id": "vHubbard",
-            "name": "vHubbard",
-            "isPermitted": true
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
           },
           {
-            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
-            "name": "DARREN MCGEE",
-            "isPermitted": true
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
           }
         ],
-        "serviceTypes": {
-          "e433710f-9217-458d-a79d-1c7aff376d89": [
+        "categoryParameters": {
+          "owningEntityList": [
             {
-              "id": "0",
-              "name": "vRichardson",
-              "isPermitted": false
+              "id": "aaa1",
+              "name": "aaa1"
             },
             {
-              "id": "1",
-              "name": "TYLER SILVIA",
-              "isPermitted": true
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
             },
             {
-              "id": "2",
-              "name": "Emanuel",
-              "isPermitted": false
-            },
+              "id": "Melissa",
+              "name": "Melissa"
+            }
+          ],
+          "projectList": [
             {
-              "id": "3",
-              "name": "vJamie",
-              "isPermitted": false
+              "id": "WATKINS",
+              "name": "WATKINS"
             },
             {
-              "id": "4",
-              "name": "vVoiceMail",
-              "isPermitted": false
+              "id": "x1",
+              "name": "x1"
             },
             {
-              "id": "5",
-              "name": "Kennedy",
-              "isPermitted": false
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "ONAP",
+              "name": "ONAP"
             },
             {
-              "id": "6",
-              "name": "vPorfirio",
-              "isPermitted": false
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "platform",
+              "name": "platform"
             },
             {
-              "id": "7",
-              "name": "vVM",
-              "isPermitted": false
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "[LCP_REGIONS_AND_TENANTS] Update"
+      }
+    }
+  }
+
+  function getReduxWithVFModuleMissingData() {
+    return {
+      "global": {
+        "name": null,
+        "flags": {
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_SHOW_VERIFY_SERVICE": false,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "CREATE_INSTANCE_TEST": false,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true
+        },
+        "type": "[FLAGS] Update"
+      },
+      "service": {
+        "serviceHierarchy": {
+          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
+            "service": {
+              "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+              "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "name": "PASQUALE vMX vPE_BV Service 488",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Network L1-3",
+              "serviceType": "",
+              "serviceRole": "",
+              "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
+              "inputs": {
+                "2017488_pasqualevpe0_ASN": {
+                  "type": "string",
+                  "description": "AV/PE",
+                  "entry_schema": null,
+                  "inputProperties": null,
+                  "constraints": [],
+                  "required": true,
+                  "default": "AV_vPE"
+                }
+              }
+            },
+            "vnfs": {
+              "2017-488_PASQUALE-vPE 0": {
+                "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
+                "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
+                "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": {
+                  "vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "10"
+                  },
+                  "AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  },
+                  "availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  },
+                  "ASN": {
+                    "type": "string",
+                    "description": "AV/PE",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "AV_vPE"
+                  },
+                  "vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": null,
+                    "constraints": [],
+                    "required": true,
+                    "default": "mtnj309me6"
+                  }
+                },
+                "commands": {
+                  "vnf_config_template_version": {
+                    "displayName": "vnf_config_template_version",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
+                  },
+                  "bandwidth_units": {
+                    "displayName": "bandwidth_units",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_bandwidth_units"
+                  },
+                  "bandwidth": {
+                    "displayName": "bandwidth",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_bandwidth"
+                  },
+                  "AIC_CLLI": {
+                    "displayName": "AIC_CLLI",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_AIC_CLLI"
+                  },
+                  "availability_zone_0": {
+                    "displayName": "availability_zone_0",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_availability_zone_0"
+                  },
+                  "ASN": {
+                    "displayName": "ASN",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_ASN"
+                  },
+                  "vnf_instance_name": {
+                    "displayName": "vnf_instance_name",
+                    "command": "get_input",
+                    "inputName": "2017488_pasqualevpe0_vnf_instance_name"
+                  }
+                },
+                "properties": {
+                  "vmxvre_retype": "RE-VMX",
+                  "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": "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": "10.0.0.10",
+                  "is_AVPN_service": "false",
+                  "vmx_RSG_name": "vREXI-affinity",
+                  "vmx_int_ctl_forwarding": "l2",
+                  "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",
+                  "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
+                  "vmxvre_image_name_0": "vre172_nova_img",
+                  "vmxvre_instance": "0",
+                  "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
+                  "vmxvre_flavor_name": "ns.c1r16d32.v5",
+                  "vmxvpfe_volume_size_0": "40.0",
+                  "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
+                  "nf_naming": "{ecomp_generated_naming=true}",
+                  "multi_stage_design": "false",
+                  "nf_naming_code": "me6",
+                  "vmxvre_name_0": "vREXI",
+                  "vmxvpfe_sriov42_0_port_vlanstrip": "false",
+                  "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
+                  "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
+                  "vmxvpfe_image_name_0": "vpfe172_nova_img",
+                  "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
+                  "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
+                  "vmxvre_console": "vidconsole",
+                  "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
+                  "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
+                  "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
+                  "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
+                  "vmxvpfe_sriov44_0_port_vlanstrip": "false",
+                  "vf_module_id": "123",
+                  "nf_function": "PASQUALE vPE",
+                  "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
+                  "vmxvre_int_ctl_ip_0": "10.0.0.10",
+                  "ecomp_generated_naming": "true",
+                  "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
+                  "vnf_name": "mtnj309me6vre",
+                  "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
+                  "vmxvre_volume_type_1": "HITACHI",
+                  "vmxvpfe_sriov44_0_port_broadcastallow": "true",
+                  "vmxvre_volume_type_0": "HITACHI",
+                  "vmxvpfe_volume_type_0": "HITACHI",
+                  "vmxvpfe_sriov43_0_port_broadcastallow": "true",
+                  "bandwidth_units": "get_input:2017488_pasqualevpe0_bandwidth_units",
+                  "vnf_id": "123",
+                  "vmxvre_oam_prefix": "24",
+                  "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_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.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_pasqualevpe0_vnf_instance_name",
+                  "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
+                  "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
+                  "vmx_int_ctl_len": "24",
+                  "vmxvpfe_sriov43_0_port_vlanstrip": "false",
+                  "vmxvpfe_sriov41_0_port_broadcastallow": "true",
+                  "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
+                  "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
+                  "nf_role": "vPE",
+                  "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
+                  "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
+                  "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
+                },
+                "type": "VF",
+                "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+                "vfModules": {
+                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "properties": {
+                      "minCountInstances": 2,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
+                        "type": "string",
+                        "description": "Units of bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth_units"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "Gbps"
+                      },
+                      "2017488_pasqualevpe0_bandwidth": {
+                        "type": "string",
+                        "description": "Requested VPE bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "10"
+                      },
+                      "2017488_pasqualevpe0_vnf_instance_name": {
+                        "type": "string",
+                        "description": "The hostname assigned to the vpe.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_instance_name"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtnj309me6"
+                      },
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
+                        "type": "string",
+                        "description": "VPE Software Version",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_config_template_version"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "17.2"
+                      },
+                      "2017488_pasqualevpe0_AIC_CLLI": {
+                        "type": "string",
+                        "description": "AIC Site CLLI",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "AIC_CLLI"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "ATLMY8GA"
+                      }
+                    },
+                    "volumeGroupAllowed": true
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                    "version": "6",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "PASQUALE_base_vPE_BV"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
+                        "type": "string",
+                        "description": "The Availability Zone to launch the instance.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
+                          "paramName": "availability_zone_0"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtpocfo-kvm-az01"
+                      }
+                    },
+                    "volumeGroupAllowed": true
+                  }
+                },
+                "volumeGroups": {
+                  "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vRE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_bandwidth_units": {
+                        "type": "string",
+                        "description": "Units of bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth_units"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "Gbps"
+                      },
+                      "2017488_pasqualevpe0_bandwidth": {
+                        "type": "string",
+                        "description": "Requested VPE bandwidth",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "bandwidth"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "10"
+                      },
+                      "2017488_pasqualevpe0_vnf_instance_name": {
+                        "type": "string",
+                        "description": "The hostname assigned to the vpe.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_instance_name"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtnj309me6"
+                      },
+                      "2017488_pasqualevpe0_vnf_config_template_version": {
+                        "type": "string",
+                        "description": "VPE Software Version",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "vnf_config_template_version"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "17.2"
+                      },
+                      "2017488_pasqualevpe0_AIC_CLLI": {
+                        "type": "string",
+                        "description": "AIC Site CLLI",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vRE_BV",
+                          "paramName": "AIC_CLLI"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "ATLMY8GA"
+                      }
+                    }
+                  },
+                  "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "version": "8",
+                    "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "PASQUALE_vPFE_BV"
+                    },
+                    "inputs": {
+                      "2017488_pasqualevpe0_availability_zone_0": {
+                        "type": "string",
+                        "description": "The Availability Zone to launch the instance.",
+                        "entry_schema": null,
+                        "inputProperties": {
+                          "sourceType": "HEAT",
+                          "vfModuleLabel": "PASQUALE_vPFE_BV",
+                          "paramName": "availability_zone_0"
+                        },
+                        "constraints": null,
+                        "required": true,
+                        "default": "mtpocfo-kvm-az01"
+                      }
+                    }
+                  }
+                },
+                "vfcInstanceGroups": {}
+              }
             },
-            {
-              "id": "8",
-              "name": "vOTA",
-              "isPermitted": false
+            "networks": {},
+            "collectionResources": {},
+            "configurations": {},
+            "serviceProxies": {},
+            "vfModules": {
+              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth_units"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "2017488_pasqualevpe0_bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "10"
+                  },
+                  "2017488_pasqualevpe0_vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_instance_name"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtnj309me6"
+                  },
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_config_template_version"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "2017488_pasqualevpe0_AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "AIC_CLLI"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  }
+                },
+                "volumeGroupAllowed": true
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                "version": "6",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "PASQUALE_base_vPE_BV"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
+                      "paramName": "availability_zone_0"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  }
+                },
+                "volumeGroupAllowed": true
+              }
             },
-            {
-              "id": "9",
-              "name": "vFLORENCE",
-              "isPermitted": false
+            "volumeGroups": {
+              "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": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vRE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_bandwidth_units": {
+                    "type": "string",
+                    "description": "Units of bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth_units"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "Gbps"
+                  },
+                  "2017488_pasqualevpe0_bandwidth": {
+                    "type": "string",
+                    "description": "Requested VPE bandwidth",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "bandwidth"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "10"
+                  },
+                  "2017488_pasqualevpe0_vnf_instance_name": {
+                    "type": "string",
+                    "description": "The hostname assigned to the vpe.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_instance_name"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtnj309me6"
+                  },
+                  "2017488_pasqualevpe0_vnf_config_template_version": {
+                    "type": "string",
+                    "description": "VPE Software Version",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "vnf_config_template_version"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "17.2"
+                  },
+                  "2017488_pasqualevpe0_AIC_CLLI": {
+                    "type": "string",
+                    "description": "AIC Site CLLI",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vRE_BV",
+                      "paramName": "AIC_CLLI"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "ATLMY8GA"
+                  }
+                }
+              },
+              "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": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "version": "8",
+                "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "PASQUALE_vPFE_BV"
+                },
+                "inputs": {
+                  "2017488_pasqualevpe0_availability_zone_0": {
+                    "type": "string",
+                    "description": "The Availability Zone to launch the instance.",
+                    "entry_schema": null,
+                    "inputProperties": {
+                      "sourceType": "HEAT",
+                      "vfModuleLabel": "PASQUALE_vPFE_BV",
+                      "paramName": "availability_zone_0"
+                    },
+                    "constraints": null,
+                    "required": true,
+                    "default": "mtpocfo-kvm-az01"
+                  }
+                }
+              }
             },
-            {
-              "id": "10",
-              "name": "vMNS",
-              "isPermitted": false
+            "pnfs": {}
+          },
+          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+            "service": {
+              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+              "name": "ComplexService",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Emanuel",
+              "serviceType": "",
+              "serviceRole": "",
+              "description": "ComplexService",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
+              "inputs": {}
             },
-            {
-              "id": "11",
-              "name": "vEsmeralda",
-              "isPermitted": false
+            "vnfs": {
+              "VF_vGeraldine 0": {
+                "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+                "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
+                "version": "2.0",
+                "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-egress_src_start_port": "0",
+                  "sctp-a-ipv6-egress_rule_application": "any",
+                  "Internal2_allow_transit": "true",
+                  "sctp-b-IPv6_ethertype": "IPv6",
+                  "sctp-a-egress_rule_application": "any",
+                  "sctp-b-ingress_action": "pass",
+                  "sctp-b-ingress_rule_protocol": "icmp",
+                  "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-ingress-src_start_port": "0.0",
+                  "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "fsb_volume_size_0": "320.0",
+                  "sctp-b-egress_src_addresses": "local",
+                  "sctp-a-ipv6-ingress_ethertype": "IPv4",
+                  "sctp-a-ipv6-ingress-dst_start_port": "0",
+                  "sctp-b-ipv6-ingress_rule_application": "any",
+                  "domain_name": "default-domain",
+                  "sctp-a-ingress_rule_protocol": "icmp",
+                  "sctp-b-egress-src_start_port": "0.0",
+                  "sctp-a-egress_src_addresses": "local",
+                  "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
+                  "sctp-a-egress-src_start_port": "0.0",
+                  "sctp-a-ingress_ethertype": "IPv4",
+                  "sctp-b-ipv6-ingress-dst_end_port": "65535",
+                  "sctp-b-dst_subnet_prefix_v6": "::",
+                  "nf_naming": "{ecomp_generated_naming=true}",
+                  "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+                  "sctp-b-egress-dst_start_port": "0.0",
+                  "ncb_flavor_name": "nv.c20r64d1",
+                  "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-egress_dst_subnet_prefix_len": "0.0",
+                  "Internal2_net_cidr": "10.0.0.10",
+                  "sctp-a-ingress-dst_start_port": "0.0",
+                  "sctp-a-egress-dst_start_port": "0.0",
+                  "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-egress_ethertype": "IPv4",
+                  "vlc_st_service_mode": "in-network-nat",
+                  "sctp-a-ipv6-egress_ethertype": "IPv4",
+                  "sctp-a-egress-src_end_port": "65535.0",
+                  "sctp-b-ipv6-egress_rule_application": "any",
+                  "sctp-b-egress_action": "pass",
+                  "sctp-a-ingress-src_subnet_prefix_len": "0.0",
+                  "sctp-b-ipv6-ingress-src_end_port": "65535.0",
+                  "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
+                  "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-ipv6-ingress-src_start_port": "0.0",
+                  "sctp-b-ipv6-egress_ethertype": "IPv4",
+                  "Internal1_net_cidr": "10.0.0.10",
+                  "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
+                  "fsb_flavor_name": "nv.c20r64d1",
+                  "sctp_rule_protocol": "132",
+                  "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
+                  "sctp-a-ipv6-ingress_rule_application": "any",
+                  "ecomp_generated_naming": "true",
+                  "sctp-a-IPv6_ethertype": "IPv6",
+                  "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_virtualization_type": "virtual-machine",
+                  "sctp-b-ingress-dst_start_port": "0.0",
+                  "sctp-b-ingress-dst_end_port": "65535.0",
+                  "sctp-a-ipv6-ingress-src_end_port": "65535.0",
+                  "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
+                  "sctp-b-ingress_rule_application": "any",
+                  "int2_sec_group_name": "int2-sec-group",
+                  "vlc_flavor_name": "nd.c16r64d1",
+                  "sctp-b-ipv6-egress_src_addresses": "local",
+                  "vlc_st_interface_type_int1": "other1",
+                  "sctp-b-egress-src_end_port": "65535.0",
+                  "sctp-a-ipv6-egress-dst_start_port": "0",
+                  "vlc_st_interface_type_int2": "other2",
+                  "sctp-a-ipv6-egress_rule_protocol": "any",
+                  "Internal2_shared": "false",
+                  "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
+                  "Internal2_rpf": "disable",
+                  "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-egress_src_end_port": "65535",
+                  "sctp-a-ipv6-egress_src_addresses": "local",
+                  "sctp-a-ingress-dst_end_port": "65535.0",
+                  "sctp-a-ipv6-egress_src_end_port": "65535",
+                  "Internal1_forwarding_mode": "l2",
+                  "Internal2_dhcp": "false",
+                  "sctp-a-dst_subnet_prefix_v6": "::",
+                  "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
+                  "vlc_st_interface_type_gtp": "other0",
+                  "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-src_subnet_prefix_v6": "::",
+                  "sctp-a-egress_dst_subnet_prefix_len": "0.0",
+                  "int1_sec_group_name": "int1-sec-group",
+                  "Internal1_dhcp": "false",
+                  "sctp-a-ipv6-egress_dst_end_port": "65535",
+                  "Internal2_forwarding_mode": "l2",
+                  "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
+                  "Internal1_net_cidr_len": "17",
+                  "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ingress-src_subnet_prefix_len": "0.0",
+                  "sctp-a-ingress_dst_addresses": "local",
+                  "sctp-a-egress_action": "pass",
+                  "fsb_volume_type_0": "SF-Default-SSD",
+                  "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_interface_type_sctp_a": "left",
+                  "vlc_st_interface_type_sctp_b": "right",
+                  "sctp-a-src_subnet_prefix_v6": "::",
+                  "vlc_st_version": "2",
+                  "sctp-b-egress_ethertype": "IPv4",
+                  "sctp-a-ingress_rule_application": "any",
+                  "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "instance_ip_family_v6": "v6",
+                  "sctp-a-ipv6-egress_src_start_port": "0",
+                  "sctp-b-ingress-src_start_port": "0.0",
+                  "sctp-b-ingress_dst_addresses": "local",
+                  "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_interface_type_oam": "management",
+                  "multi_stage_design": "false",
+                  "oam_sec_group_name": "oam-sec-group",
+                  "Internal2_net_gateway": "10.0.0.10",
+                  "sctp-a-ipv6-ingress-dst_end_port": "65535",
+                  "sctp-b-ipv6-egress-dst_start_port": "0",
+                  "Internal1_net_gateway": "10.0.0.10",
+                  "sctp-b-ipv6-egress_rule_protocol": "any",
+                  "gtp_sec_group_name": "gtp-sec-group",
+                  "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+                  "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
+                  "sctp-a-ipv6-ingress_dst_addresses": "local",
+                  "sctp-a-egress_rule_protocol": "icmp",
+                  "sctp-b-ipv6-egress_action": "pass",
+                  "sctp-a-ipv6-egress_action": "pass",
+                  "Internal1_shared": "false",
+                  "sctp-b-ipv6-ingress_rule_protocol": "any",
+                  "Internal2_net_cidr_len": "17",
+                  "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
+                  "sctp-a-ingress-src_end_port": "65535.0",
+                  "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-egress-dst_end_port": "65535.0",
+                  "sctp-a-ingress_action": "pass",
+                  "sctp-b-egress_rule_protocol": "icmp",
+                  "sctp-b-ipv6-ingress_action": "pass",
+                  "vlc_st_service_type": "firewall",
+                  "sctp-b-ipv6-egress_dst_end_port": "65535",
+                  "sctp-b-ipv6-ingress-dst_start_port": "0",
+                  "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_availability_zone": "true",
+                  "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
+                  "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
+                  "Internal1_allow_transit": "true",
+                  "gpb_flavor_name": "nv.c20r64d1",
+                  "availability_zone_max_count": "1",
+                  "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
+                  "sctp-b-ipv6-ingress_dst_addresses": "local",
+                  "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+                  "sctp-b-ipv6-ingress_ethertype": "IPv4",
+                  "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-ipv6-ingress_action": "pass",
+                  "Internal1_rpf": "disable",
+                  "sctp-b-ingress_ethertype": "IPv4",
+                  "sctp-b-egress_rule_application": "any",
+                  "sctp-b-ingress-src_end_port": "65535.0",
+                  "sctp-a-ipv6-ingress_rule_protocol": "any",
+                  "sctp-a-ingress-src_start_port": "0.0",
+                  "sctp-b-egress-dst_end_port": "65535.0"
+                },
+                "type": "VF",
+                "modelCustomizationName": "VF_vGeraldine 0",
+                "vfModules": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                    "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+                    "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+                    "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+                    "description": null,
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "vflorence_vlc"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+                    "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+                    "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+                    "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+                    "description": null,
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "vflorence_gpb"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                    "description": null,
+                    "name": "VfVgeraldine..base_vflorence..module-0",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "base_vflorence"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": true
+                  }
+                },
+                "volumeGroups": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                    "description": null,
+                    "name": "VfVgeraldine..base_vflorence..module-0",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "base_vflorence"
+                    },
+                    "inputs": {}
+                  }
+                },
+                "vfcInstanceGroups": {}
+              }
             },
-            {
-              "id": "12",
-              "name": "VPMS",
-              "isPermitted": false
+            "networks": {
+              "ExtVL 0": {
+                "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+                "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+                "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+                "name": "ExtVL",
+                "version": "37.0",
+                "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+                  "exVL_naming": "{ecomp_generated_naming=true}",
+                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+                  "network_homing": "{ecomp_selected_instance_node_target=false}"
+                },
+                "type": "VL",
+                "modelCustomizationName": "ExtVL 0"
+              }
             },
-            {
-              "id": "13",
-              "name": "vWINIFRED",
-              "isPermitted": false
+            "collectionResources": {},
+            "configurations": {
+              "Port Mirroring Configuration By Policy 0": {
+                "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
+                "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
+                "description": "A port mirroring configuration by policy object",
+                "name": "Port Mirroring Configuration By Policy",
+                "version": "27.0",
+                "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
+                "inputs": {},
+                "commands": {},
+                "properties": {},
+                "type": "Configuration",
+                "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
+                "sourceNodes": [],
+                "collectorNodes": null,
+                "configurationByPolicy": false
+              }
             },
-            {
-              "id": "14",
-              "name": "SSD",
-              "isPermitted": false
+            "serviceProxies": {},
+            "vfModules": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+                "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+                "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+                "description": null,
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "vflorence_vlc"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+                "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+                "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+                "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+                "description": null,
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "vflorence_gpb"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                "description": null,
+                "name": "VfVgeraldine..base_vflorence..module-0",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "base_vflorence"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": true
+              }
             },
-            {
-              "id": "15",
-              "name": "vMOG",
-              "isPermitted": false
+            "volumeGroups": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                "description": null,
+                "name": "VfVgeraldine..base_vflorence..module-0",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "base_vflorence"
+                },
+                "inputs": {}
+              }
             },
-            {
-              "id": "16",
-              "name": "LINDSEY",
-              "isPermitted": false
+            "pnfs": {}
+          }
+        },
+        "serviceInstance": {
+          "f4d84bb4-a416-4b4e-997e-0059973630b9": {
+            "vnfs": {
+              "2017-488_PASQUALE-vPE 0": {
+                "rollbackOnFailure": "true",
+                "vfModules": {
+                  "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+                    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0jkyqv": {
+                      "isMissingData": true,
+                      "sdncPreReload": null,
+                      "modelInfo": {
+                        "modelType": "VFmodule",
+                        "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+                        "modelVersionId": "040e591e-5d30-4e0d-850f-7266e5a8e013",
+                        "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
+                        "modelVersion": "6",
+                        "modelCustomizationId": "5c5f91f9-5e31-4120-b892-5536587ec258",
+                        "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"
+                      },
+                      "instanceParams": [
+                        {}
+                      ],
+                      "trackById": "n2ydptuy9lj"
+                    }
+                  }
+                },
+                "isMissingData": false,
+                "originalName": "2017-488_PASQUALE-vPE 0",
+                "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+                "lcpCloudRegionId": null,
+                "tenantId": null,
+                "lineOfBusiness": null,
+                "platformName": null,
+                "modelInfo": {
+                  "modelType": "VF",
+                  "modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
+                  "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+                  "modelName": "2017-488_PASQUALE-vPE",
+                  "modelVersion": "9.0",
+                  "modelCustomizationName": "2017-488_PASQUALE-vPE 0"
+                },
+                "trackById": "iapflwk8bip"
+              }
             },
-            {
-              "id": "17",
-              "name": "JOHANNA_SANTOS",
-              "isPermitted": false
+            "instanceParams": [
+              {
+                "2017488_pasqualevpe0_ASN": "AV_vPE"
+              }
+            ],
+            "validationCounter": 1,
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "lcpCloudRegionId": "AAIAIC25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+            "aicZoneId": "JAG1",
+            "projectName": "x1",
+            "owningEntityId": "aaa1",
+            "rollbackOnFailure": "true",
+            "bulkSize": 1,
+            "modelInfo": {
+              "modelInvariantId": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+              "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+              "modelName": "PASQUALE vMX vPE_BV Service 488",
+              "modelVersion": "1.0"
             },
-            {
-              "id": "18",
-              "name": "vCarroll",
-              "isPermitted": false
-            }
-          ]
-        },
-        "aicZones": [
-          {
-            "id": "NFT1",
-            "name": "NFTJSSSS-NFT1"
-          },
-          {
-            "id": "JAG1",
-            "name": "YUDFJULP-JAG1"
-          },
-          {
-            "id": "YYY1",
-            "name": "UUUAIAAI-YYY1"
-          },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
+            "existingVNFCounterMap": {
+              "41516cc6-5098-4b40-a619-f8d5f55fc4d8": 1
+            },
+            "existingNetworksCounterMap": {},
+            "tenantName": "USP-SIP-IC-24335-T-01",
+            "aicZoneName": "YUDFJULP-JAG1"
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
+              "isPermitted": true
+            },
+            {
+              "id": "hvf6",
+              "name": "hvf6",
+              "isPermitted": true
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "AAIAIC25": [
+              {
+                "id": "092eb9e8e4b7412e8787dd091bc58e86",
+                "name": "USP-SIP-IC-24335-T-01",
+                "isPermitted": true
+              }
+            ],
+            "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true
+              },
+              {
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
+                "isPermitted": true
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true
+              },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true
+              }
+            ]
+          }
+        },
+        "subscribers": [
           {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
+            "id": "CAR_2020_ER",
+            "name": "CAR_2020_ER",
+            "isPermitted": true
           },
           {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
           },
           {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
+            "id": "DHV1707-TestSubscriber-2",
+            "name": "DALE BRIDGES",
+            "isPermitted": false
           },
           {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
+            "id": "DHV1707-TestSubscriber-1",
+            "name": "LLOYD BRIDGES",
+            "isPermitted": false
           },
           {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
+            "id": "jimmy-example",
+            "name": "JimmyExampleCust-20161102",
+            "isPermitted": false
           },
           {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
+            "id": "jimmy-example2",
+            "name": "JimmyExampleCust-20161103",
+            "isPermitted": false
           },
           {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
+            "id": "ERICA5779-TestSub-PWT-102",
+            "name": "ERICA5779-TestSub-PWT-102",
+            "isPermitted": false
           },
           {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
+            "id": "ERICA5779-TestSub-PWT-101",
+            "name": "ERICA5779-TestSub-PWT-101",
+            "isPermitted": false
           },
           {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": false
           },
           {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
+            "id": "ERICA5779-Subscriber-4",
+            "name": "ERICA5779-Subscriber-5",
+            "isPermitted": false
           },
           {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
+            "id": "ERICA5779-TestSub-PWT-103",
+            "name": "ERICA5779-TestSub-PWT-103",
+            "isPermitted": false
           },
           {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
+            "id": "ERICA5779-Subscriber-2",
+            "name": "ERICA5779-Subscriber-2",
+            "isPermitted": false
           },
           {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
           },
           {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
+            "id": "ERICA5779-Subscriber-3",
+            "name": "ERICA5779-Subscriber-3",
+            "isPermitted": false
           },
           {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
+          }
+        ],
+        "productFamilies": [
           {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
+            "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+            "name": "ERICA",
+            "isPermitted": true
           },
           {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
+            "id": "17cc1042-527b-11e6-beb8-9e71128cae77",
+            "name": "IGNACIO",
+            "isPermitted": true
           },
           {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
+            "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+            "name": "Christie",
+            "isPermitted": true
           },
           {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
+            "id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7",
+            "name": "Enhanced Services",
+            "isPermitted": true
           },
           {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
+            "id": "vTerrance",
+            "name": "vTerrance",
+            "isPermitted": true
           },
           {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
+            "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
+            "name": "vEsmeralda",
+            "isPermitted": true
           },
           {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
           },
           {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
+            "id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
+            "name": "BVOIP",
+            "isPermitted": true
           },
           {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
+            "id": "db171b8f-115c-4992-a2e3-ee04cae357e0",
+            "name": "LINDSEY",
+            "isPermitted": true
           },
           {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
+            "id": "LRSI-OSPF",
+            "name": "LRSI-OSPF",
+            "isPermitted": true
           },
           {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
+            "id": "vRosemarie",
+            "name": "HNGATEWAY",
+            "isPermitted": true
           },
           {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
+            "id": "vHNPaas",
+            "name": "WILKINS",
+            "isPermitted": true
           },
           {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "TYLER SILVIA",
+            "isPermitted": true
           },
           {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
+            "id": "b6a3f28c-eebf-494c-a900-055cc7c874ce",
+            "name": "VROUTER",
+            "isPermitted": true
           },
           {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
+            "id": "vMuriel",
+            "name": "vMuriel",
+            "isPermitted": true
           },
           {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
+            "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1",
+            "name": "CARA Griffin",
+            "isPermitted": true
           },
           {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
+            "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+            "name": "DARREN MCGEE",
+            "isPermitted": true
           },
           {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
+            "id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1",
+            "name": "Transport",
+            "isPermitted": true
           },
           {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
+            "id": "vSalvatore",
+            "name": "vSalvatore",
+            "isPermitted": true
           },
           {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
+            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+            "name": "JOSEFINA",
+            "isPermitted": true
           },
           {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
+            "id": "vHubbard",
+            "name": "vHubbard",
+            "isPermitted": true
           },
           {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
+            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+            "name": "DARREN MCGEE",
+            "isPermitted": true
+          }
+        ],
+        "serviceTypes": {
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
           {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
           },
           {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
           },
           {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
           },
           {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
           },
           {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "aaa1",
+              "name": "aaa1"
+            },
+            {
+              "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+              "name": "WayneHolland"
+            },
+            {
+              "id": "Melissa",
+              "name": "Melissa"
+            }
+          ],
+          "projectList": [
+            {
+              "id": "WATKINS",
+              "name": "WATKINS"
+            },
+            {
+              "id": "x1",
+              "name": "x1"
+            },
+            {
+              "id": "yyy1",
+              "name": "yyy1"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "ONAP",
+              "name": "ONAP"
+            },
+            {
+              "id": "zzz1",
+              "name": "zzz1"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "platform",
+              "name": "platform"
+            },
+            {
+              "id": "xxx1",
+              "name": "xxx1"
+            }
+          ]
+        },
+        "type": "[LCP_REGIONS_AND_TENANTS] Update"
+      }
+    }
+  }
+
+  function getReduxWith2Networks() {
+    return {
+      "global": {
+        "name": null,
+        "type": "UPDATE_DRAWING_BOARD_STATUS",
+        "flags": {
+          "CREATE_INSTANCE_TEST": false,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_DEFAULT_VNF": true,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": true,
+          "FLAG_A_LA_CARTE_AUDIT_INFO": true,
+          "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true,
+          "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true,
+          "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false,
+          "FLAG_1902_NEW_VIEW_EDIT": false,
+          "FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI": false,
+          "FLAG_1902_VNF_GROUPING": false,
+          "FLAG_SHOW_VERIFY_SERVICE": false,
+          "FLAG_ASYNC_ALACARTE_VFMODULE": true,
+          "FLAG_ASYNC_ALACARTE_VNF": true,
+          "FLAG_1810_AAI_LOCAL_CACHE": true,
+          "FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER": false,
+          "FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI": false,
+          "FLAG_SUPPLEMENTARY_FILE": true,
+          "FLAG_5G_IN_NEW_INSTANTIATION_UI": true,
+          "FLAG_RESTRICTED_SELECT": false,
+          "FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY": true
+        },
+        "drawingBoardStatus": "CREATE"
+      },
+      "service": {
+        "serviceHierarchy": {
+          "2ab1da67-39cc-425f-ba52-59a64d0ea04a": {
+            "service": {
+              "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
+              "invariantUuid": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
+              "name": "sgi_direct_net NC SRIOV network",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Network Service",
+              "serviceType": "INFRASTRUCTURE",
+              "serviceRole": "PROVIDER-NETWORK",
+              "description": "SRIOV network model for NC 1.0, VLAN ID 103",
+              "serviceEcompNaming": "false",
+              "instantiationType": "A-La-Carte",
+              "inputs": {},
+              "vidNotions": {
+                "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
+                "modelCategory": "5G Provider Network",
+                "viewEditUI": "legacy",
+                "instantiationType": "ALaCarte"
+              }
+            },
+            "vnfs": {},
+            "networks": {
+              "SR-IOV Provider 2-1": {
+                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
+                "invariantUuid": "ffb9e45c-e674-4289-aad3-00040ad746e4",
+                "description": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                "name": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                "version": "1.0",
+                "customizationUuid": "42551d11-b8d1-460d-8795-3e1363ad7736",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "network_role": "sgi_direct_net_1",
+                  "network_assignments": "{is_external_network=false, is_shared_network=true, is_trunked=false, ipv4_subnet_default_assignment={dhcp_enabled=false, ip_version=4, min_subnets_count=1, use_ipv4=true}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={dhcp_enabled=false, use_ipv6=true, ip_version=6, min_subnets_count=1}, related_networks=[{related_network_role=sgi_direct_net_1_tenant}]}",
+                  "exVL_naming": "{ecomp_generated_naming=false}",
+                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+                  "network_scope": "GLOBAL",
+                  "ecomp_generated_naming": "false",
+                  "network_type": "SR-IOV-PROVIDER2-1",
+                  "provider_network": "{physical_network_name=sriovnet1, is_provider_network=true}",
+                  "network_technology": "STANDARD-SR-IOV",
+                  "network_homing": "{ecomp_selected_instance_node_target=false}"
+                },
+                "type": "VL",
+                "modelCustomizationName": "SR-IOV Provider 2-1"
+              },
+              "SR-IOV Provider 2-2": {
+                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
+                "invariantUuid": "ffb9e45c-e674-4289-aad3-00040ad746e4",
+                "description": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                "name": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                "version": "1.0",
+                "customizationUuid": "14d2dc2b-4e85-4ef5-b4da-fe996e2a5d33",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "network_role": "sgi_direct_net_2",
+                  "network_assignments": "{is_external_network=false, is_shared_network=true, is_trunked=false, ipv4_subnet_default_assignment={dhcp_enabled=false, ip_version=4, min_subnets_count=1, use_ipv4=true}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={dhcp_enabled=false, use_ipv6=true, ip_version=6, min_subnets_count=1}, related_networks=[{related_network_role=sgi_direct_net_2_tenant}]}",
+                  "exVL_naming": "{ecomp_generated_naming=false}",
+                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+                  "network_scope": "GLOBAL",
+                  "ecomp_generated_naming": "false",
+                  "network_type": "SR-IOV-PROVIDER2-2",
+                  "provider_network": "{physical_network_name=sriovnet2, is_provider_network=true}",
+                  "network_technology": "STANDARD-SR-IOV",
+                  "network_homing": "{ecomp_selected_instance_node_target=false}"
+                },
+                "type": "VL",
+                "modelCustomizationName": "SR-IOV Provider 2-2"
+              }
+            },
+            "collectionResources": {},
+            "configurations": {},
+            "fabricConfigurations": {},
+            "serviceProxies": {},
+            "vfModules": {},
+            "volumeGroups": {},
+            "pnfs": {},
+            "vnfGroups": {}
+          }
+        },
+        "serviceInstance": {
+          "2ab1da67-39cc-425f-ba52-59a64d0ea04a": {
+            "action": "Create",
+            "isDirty": false,
+            "vnfs": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "existingNames": {
+              "myname": ""
+            },
+            "existingVNFCounterMap": {},
+            "existingVnfGroupCounterMap": {},
+            "existingNetworksCounterMap": {
+              "01f4c475-3f89-4f00-a2f4-39a873dba0ae": 1
+            },
+            "optionalGroupMembersMap": {},
+            "networks": {
+              "SR-IOV Provider 2-2": {
+                "action": "Create",
+                "inMaint": false,
+                "rollbackOnFailure": "true",
+                "originalName": "SR-IOV Provider 2-2",
+                "isMissingData": false,
+                "trackById": "83ad9rv48px",
+                "networkStoreKey": "SR-IOV Provider 2-2",
+                "instanceName": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                "productFamilyId": null,
+                "lcpCloudRegionId": "olson5b",
+                "tenantId": "db1818f7f2e34862b378bfb2cc520f91",
+                "platformName": "APPLICATIONS-SERVICES",
+                "lineOfBusiness": null,
+                "instanceParams": [
+                  {}
+                ],
+                "modelInfo": {
+                  "modelInvariantId": "ffb9e45c-e674-4289-aad3-00040ad746e4",
+                  "modelVersionId": "01f4c475-3f89-4f00-a2f4-39a873dba0ae",
+                  "modelName": "NETWORK_CLOUD_PROVIDER_NETWORK",
+                  "modelVersion": "1.0",
+                  "modelCustomizationId": "14d2dc2b-4e85-4ef5-b4da-fe996e2a5d33",
+                  "modelCustomizationName": "SR-IOV Provider 2-2",
+                  "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae"
+                },
+                "uuid": "01f4c475-3f89-4f00-a2f4-39a873dba0ae"
+              }
+            },
+            "vnfGroups": {},
+            "bulkSize": 1,
+            "instanceName": "myname",
+            "globalSubscriberId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "subscriptionServiceType": "LINDSEY",
+            "owningEntityId": "2d097967-10d4-4c7f-b23c-89978249ae17",
+            "projectName": null,
+            "rollbackOnFailure": "true",
+            "aicZoneName": null,
+            "owningEntityName": "CRAIG-ROBERTSELLANEOUS",
+            "testApi": "VNF_API",
+            "tenantName": null,
+            "modelInfo": {
+              "modelInvariantId": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
+              "modelVersionId": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
+              "modelName": "sgi_direct_net NC SRIOV network",
+              "modelVersion": "1.0",
+              "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a"
+            },
+            "isALaCarte": true,
+            "name": "sgi_direct_net NC SRIOV network",
+            "version": "1.0",
+            "description": "SRIOV network model for NC 1.0, VLAN ID 103",
+            "category": "Network Service",
+            "uuid": "2ab1da67-39cc-425f-ba52-59a64d0ea04a",
+            "invariantUuid": "712b3447-f096-42f6-ae4c-4bdc8988feb6",
+            "serviceType": "INFRASTRUCTURE",
+            "serviceRole": "PROVIDER-NETWORK",
+            "vidNotions": {
+              "instantiationUI": "networkWithPropertyNetworkTechnologyEqualsStandardSriovOrOvs",
+              "modelCategory": "5G Provider Network",
+              "viewEditUI": "legacy"
+            },
+            "isEcompGeneratedNaming": false,
+            "isMultiStepDesign": false
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "olson5a",
+              "name": "olson5a (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            },
+            {
+              "id": "olson5b",
+              "name": "olson5b (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            },
+            {
+              "id": "olson6a",
+              "name": "olson6a (AIC)",
+              "isPermitted": true,
+              "cloudOwner": "irma-aic"
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "olson5a": [
+              {
+                "id": "51e7dc5db9bb4c7b94766aacb8a3e72f",
+                "name": "Mobitools-FN-27099-T-01",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "d5b3c05cffa645dd9951bf2dd9ef5416",
+                "name": "Mobisupport-FN-27099-T-01",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ],
+            "olson5b": [
+              {
+                "id": "db1818f7f2e34862b378bfb2cc520f91",
+                "name": "Mobisupport-FN-27099-T-02",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ],
+            "olson6a": [
+              {
+                "id": "1dcd712850414fbd91f8a9fc9cca7fd4",
+                "name": "FNvEPC-27099-T-MS-olson6A",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              },
+              {
+                "id": "26af9ed85a004932822a607d5e9973d5",
+                "name": "ssf-28239-T-olson6A",
+                "isPermitted": true,
+                "cloudOwner": "irma-aic"
+              }
+            ]
+          }
+        },
+        "subscribers": [
           {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
           },
           {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
           },
           {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
           },
           {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": false
           },
           {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
+            "id": "VidE2ETest",
+            "name": "VidTest20161020",
+            "isPermitted": false
+          }
+        ],
+        "productFamilies": null,
+        "serviceTypes": {
+          "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb": [
+            {
+              "id": "22",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": true
+            },
+            {
+              "id": "11",
+              "name": "RAMSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "LINDSEY",
+              "isPermitted": true
+            },
+            {
+              "id": "6",
+              "name": "INFRASTRUCTURE",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "BROOKE-RODRIQUEZ",
+              "isPermitted": false
+            },
+            {
+              "id": "0",
+              "name": "Emanuel",
+              "isPermitted": true
+            },
+            {
+              "id": "15",
+              "name": "Kennedy",
+              "isPermitted": true
+            },
+            {
+              "id": "21",
+              "name": "SSD",
+              "isPermitted": true
+            },
+            {
+              "id": "18",
+              "name": "VPMS",
+              "isPermitted": true
+            },
+            {
+              "id": "1",
+              "name": "vJamie",
+              "isPermitted": true
+            },
+            {
+              "id": "27",
+              "name": "vEPDG",
+              "isPermitted": false
+            },
+            {
+              "id": "23",
+              "name": "vRichardson",
+              "isPermitted": true
+            },
+            {
+              "id": "7",
+              "name": "vGDF",
+              "isPermitted": false
+            },
+            {
+              "id": "2",
+              "name": "vCarroll",
+              "isPermitted": true
+            },
+            {
+              "id": "17",
+              "name": "vMGCF",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": true
+            },
+            {
+              "id": "25",
+              "name": "vWINIFRED",
+              "isPermitted": true
+            },
+            {
+              "id": "8",
+              "name": "vMNS",
+              "isPermitted": true
+            },
+            {
+              "id": "14",
+              "name": "vMOG",
+              "isPermitted": true
+            },
+            {
+              "id": "10",
+              "name": "vOTA",
+              "isPermitted": true
+            },
+            {
+              "id": "16",
+              "name": "vEsmeralda",
+              "isPermitted": true
+            },
+            {
+              "id": "24",
+              "name": "vPorfirio",
+              "isPermitted": true
+            },
+            {
+              "id": "12",
+              "name": "vSILB",
+              "isPermitted": false
+            },
+            {
+              "id": "19",
+              "name": "vSON",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vSSF",
+              "isPermitted": false
+            },
+            {
+              "id": "26",
+              "name": "vUDR",
+              "isPermitted": false
+            },
+            {
+              "id": "20",
+              "name": "vVM",
+              "isPermitted": true
+            },
+            {
+              "id": "5",
+              "name": "vVoiceMail",
+              "isPermitted": true
+            }
+          ]
+        },
+        "aicZones": null,
+        "categoryParameters": {
+          "owningEntityList": [
+            {
+              "id": "1ae27f5e-c0b3-4daf-8561-b25fc1c716e4",
+              "name": "AIC-ECOMP"
+            },
+            {
+              "id": "2e51ed6c-1fac-43d4-8f84-9ec405eb7f35",
+              "name": "ENTERTAINMENT-VIDEO"
+            },
+            {
+              "id": "2d097967-10d4-4c7f-b23c-89978249ae17",
+              "name": "CRAIG-ROBERTSELLANEOUS"
+            },
+            {
+              "id": "aedf37e2-acda-4976-b89b-fd6d4ddffbc6",
+              "name": "IP-COMMUNICATIONS"
+            },
+            {
+              "id": "9463675f-6a75-4cc8-8054-c6cb2e67ad51",
+              "name": "METRO-JULIO-ERICKSON"
+            },
+            {
+              "id": "92ddf9af-acae-484c-a786-ad7e9c0da26f",
+              "name": "EMANUEL-ACCESS"
+            },
+            {
+              "id": "10c645f5-9924-4b89-bec0-b17cf49d3cad",
+              "name": "EMANUEL-CORE"
+            },
+            {
+              "id": "048eb6e7-fa94-4f3b-ae03-3175a750dc57",
+              "name": "OPTICAL-TRANSPORT"
+            },
+            {
+              "id": "0efc70be-d674-4777-a0fa-329eae187ca0",
+              "name": "JULIO-ERICKSON"
+            },
+            {
+              "id": "0463287b-b133-46ef-a0f5-9ce62be3a053",
+              "name": "PREMISES"
+            },
+            {
+              "id": "ae4505ad-2961-4395-8659-df2253af4fa8",
+              "name": "WIRELINE-ACCESS"
+            }
+          ],
+          "projectList": [
+            {
+              "id": "G.FAST",
+              "name": "G.FAST"
+            },
+            {
+              "id": "GigaPower",
+              "name": "GigaPower"
+            },
+            {
+              "id": "Kennedy",
+              "name": "Kennedy"
+            },
+            {
+              "id": "Trinity",
+              "name": "Trinity"
+            },
+            {
+              "id": "USP",
+              "name": "USP"
+            }
+          ],
+          "lineOfBusinessList": [
+            {
+              "id": "",
+              "name": ""
+            },
+            {
+              "id": "ADI",
+              "name": "ADI"
+            },
+            {
+              "id": "ADIG",
+              "name": "ADIG"
+            },
+            {
+              "id": "PASQUALE",
+              "name": "PASQUALE"
+            },
+            {
+              "id": "AT&TLEGACYDATASERVICES",
+              "name": "AT&TLEGACYDATASERVICES"
+            },
+            {
+              "id": "AT&TSWITCHEDETHERNET",
+              "name": "AT&TSWITCHEDETHERNET"
+            },
+            {
+              "id": "AVPN",
+              "name": "AVPN"
+            },
+            {
+              "id": "AVPN-MOW",
+              "name": "AVPN-MOW"
+            },
+            {
+              "id": "CALEA",
+              "name": "CALEA"
+            },
+            {
+              "id": "COLLABORATE",
+              "name": "COLLABORATE"
+            },
+            {
+              "id": "DIRECT-TV",
+              "name": "DIRECT-TV"
+            },
+            {
+              "id": "LINDSEY",
+              "name": "LINDSEY"
+            },
+            {
+              "id": "FLEXWARE",
+              "name": "FLEXWARE"
+            },
+            {
+              "id": "INFRASTRUCTURE",
+              "name": "INFRASTRUCTURE"
+            },
+            {
+              "id": "IOT",
+              "name": "IOT"
+            },
+            {
+              "id": "IP-FLEXIBLE-REACH",
+              "name": "IP-FLEXIBLE-REACH"
+            },
+            {
+              "id": "IP-TOLL-FREE",
+              "name": "IP-TOLL-FREE"
+            },
+            {
+              "id": "EMANUEL-ABS",
+              "name": "EMANUEL-ABS"
+            },
+            {
+              "id": "EMANUEL-CONSUMER",
+              "name": "EMANUEL-CONSUMER"
+            },
+            {
+              "id": "EMANUEL-RESELLER",
+              "name": "EMANUEL-RESELLER"
+            },
+            {
+              "id": "NETBOND",
+              "name": "NETBOND"
+            },
+            {
+              "id": "SD-WAN",
+              "name": "SD-WAN"
+            },
+            {
+              "id": "UVERSE",
+              "name": "UVERSE"
+            },
+            {
+              "id": "UVERSE-VOICE",
+              "name": "UVERSE-VOICE"
+            },
+            {
+              "id": "VIRTUAL-EDGE",
+              "name": "VIRTUAL-EDGE"
+            },
+            {
+              "id": "VOLTE",
+              "name": "VOLTE"
+            }
+          ],
+          "platformList": [
+            {
+              "id": "3rdPartyCloud",
+              "name": "3rdPartyCloud"
+            },
+            {
+              "id": "ACCESS",
+              "name": "ACCESS"
+            },
+            {
+              "id": "AIC",
+              "name": "AIC"
+            },
+            {
+              "id": "APPLICATIONS-SERVICES",
+              "name": "APPLICATIONS-SERVICES"
+            },
+            {
+              "id": "BVOIP",
+              "name": "BVOIP"
+            },
+            {
+              "id": "CALEA-DEDICATED",
+              "name": "CALEA-DEDICATED"
+            },
+            {
+              "id": "CBB-MPLS-CORE",
+              "name": "CBB-MPLS-CORE"
+            },
+            {
+              "id": "D1",
+              "name": "D1"
+            },
+            {
+              "id": "D1.5",
+              "name": "D1.5"
+            },
+            {
+              "id": "EPC",
+              "name": "EPC"
+            },
+            {
+              "id": "FIRSTNET-DEDICATED",
+              "name": "FIRSTNET-DEDICATED"
+            },
+            {
+              "id": "IMS-USP",
+              "name": "IMS-USP"
+            },
+            {
+              "id": "IPAG",
+              "name": "IPAG"
+            },
+            {
+              "id": "MNS",
+              "name": "MNS"
+            },
+            {
+              "id": "NETWORK-CLOUD",
+              "name": "NETWORK-CLOUD"
+            },
+            {
+              "id": "RADIO-WIRELESSENGINEERING",
+              "name": "RADIO-WIRELESSENGINEERING"
+            },
+            {
+              "id": "RAN",
+              "name": "RAN"
+            },
+            {
+              "id": "UCPE",
+              "name": "UCPE"
+            },
+            {
+              "id": "VNI",
+              "name": "VNI"
+            }
+          ]
+        },
+        "type": "UPDATE_LCP_REGIONS_AND_TENANTS"
+      }
+    }
+  }
+
+  function getReduxWithVNFS(isEcompGeneratedNaming: boolean) {
+    return {
+      "global": {
+        "name": null,
+        "flags": {
+          "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false,
+          "FLAG_SHOW_ASSIGNMENTS": true,
+          "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true,
+          "FLAG_SHOW_VERIFY_SERVICE": false,
+          "FLAG_SERVICE_MODEL_CACHE": true,
+          "CREATE_INSTANCE_TEST": false,
+          "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": false,
+          "EMPTY_DRAWING_BOARD_TEST": false,
+          "FLAG_ADD_MSO_TESTAPI_FIELD": true,
+          "FLAG_SUPPLEMENTARY_FILE": true
+        },
+        "type": "[FLAGS] Update"
+      },
+      "service": {
+        "serviceHierarchy": {
+          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+            "service": {
+              "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+              "name": "ComplexService",
+              "version": "1.0",
+              "toscaModelURL": null,
+              "category": "Emanuel",
+              "serviceType": "",
+              "serviceRole": "",
+              "description": "ComplexService",
+              "serviceEcompNaming": "true",
+              "instantiationType": "Macro",
+              "vidNotions": {
+                "instantiationType": "Macro"
+              },
+              "inputs": {}
+            },
+            "vnfs": {
+              "VF_vGeraldine 0": {
+                "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+                "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
+                "description": "VSP_vGeraldine",
+                "name": "VF_vGeraldine",
+                "version": "2.0",
+                "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "max_instances": 10,
+                  "min_instances": 1,
+                  "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-egress_src_start_port": "0",
+                  "sctp-a-ipv6-egress_rule_application": "any",
+                  "Internal2_allow_transit": "true",
+                  "sctp-b-IPv6_ethertype": "IPv6",
+                  "sctp-a-egress_rule_application": "any",
+                  "sctp-b-ingress_action": "pass",
+                  "sctp-b-ingress_rule_protocol": "icmp",
+                  "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-ingress-src_start_port": "0.0",
+                  "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "fsb_volume_size_0": "320.0",
+                  "sctp-b-egress_src_addresses": "local",
+                  "sctp-a-ipv6-ingress_ethertype": "IPv4",
+                  "sctp-a-ipv6-ingress-dst_start_port": "0",
+                  "sctp-b-ipv6-ingress_rule_application": "any",
+                  "domain_name": "default-domain",
+                  "sctp-a-ingress_rule_protocol": "icmp",
+                  "sctp-b-egress-src_start_port": "0.0",
+                  "sctp-a-egress_src_addresses": "local",
+                  "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
+                  "sctp-a-egress-src_start_port": "0.0",
+                  "sctp-a-ingress_ethertype": "IPv4",
+                  "sctp-b-ipv6-ingress-dst_end_port": "65535",
+                  "sctp-b-dst_subnet_prefix_v6": "::",
+                  "nf_naming": "{ecomp_generated_naming=true}",
+                  "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+                  "sctp-b-egress-dst_start_port": "0.0",
+                  "ncb_flavor_name": "nv.c20r64d1",
+                  "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-egress_dst_subnet_prefix_len": "0.0",
+                  "Internal2_net_cidr": "10.0.0.10",
+                  "sctp-a-ingress-dst_start_port": "0.0",
+                  "sctp-a-egress-dst_start_port": "0.0",
+                  "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-egress_ethertype": "IPv4",
+                  "vlc_st_service_mode": "in-network-nat",
+                  "sctp-a-ipv6-egress_ethertype": "IPv4",
+                  "sctp-a-egress-src_end_port": "65535.0",
+                  "sctp-b-ipv6-egress_rule_application": "any",
+                  "sctp-b-egress_action": "pass",
+                  "sctp-a-ingress-src_subnet_prefix_len": "0.0",
+                  "sctp-b-ipv6-ingress-src_end_port": "65535.0",
+                  "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
+                  "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-ipv6-ingress-src_start_port": "0.0",
+                  "sctp-b-ipv6-egress_ethertype": "IPv4",
+                  "Internal1_net_cidr": "10.0.0.10",
+                  "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
+                  "fsb_flavor_name": "nv.c20r64d1",
+                  "sctp_rule_protocol": "132",
+                  "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
+                  "sctp-a-ipv6-ingress_rule_application": "any",
+                  "ecomp_generated_naming": isEcompGeneratedNaming.toString(),
+                  "sctp-a-IPv6_ethertype": "IPv6",
+                  "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_virtualization_type": "virtual-machine",
+                  "sctp-b-ingress-dst_start_port": "0.0",
+                  "sctp-b-ingress-dst_end_port": "65535.0",
+                  "sctp-a-ipv6-ingress-src_end_port": "65535.0",
+                  "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
+                  "sctp-b-ingress_rule_application": "any",
+                  "int2_sec_group_name": "int2-sec-group",
+                  "vlc_flavor_name": "nd.c16r64d1",
+                  "sctp-b-ipv6-egress_src_addresses": "local",
+                  "vlc_st_interface_type_int1": "other1",
+                  "sctp-b-egress-src_end_port": "65535.0",
+                  "sctp-a-ipv6-egress-dst_start_port": "0",
+                  "vlc_st_interface_type_int2": "other2",
+                  "sctp-a-ipv6-egress_rule_protocol": "any",
+                  "Internal2_shared": "false",
+                  "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
+                  "Internal2_rpf": "disable",
+                  "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ipv6-egress_src_end_port": "65535",
+                  "sctp-a-ipv6-egress_src_addresses": "local",
+                  "sctp-a-ingress-dst_end_port": "65535.0",
+                  "sctp-a-ipv6-egress_src_end_port": "65535",
+                  "Internal1_forwarding_mode": "l2",
+                  "Internal2_dhcp": "false",
+                  "sctp-a-dst_subnet_prefix_v6": "::",
+                  "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
+                  "vlc_st_interface_type_gtp": "other0",
+                  "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-src_subnet_prefix_v6": "::",
+                  "sctp-a-egress_dst_subnet_prefix_len": "0.0",
+                  "int1_sec_group_name": "int1-sec-group",
+                  "Internal1_dhcp": "false",
+                  "sctp-a-ipv6-egress_dst_end_port": "65535",
+                  "Internal2_forwarding_mode": "l2",
+                  "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
+                  "Internal1_net_cidr_len": "17",
+                  "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "sctp-b-ingress-src_subnet_prefix_len": "0.0",
+                  "sctp-a-ingress_dst_addresses": "local",
+                  "sctp-a-egress_action": "pass",
+                  "fsb_volume_type_0": "SF-Default-SSD",
+                  "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_interface_type_sctp_a": "left",
+                  "vlc_st_interface_type_sctp_b": "right",
+                  "sctp-a-src_subnet_prefix_v6": "::",
+                  "vlc_st_version": "2",
+                  "sctp-b-egress_ethertype": "IPv4",
+                  "sctp-a-ingress_rule_application": "any",
+                  "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "instance_ip_family_v6": "v6",
+                  "sctp-a-ipv6-egress_src_start_port": "0",
+                  "sctp-b-ingress-src_start_port": "0.0",
+                  "sctp-b-ingress_dst_addresses": "local",
+                  "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_interface_type_oam": "management",
+                  "multi_stage_design": "false",
+                  "oam_sec_group_name": "oam-sec-group",
+                  "Internal2_net_gateway": "10.0.0.10",
+                  "sctp-a-ipv6-ingress-dst_end_port": "65535",
+                  "sctp-b-ipv6-egress-dst_start_port": "0",
+                  "Internal1_net_gateway": "10.0.0.10",
+                  "sctp-b-ipv6-egress_rule_protocol": "any",
+                  "gtp_sec_group_name": "gtp-sec-group",
+                  "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+                  "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
+                  "sctp-a-ipv6-ingress_dst_addresses": "local",
+                  "sctp-a-egress_rule_protocol": "icmp",
+                  "sctp-b-ipv6-egress_action": "pass",
+                  "sctp-a-ipv6-egress_action": "pass",
+                  "Internal1_shared": "false",
+                  "sctp-b-ipv6-ingress_rule_protocol": "any",
+                  "Internal2_net_cidr_len": "17",
+                  "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
+                  "sctp-a-ingress-src_end_port": "65535.0",
+                  "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-egress-dst_end_port": "65535.0",
+                  "sctp-a-ingress_action": "pass",
+                  "sctp-b-egress_rule_protocol": "icmp",
+                  "sctp-b-ipv6-ingress_action": "pass",
+                  "vlc_st_service_type": "firewall",
+                  "sctp-b-ipv6-egress_dst_end_port": "65535",
+                  "sctp-b-ipv6-ingress-dst_start_port": "0",
+                  "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "vlc_st_availability_zone": "true",
+                  "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
+                  "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
+                  "Internal1_allow_transit": "true",
+                  "gpb_flavor_name": "nv.c20r64d1",
+                  "availability_zone_max_count": "1",
+                  "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
+                  "sctp-b-ipv6-ingress_dst_addresses": "local",
+                  "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+                  "sctp-b-ipv6-ingress_ethertype": "IPv4",
+                  "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
+                  "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
+                  "sctp-a-ipv6-ingress_action": "pass",
+                  "Internal1_rpf": "disable",
+                  "sctp-b-ingress_ethertype": "IPv4",
+                  "sctp-b-egress_rule_application": "any",
+                  "sctp-b-ingress-src_end_port": "65535.0",
+                  "sctp-a-ipv6-ingress_rule_protocol": "any",
+                  "sctp-a-ingress-src_start_port": "0.0",
+                  "sctp-b-egress-dst_end_port": "65535.0"
+                },
+                "type": "VF",
+                "modelCustomizationName": "VF_vGeraldine 0",
+                "vfModules": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                    "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+                    "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+                    "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+                    "description": null,
+                    "name": "VfVgeraldine..vflorence_vlc..module-1",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "vflorence_vlc"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+                    "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+                    "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+                    "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+                    "description": null,
+                    "name": "VfVgeraldine..vflorence_gpb..module-2",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+                    "properties": {
+                      "minCountInstances": 0,
+                      "maxCountInstances": null,
+                      "initialCount": 0,
+                      "vfModuleLabel": "vflorence_gpb"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": false
+                  },
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                    "description": null,
+                    "name": "VfVgeraldine..base_vflorence..module-0",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "base_vflorence"
+                    },
+                    "inputs": {},
+                    "volumeGroupAllowed": true
+                  }
+                },
+                "volumeGroups": {
+                  "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                    "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                    "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                    "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                    "description": null,
+                    "name": "VfVgeraldine..base_vflorence..module-0",
+                    "version": "2",
+                    "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                    "properties": {
+                      "minCountInstances": 1,
+                      "maxCountInstances": 1,
+                      "initialCount": 1,
+                      "vfModuleLabel": "base_vflorence"
+                    },
+                    "inputs": {}
+                  }
+                },
+                "vfcInstanceGroups": {}
+              }
+            },
+            "networks": {
+              "ExtVL 0": {
+                "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+                "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+                "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+                "name": "ExtVL",
+                "version": "37.0",
+                "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+                "inputs": {},
+                "commands": {},
+                "properties": {
+                  "ecomp_generated_naming": "false",
+                  "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+                  "exVL_naming": "{ecomp_generated_naming=true}",
+                  "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+                  "network_homing": "{ecomp_selected_instance_node_target=false}"
+                },
+                "type": "VL",
+                "modelCustomizationName": "ExtVL 0"
+              }
+            },
+            "collectionResources": {},
+            "configurations": {
+              "Port Mirroring Configuration By Policy 0": {
+                "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
+                "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
+                "description": "A port mirroring configuration by policy object",
+                "name": "Port Mirroring Configuration By Policy",
+                "version": "27.0",
+                "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
+                "inputs": {},
+                "commands": {},
+                "properties": {},
+                "type": "Configuration",
+                "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
+                "sourceNodes": [],
+                "collectorNodes": null,
+                "configurationByPolicy": false
+              }
+            },
+            "serviceProxies": {},
+            "vfModules": {
+              "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+                "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+                "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+                "description": null,
+                "name": "VfVgeraldine..vflorence_vlc..module-1",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "vflorence_vlc"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+                "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+                "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+                "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+                "description": null,
+                "name": "VfVgeraldine..vflorence_gpb..module-2",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+                "properties": {
+                  "minCountInstances": 0,
+                  "maxCountInstances": null,
+                  "initialCount": 0,
+                  "vfModuleLabel": "vflorence_gpb"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": false
+              },
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                "description": null,
+                "name": "VfVgeraldine..base_vflorence..module-0",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "base_vflorence"
+                },
+                "inputs": {},
+                "volumeGroupAllowed": true
+              }
+            },
+            "volumeGroups": {
+              "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+                "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+                "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+                "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+                "description": null,
+                "name": "VfVgeraldine..base_vflorence..module-0",
+                "version": "2",
+                "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+                "properties": {
+                  "minCountInstances": 1,
+                  "maxCountInstances": 1,
+                  "initialCount": 1,
+                  "vfModuleLabel": "base_vflorence"
+                },
+                "inputs": {}
+              }
+            },
+            "pnfs": {}
+          }
+        },
+        "serviceInstance": {
+          "6e59c5de-f052-46fa-aa7e-2fca9d674c44": {
+            "vnfs": {
+              "VF_vGeraldine 0": {
+                "originalName": "VF_vGeraldine 0",
+                "rollbackOnFailure": "true",
+                "instanceName": "",
+                "vfModules": {
+                  "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+                    "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1dcudx": {
+                      "modelInfo": {
+                        "modelInvariantId": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+                        "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+                        "modelName": "VfVgeraldine..vflorence_vlc..module-1",
+                        "modelVersion": "2",
+                        "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
+                        "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1"
+                      },
+                      "isMissingData": false,
+                      "supplementaryFile": "C:\\fakepath\\sample.json",
+                      "supplementaryFile_hidden": {},
+                      "supplementaryFile_hidden_content": "{\r\n  \"name\": \"a\",\r\n  \"value\": \"32\"\r\n}",
+                      "supplementaryFileContent": {
+                        "name": "a",
+                          "value": "32"
+                      },
+                      "supplementaryFileName": "sample.json",
+                      "instanceParams": [
+                        {}
+                      ]
+                    }
+                  }
+                },
+                "isMissingData": false,
+                "modelName": "VF_vGeraldine 0",
+                "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+                "lcpCloudRegionId": "hvf6",
+                "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "lineOfBusiness": "zzz1",
+                "platformName": "platform",
+                "modelInfo": {
+                  "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
+                  "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+                  "modelName": "VF_vGeraldine",
+                  "modelVersion": "2.0",
+                  "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+                  "modelCustomizationName": "VF_vGeraldine 0"
+                },
+                "legacyRegion": null
+              }
+            },
+            "networks": {},
+            "instanceParams": [
+              {}
+            ],
+            "validationCounter": 0,
+            "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+            "subscriptionServiceType": "TYLER SILVIA",
+            "lcpCloudRegionId": "hvf6",
+            "tenantId": "1178612d2b394be4834ad77f567c0af2",
+            "aicZoneId": "YYY1",
+            "projectName": "yyy1",
+            "owningEntityId": "aaa1",
+            "owningEntityName": "aaa1",
+            "rollbackOnFailure": "true",
+            "isALaCarte": false,
+            "bulkSize": 1,
+            "modelInfo": {
+              "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+              "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+              "modelName": "ComplexService",
+              "modelVersion": "1.0"
+            },
+            "instanceName": "",
+            "existingNames": {
+              "serviceinstancename": "",
+              "vfvgeraldine00001": ""
+            },
+            "existingVNFCounterMap": {
+              "91415b44-753d-494c-926a-456a9172bbb9": 1
+            },
+            "existingNetworksCounterMap": {},
+            "tenantName": "AIN Web Tool-15-D-SSPtestcustome",
+            "aicZoneName": "UUUAIAAI-YYY1"
+          }
+        },
+        "lcpRegionsAndTenants": {
+          "lcpRegionList": [
+            {
+              "id": "AAIAIC25",
+              "name": "AAIAIC25",
+              "isPermitted": true
+            },
+            {
+              "id": "hvf6",
+              "name": "hvf6",
+              "isPermitted": true
+            }
+          ],
+          "lcpRegionsTenantsMap": {
+            "AAIAIC25": [
+              {
+                "id": "092eb9e8e4b7412e8787dd091bc58e86",
+                "name": "USP-SIP-IC-24335-T-01",
+                "isPermitted": true
+              }
+            ],
+            "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true
+              },
+              {
+                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
+                "name": "AIN Web Tool-15-D-STTest2",
+                "isPermitted": true
+              },
+              {
+                "id": "1178612d2b394be4834ad77f567c0af2",
+                "name": "AIN Web Tool-15-D-SSPtestcustome",
+                "isPermitted": true
+              },
+              {
+                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
+                "name": "AIN Web Tool-15-D-UncheckedEcopm",
+                "isPermitted": true
+              },
+              {
+                "id": "de007636e25249238447264a988a927b",
+                "name": "AIN Web Tool-15-D-dfsdf",
+                "isPermitted": true
+              },
+              {
+                "id": "62f29b3613634ca6a3065cbe0e020c44",
+                "name": "AIN/SMS-16-D-Multiservices1",
+                "isPermitted": true
+              },
+              {
+                "id": "649289e30d3244e0b48098114d63c2aa",
+                "name": "AIN Web Tool-15-D-SSPST66",
+                "isPermitted": true
+              },
+              {
+                "id": "3f21eeea6c2c486bba31dab816c05a32",
+                "name": "AIN Web Tool-15-D-ASSPST47",
+                "isPermitted": true
+              },
+              {
+                "id": "f60ce21d3ee6427586cff0d22b03b773",
+                "name": "CESAR-100-D-sspjg67246",
+                "isPermitted": true
+              },
+              {
+                "id": "8774659e425f479895ae091bb5d46560",
+                "name": "CESAR-100-D-sspjg68359",
+                "isPermitted": true
+              },
+              {
+                "id": "624eb554b0d147c19ff8885341760481",
+                "name": "AINWebTool-15-D-iftach",
+                "isPermitted": true
+              },
+              {
+                "id": "214f55f5fc414c678059c383b03e4962",
+                "name": "CESAR-100-D-sspjg612401",
+                "isPermitted": true
+              },
+              {
+                "id": "c90666c291664841bb98e4d981ff1db5",
+                "name": "CESAR-100-D-sspjg621340",
+                "isPermitted": true
+              },
+              {
+                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
+                "name": "sspjg621351cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "b386b768a3f24c8e953abbe0b3488c02",
+                "name": "AINWebTool-15-D-eteancomp",
+                "isPermitted": true
+              },
+              {
+                "id": "dc6c4dbfd225474e9deaadd34968646c",
+                "name": "AINWebTool-15-T-SPFET",
+                "isPermitted": true
+              },
+              {
+                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
+                "name": "AINWebTool-15-X-eeweww",
+                "isPermitted": true
+              },
+              {
+                "id": "f2f3830e4c984d45bcd00e1a04158a79",
+                "name": "CESAR-100-D-spjg61909",
+                "isPermitted": true
+              },
+              {
+                "id": "05b91bd5137f4929878edd965755c06d",
+                "name": "CESAR-100-D-sspjg621512cloned",
+                "isPermitted": true
+              },
+              {
+                "id": "7002fbe8482d4a989ddf445b1ce336e0",
+                "name": "AINWebTool-15-X-vdr",
+                "isPermitted": true
+              },
+              {
+                "id": "4008522be43741dcb1f5422022a2aa0b",
+                "name": "AINWebTool-15-D-ssasa",
+                "isPermitted": true
+              },
+              {
+                "id": "f44e2e96a1b6476abfda2fa407b00169",
+                "name": "AINWebTool-15-D-PFNPT",
+                "isPermitted": true
+              },
+              {
+                "id": "b69a52bec8a84669a37a1e8b72708be7",
+                "name": "AINWebTool-15-X-vdre",
+                "isPermitted": true
+              },
+              {
+                "id": "fac7d9fd56154caeb9332202dcf2969f",
+                "name": "AINWebTool-15-X-NONPODECOMP",
+                "isPermitted": true
+              },
+              {
+                "id": "2d34d8396e194eb49969fd61ffbff961",
+                "name": "DN5242-Nov16-T5",
+                "isPermitted": true
+              },
+              {
+                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
+                "name": "ro-T11",
+                "isPermitted": true
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true
+              },
+              {
+                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
+                "name": "DN5242-Nov21-T1",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true
+              }
+            ]
+          }
+        },
+        "subscribers": [
           {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
+            "id": "CAR_2020_ER",
+            "name": "CAR_2020_ER",
+            "isPermitted": true
           },
           {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
+            "id": "21014aa2-526b-11e6-beb8-9e71128cae77",
+            "name": "JULIO ERICKSON",
+            "isPermitted": false
           },
           {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
+            "id": "DHV1707-TestSubscriber-2",
+            "name": "DALE BRIDGES",
+            "isPermitted": false
           },
           {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
+            "id": "DHV1707-TestSubscriber-1",
+            "name": "LLOYD BRIDGES",
+            "isPermitted": false
           },
           {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
+            "id": "jimmy-example",
+            "name": "JimmyExampleCust-20161102",
+            "isPermitted": false
           },
           {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
+            "id": "jimmy-example2",
+            "name": "JimmyExampleCust-20161103",
+            "isPermitted": false
           },
           {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
+            "id": "ERICA5779-TestSub-PWT-102",
+            "name": "ERICA5779-TestSub-PWT-102",
+            "isPermitted": false
           },
           {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
+            "id": "ERICA5779-TestSub-PWT-101",
+            "name": "ERICA5779-TestSub-PWT-101",
+            "isPermitted": false
           },
           {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": false
           },
           {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
+            "id": "ERICA5779-Subscriber-4",
+            "name": "ERICA5779-Subscriber-5",
+            "isPermitted": false
           },
           {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
+            "id": "ERICA5779-TestSub-PWT-103",
+            "name": "ERICA5779-TestSub-PWT-103",
+            "isPermitted": false
           },
           {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
+            "id": "ERICA5779-Subscriber-2",
+            "name": "ERICA5779-Subscriber-2",
+            "isPermitted": false
           },
           {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "SILVIA ROBBINS",
+            "isPermitted": true
           },
           {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
+            "id": "ERICA5779-Subscriber-3",
+            "name": "ERICA5779-Subscriber-3",
+            "isPermitted": false
           },
           {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
+            "id": "31739f3e-526b-11e6-beb8-9e71128cae77",
+            "name": "CRAIG/ROBERTS",
+            "isPermitted": false
+          }
+        ],
+        "productFamilies": [
           {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
+            "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+            "name": "ERICA",
+            "isPermitted": true
           },
           {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
+            "id": "17cc1042-527b-11e6-beb8-9e71128cae77",
+            "name": "IGNACIO",
+            "isPermitted": true
           },
           {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
+            "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+            "name": "Christie",
+            "isPermitted": true
           },
           {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
+            "id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7",
+            "name": "Enhanced Services",
+            "isPermitted": true
           },
           {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
+            "id": "vTerrance",
+            "name": "vTerrance",
+            "isPermitted": true
           },
           {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
+            "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f",
+            "name": "vEsmeralda",
+            "isPermitted": true
           },
           {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
+            "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+            "name": "Emanuel",
+            "isPermitted": true
           },
           {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
+            "id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c",
+            "name": "BVOIP",
+            "isPermitted": true
           },
           {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
+            "id": "db171b8f-115c-4992-a2e3-ee04cae357e0",
+            "name": "LINDSEY",
+            "isPermitted": true
           },
           {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
+            "id": "LRSI-OSPF",
+            "name": "LRSI-OSPF",
+            "isPermitted": true
           },
           {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
+            "id": "vRosemarie",
+            "name": "HNGATEWAY",
+            "isPermitted": true
           },
           {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
+            "id": "vHNPaas",
+            "name": "WILKINS",
+            "isPermitted": true
           },
           {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
+            "id": "e433710f-9217-458d-a79d-1c7aff376d89",
+            "name": "TYLER SILVIA",
+            "isPermitted": true
           },
           {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
+            "id": "b6a3f28c-eebf-494c-a900-055cc7c874ce",
+            "name": "VROUTER",
+            "isPermitted": true
           },
           {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
+            "id": "vMuriel",
+            "name": "vMuriel",
+            "isPermitted": true
           },
           {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
+            "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1",
+            "name": "CARA Griffin",
+            "isPermitted": true
           },
           {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
+            "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d",
+            "name": "DARREN MCGEE",
+            "isPermitted": true
           },
           {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
+            "id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1",
+            "name": "Transport",
+            "isPermitted": true
           },
           {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
+            "id": "vSalvatore",
+            "name": "vSalvatore",
+            "isPermitted": true
           },
           {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
+            "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4",
+            "name": "JOSEFINA",
+            "isPermitted": true
           },
           {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
+            "id": "vHubbard",
+            "name": "vHubbard",
+            "isPermitted": true
           },
           {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
+            "id": "12a96a9d-4b4c-4349-a950-fe1159602621",
+            "name": "DARREN MCGEE",
+            "isPermitted": true
+          }
+        ],
+        "serviceTypes": {
+          "e433710f-9217-458d-a79d-1c7aff376d89": [
+            {
+              "id": "0",
+              "name": "vRichardson",
+              "isPermitted": false
+            },
+            {
+              "id": "1",
+              "name": "TYLER SILVIA",
+              "isPermitted": true
+            },
+            {
+              "id": "2",
+              "name": "Emanuel",
+              "isPermitted": false
+            },
+            {
+              "id": "3",
+              "name": "vJamie",
+              "isPermitted": false
+            },
+            {
+              "id": "4",
+              "name": "vVoiceMail",
+              "isPermitted": false
+            },
+            {
+              "id": "5",
+              "name": "Kennedy",
+              "isPermitted": false
+            },
+            {
+              "id": "6",
+              "name": "vPorfirio",
+              "isPermitted": false
+            },
+            {
+              "id": "7",
+              "name": "vVM",
+              "isPermitted": false
+            },
+            {
+              "id": "8",
+              "name": "vOTA",
+              "isPermitted": false
+            },
+            {
+              "id": "9",
+              "name": "vFLORENCE",
+              "isPermitted": false
+            },
+            {
+              "id": "10",
+              "name": "vMNS",
+              "isPermitted": false
+            },
+            {
+              "id": "11",
+              "name": "vEsmeralda",
+              "isPermitted": false
+            },
+            {
+              "id": "12",
+              "name": "VPMS",
+              "isPermitted": false
+            },
+            {
+              "id": "13",
+              "name": "vWINIFRED",
+              "isPermitted": false
+            },
+            {
+              "id": "14",
+              "name": "SSD",
+              "isPermitted": false
+            },
+            {
+              "id": "15",
+              "name": "vMOG",
+              "isPermitted": false
+            },
+            {
+              "id": "16",
+              "name": "LINDSEY",
+              "isPermitted": false
+            },
+            {
+              "id": "17",
+              "name": "JOHANNA_SANTOS",
+              "isPermitted": false
+            },
+            {
+              "id": "18",
+              "name": "vCarroll",
+              "isPermitted": false
+            }
+          ]
+        },
+        "aicZones": [
           {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
           },
           {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
           },
           {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
           },
           {
             "id": "AVT1",
index c730dc7..ec471ae 100644 (file)
@@ -1821,128 +1821,8 @@ describe('Network popup', function () {
                   "isPermitted": true
                 },
                 {
-                  "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                  "name": "AIN Web Tool-15-D-STTest2",
-                  "isPermitted": true
-                },
-                {
-                  "id": "1178612d2b394be4834ad77f567c0af2",
-                  "name": "AIN Web Tool-15-D-SSPtestcustome",
-                  "isPermitted": true
-                },
-                {
-                  "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                  "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                  "isPermitted": true
-                },
-                {
-                  "id": "de007636e25249238447264a988a927b",
-                  "name": "AIN Web Tool-15-D-dfsdf",
-                  "isPermitted": true
-                },
-                {
-                  "id": "62f29b3613634ca6a3065cbe0e020c44",
-                  "name": "AIN/SMS-16-D-Multiservices1",
-                  "isPermitted": true
-                },
-                {
-                  "id": "649289e30d3244e0b48098114d63c2aa",
-                  "name": "AIN Web Tool-15-D-SSPST66",
-                  "isPermitted": true
-                },
-                {
-                  "id": "3f21eeea6c2c486bba31dab816c05a32",
-                  "name": "AIN Web Tool-15-D-ASSPST47",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f60ce21d3ee6427586cff0d22b03b773",
-                  "name": "CESAR-100-D-sspjg67246",
-                  "isPermitted": true
-                },
-                {
-                  "id": "8774659e425f479895ae091bb5d46560",
-                  "name": "CESAR-100-D-sspjg68359",
-                  "isPermitted": true
-                },
-                {
-                  "id": "624eb554b0d147c19ff8885341760481",
-                  "name": "AINWebTool-15-D-iftach",
-                  "isPermitted": true
-                },
-                {
-                  "id": "214f55f5fc414c678059c383b03e4962",
-                  "name": "CESAR-100-D-sspjg612401",
-                  "isPermitted": true
-                },
-                {
-                  "id": "c90666c291664841bb98e4d981ff1db5",
-                  "name": "CESAR-100-D-sspjg621340",
-                  "isPermitted": true
-                },
-                {
-                  "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                  "name": "sspjg621351cloned",
-                  "isPermitted": true
-                },
-                {
-                  "id": "b386b768a3f24c8e953abbe0b3488c02",
-                  "name": "AINWebTool-15-D-eteancomp",
-                  "isPermitted": true
-                },
-                {
-                  "id": "dc6c4dbfd225474e9deaadd34968646c",
-                  "name": "AINWebTool-15-T-SPFET",
-                  "isPermitted": true
-                },
-                {
-                  "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                  "name": "AINWebTool-15-X-eeweww",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                  "name": "CESAR-100-D-spjg61909",
-                  "isPermitted": true
-                },
-                {
-                  "id": "05b91bd5137f4929878edd965755c06d",
-                  "name": "CESAR-100-D-sspjg621512cloned",
-                  "isPermitted": true
-                },
-                {
-                  "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                  "name": "AINWebTool-15-X-vdr",
-                  "isPermitted": true
-                },
-                {
-                  "id": "4008522be43741dcb1f5422022a2aa0b",
-                  "name": "AINWebTool-15-D-ssasa",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f44e2e96a1b6476abfda2fa407b00169",
-                  "name": "AINWebTool-15-D-PFNPT",
-                  "isPermitted": true
-                },
-                {
-                  "id": "b69a52bec8a84669a37a1e8b72708be7",
-                  "name": "AINWebTool-15-X-vdre",
-                  "isPermitted": true
-                },
-                {
-                  "id": "fac7d9fd56154caeb9332202dcf2969f",
-                  "name": "AINWebTool-15-X-NONPODECOMP",
-                  "isPermitted": true
-                },
-                {
-                  "id": "2d34d8396e194eb49969fd61ffbff961",
-                  "name": "DN5242-Nov16-T5",
-                  "isPermitted": true
-                },
-                {
-                  "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                  "name": "ro-T11",
+                  "id": "d0a3e3f2964542259d155a81c41aadc3",
+                  "name": "test-hvf6-09",
                   "isPermitted": true
                 },
                 {
@@ -1950,16 +1830,6 @@ describe('Network popup', function () {
                   "name": "ro-T112",
                   "isPermitted": true
                 },
-                {
-                  "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                  "name": "DN5242-Nov21-T1",
-                  "isPermitted": true
-                },
-                {
-                  "id": "d0a3e3f2964542259d155a81c41aadc3",
-                  "name": "test-hvf6-09",
-                  "isPermitted": true
-                },
                 {
                   "id": "cbb99fe4ada84631b7baf046b6fd2044",
                   "name": "DN5242-Nov16-T3",
@@ -2192,754 +2062,6 @@ describe('Network popup', function () {
               "id": "YYY1",
               "name": "UUUAIAAI-YYY1"
             },
-            {
-              "id": "BAN1",
-              "name": "VSDKYUTP-BAN1"
-            },
-            {
-              "id": "DKJ1",
-              "name": "DKJSJDKA-DKJ1"
-            },
-            {
-              "id": "MCS1",
-              "name": "ASACMAMS-MCS1"
-            },
-            {
-              "id": "UIO1",
-              "name": "uioclli1-UIO1"
-            },
-            {
-              "id": "RAJ1",
-              "name": "YGBIJNLQ-RAJ1"
-            },
-            {
-              "id": "OPA1",
-              "name": "opaclli1-OPA1"
-            },
-            {
-              "id": "SDE1",
-              "name": "ZXCVBNMA-SDE1"
-            },
-            {
-              "id": "VEN2",
-              "name": "FGHJUHIL-VEN2"
-            },
-            {
-              "id": "ORL1",
-              "name": "ORLDFLMA-ORL1"
-            },
-            {
-              "id": "JAD1",
-              "name": "JADECLLI-JAD1"
-            },
-            {
-              "id": "ZXL1",
-              "name": "LWLWCANN-ZXL1"
-            },
-            {
-              "id": "CKL1",
-              "name": "CLKSKCKK-CKL1"
-            },
-            {
-              "id": "SDF1",
-              "name": "sdfclli1-SDF1"
-            },
-            {
-              "id": "RAD1",
-              "name": "RADICAL1-RAD1"
-            },
-            {
-              "id": "KIT1",
-              "name": "BHYJFGLN-KIT1"
-            },
-            {
-              "id": "REL1",
-              "name": "INGERFGT-REL1"
-            },
-            {
-              "id": "JNL1",
-              "name": "CJALSDAC-JNL1"
-            },
-            {
-              "id": "OLK1",
-              "name": "OLKOLKLS-OLK1"
-            },
-            {
-              "id": "CHI1",
-              "name": "CHILLIWE-CHI1"
-            },
-            {
-              "id": "UUU4",
-              "name": "UUUAAAUU-UUU4"
-            },
-            {
-              "id": "TUF1",
-              "name": "TUFCLLI1-TUF1"
-            },
-            {
-              "id": "KJN1",
-              "name": "CKALDKSA-KJN1"
-            },
-            {
-              "id": "SAM1",
-              "name": "SNDGCA64-SAN1"
-            },
-            {
-              "id": "SCK1",
-              "name": "SCKSCKSK-SCK1"
-            },
-            {
-              "id": "HJH1",
-              "name": "AOEEQQQD-HJH1"
-            },
-            {
-              "id": "HGD1",
-              "name": "SDFQWHGD-HGD1"
-            },
-            {
-              "id": "KOR1",
-              "name": "HYFLNBVT-KOR1"
-            },
-            {
-              "id": "ATL43",
-              "name": "AICLOCID-ATL43"
-            },
-            {
-              "id": "ATL54",
-              "name": "AICFTAAI-ATL54"
-            },
-            {
-              "id": "ATL66",
-              "name": "CLLIAAII-ATL66"
-            },
-            {
-              "id": "VEL1",
-              "name": "BNMLKUIK-VEL1"
-            },
-            {
-              "id": "ICC1",
-              "name": "SANJITAT-ICC1"
-            },
-            {
-              "id": "MNT11",
-              "name": "WSXEFBTH-MNT11"
-            },
-            {
-              "id": "DEF2",
-              "name": "WSBHGTYL-DEF2"
-            },
-            {
-              "id": "MAD11",
-              "name": "SDFQWGKL-MAD11"
-            },
-            {
-              "id": "OLG1",
-              "name": "OLHOLHOL-OLG1"
-            },
-            {
-              "id": "GAR1",
-              "name": "NGFVSJKO-GAR1"
-            },
-            {
-              "id": "SAN22",
-              "name": "GNVLSCTL-SAN22"
-            },
-            {
-              "id": "HRG1",
-              "name": "HRGHRGGS-HRG1"
-            },
-            {
-              "id": "JCS1",
-              "name": "JCSJSCJS-JCS1"
-            },
-            {
-              "id": "DHA12",
-              "name": "WSXEDECF-DHA12"
-            },
-            {
-              "id": "HJE1",
-              "name": "AOEEWWWD-HJE1"
-            },
-            {
-              "id": "NCA1",
-              "name": "NCANCANN-NCA1"
-            },
-            {
-              "id": "IOP1",
-              "name": "iopclli1-IOP1"
-            },
-            {
-              "id": "RTY1",
-              "name": "rtyclli1-RTY1"
-            },
-            {
-              "id": "KAP1",
-              "name": "HIOUYTRQ-KAP1"
-            },
-            {
-              "id": "ZEN1",
-              "name": "ZENCLLI1-ZEN1"
-            },
-            {
-              "id": "HKA1",
-              "name": "JAKHLASS-HKA1"
-            },
-            {
-              "id": "CQK1",
-              "name": "CQKSCAKK-CQK1"
-            },
-            {
-              "id": "SAI1",
-              "name": "UBEKQLPD-SAI1"
-            },
-            {
-              "id": "ERT1",
-              "name": "ertclli1-ERT1"
-            },
-            {
-              "id": "IBB1",
-              "name": "PLMKOIJU-IBB1"
-            },
-            {
-              "id": "TIR2",
-              "name": "PLKINHYI-TIR2"
-            },
-            {
-              "id": "HSD1",
-              "name": "CHASKCDS-HSD1"
-            },
-            {
-              "id": "SLF78",
-              "name": "SDCTLFN1-SLF78"
-            },
-            {
-              "id": "SEE78",
-              "name": "SDCTEEE4-SEE78"
-            },
-            {
-              "id": "SAN13",
-              "name": "TOKYJPFA-SAN13"
-            },
-            {
-              "id": "SAA78",
-              "name": "SDCTAAA1-SAA78"
-            },
-            {
-              "id": "LUC1",
-              "name": "ATLDFGYC-LUC1"
-            },
-            {
-              "id": "AMD13",
-              "name": "MEMATLAN-AMD13"
-            },
-            {
-              "id": "TOR1",
-              "name": "TOROONXN-TOR1"
-            },
-            {
-              "id": "QWE1",
-              "name": "QWECLLI1-QWE1"
-            },
-            {
-              "id": "ZOG1",
-              "name": "ZOGASTRO-ZOG1"
-            },
-            {
-              "id": "CAL33",
-              "name": "CALIFORN-CAL33"
-            },
-            {
-              "id": "SHH78",
-              "name": "SDIT1HHH-SHH78"
-            },
-            {
-              "id": "DSA1",
-              "name": "LKJHGFDS-DSA1"
-            },
-            {
-              "id": "CLG1",
-              "name": "CLGRABAD-CLG1"
-            },
-            {
-              "id": "BNA1",
-              "name": "BNARAGBK-BNA1"
-            },
-            {
-              "id": "ATL84",
-              "name": "CANTTCOC-ATL84"
-            },
-            {
-              "id": "APP1",
-              "name": "WBHGTYUI-APP1"
-            },
-            {
-              "id": "RJN1",
-              "name": "RJNRBZAW-RJN1"
-            },
-            {
-              "id": "EHH78",
-              "name": "SDCSHHH5-EHH78"
-            },
-            {
-              "id": "mac10",
-              "name": "PKGTESTF-mac10"
-            },
-            {
-              "id": "SXB78",
-              "name": "SDCTGXB1-SXB78"
-            },
-            {
-              "id": "SAX78",
-              "name": "SDCTAXG1-SAX78"
-            },
-            {
-              "id": "SYD1",
-              "name": "SYDNAUBV-SYD1"
-            },
-            {
-              "id": "TOK1",
-              "name": "TOKYJPFA-TOK1"
-            },
-            {
-              "id": "KGM2",
-              "name": "KGMTNC20-KGM2"
-            },
-            {
-              "id": "DCC1b",
-              "name": "POIUYTGH-DCC1b"
-            },
-            {
-              "id": "SKK78",
-              "name": "SDCTKKK1-SKK78"
-            },
-            {
-              "id": "SGG78",
-              "name": "SDCTGGG1-SGG78"
-            },
-            {
-              "id": "SJJ78",
-              "name": "SDCTJJJ1-SJJ78"
-            },
-            {
-              "id": "SBX78",
-              "name": "SDCTBXG1-SBX78"
-            },
-            {
-              "id": "LAG1",
-              "name": "LARGIZON-LAG1"
-            },
-            {
-              "id": "IAA1",
-              "name": "QAZXSWED-IAA1"
-            },
-            {
-              "id": "POI1",
-              "name": "PLMNJKIU-POI1"
-            },
-            {
-              "id": "LAG1a",
-              "name": "LARGIZON-LAG1a"
-            },
-            {
-              "id": "PBL1",
-              "name": "PBLAPBAI-PBL1"
-            },
-            {
-              "id": "LAG45",
-              "name": "LARGIZON-LAG1a"
-            },
-            {
-              "id": "MAR1",
-              "name": "MNBVCXZM-MAR1"
-            },
-            {
-              "id": "HST70",
-              "name": "HSTNTX70-HST70"
-            },
-            {
-              "id": "DCC1a",
-              "name": "POIUYTGH-DCC1a"
-            },
-            {
-              "id": "TOL1",
-              "name": "TOLDOH21-TOL1"
-            },
-            {
-              "id": "LON1",
-              "name": "LONEENCO-LON1"
-            },
-            {
-              "id": "SJU78",
-              "name": "SDIT1JUB-SJU78"
-            },
-            {
-              "id": "STN27",
-              "name": "HSTNTX01-STN27"
-            },
-            {
-              "id": "SSW56",
-              "name": "ss8126GT-SSW56"
-            },
-            {
-              "id": "SBB78",
-              "name": "SDIT1BBB-SBB78"
-            },
-            {
-              "id": "DCC3",
-              "name": "POIUYTGH-DCC3"
-            },
-            {
-              "id": "GNV1",
-              "name": "GNVLSCTL-GNV1"
-            },
-            {
-              "id": "WAS1",
-              "name": "WASHDCSW-WAS1"
-            },
-            {
-              "id": "TOY1",
-              "name": "TORYONNZ-TOY1"
-            },
-            {
-              "id": "STT1",
-              "name": "STTLWA02-STT1"
-            },
-            {
-              "id": "STG1",
-              "name": "STTGGE62-STG1"
-            },
-            {
-              "id": "SLL78",
-              "name": "SDCTLLL1-SLL78"
-            },
-            {
-              "id": "SBU78",
-              "name": "SDIT1BUB-SBU78"
-            },
-            {
-              "id": "ATL2",
-              "name": "ATLNGANW-ATL2"
-            },
-            {
-              "id": "BOT1",
-              "name": "BOTHWAKY-BOT1"
-            },
-            {
-              "id": "SNG1",
-              "name": "SNGPSIAU-SNG1"
-            },
-            {
-              "id": "NYC1",
-              "name": "NYCMNY54-NYC1"
-            },
-            {
-              "id": "LAG1b",
-              "name": "LARGIZON-LAG1b"
-            },
-            {
-              "id": "AMD15",
-              "name": "AMDFAA01-AMD15"
-            },
-            {
-              "id": "SNA1",
-              "name": "SNANTXCA-SNA1"
-            },
-            {
-              "id": "PLT1",
-              "name": "PLTNCA60-PLT1"
-            },
-            {
-              "id": "TLP1",
-              "name": "TLPNXM18-TLP1"
-            },
-            {
-              "id": "SDD81",
-              "name": "SAIT1DD6-SDD81"
-            },
-            {
-              "id": "DCC1",
-              "name": "POIUYTGH-DCC1"
-            },
-            {
-              "id": "DCC2",
-              "name": "POIUYTGH-DCC2"
-            },
-            {
-              "id": "OKC1",
-              "name": "OKCBOK55-OKC1"
-            },
-            {
-              "id": "PAR1",
-              "name": "PARSFRCG-PAR1"
-            },
-            {
-              "id": "TES36",
-              "name": "ABCEETES-TES36"
-            },
-            {
-              "id": "COM1",
-              "name": "PLMKOPIU-COM1"
-            },
-            {
-              "id": "ANI1",
-              "name": "ATLNGTRE-ANI1"
-            },
-            {
-              "id": "SDG78",
-              "name": "SDIT1BDG-SDG78"
-            },
-            {
-              "id": "mac20",
-              "name": "PKGTESTF-mac20"
-            },
-            {
-              "id": "DSF45",
-              "name": "DSFBG123-DSF45"
-            },
-            {
-              "id": "HST25",
-              "name": "HSTNTX01-HST25"
-            },
-            {
-              "id": "AMD18",
-              "name": "AUDIMA01-AMD18"
-            },
-            {
-              "id": "SAA80",
-              "name": "SAIT9AA3-SAA80"
-            },
-            {
-              "id": "SSA56",
-              "name": "SSIT2AA7-SSA56"
-            },
-            {
-              "id": "SDD82",
-              "name": "SAIT1DD9-SDD82"
-            },
-            {
-              "id": "JCV1",
-              "name": "JCVLFLBW-JCV1"
-            },
-            {
-              "id": "SUL2",
-              "name": "WERTYUJK-SUL2"
-            },
-            {
-              "id": "PUR1",
-              "name": "purelyde-PUR1"
-            },
-            {
-              "id": "FDE55",
-              "name": "FDERT555-FDE55"
-            },
-            {
-              "id": "SITE",
-              "name": "LONEENCO-SITE"
-            },
-            {
-              "id": "ATL1",
-              "name": "ATLNGAMA-ATL1"
-            },
-            {
-              "id": "JUL1",
-              "name": "ZXCVBNMM-JUL1"
-            },
-            {
-              "id": "TAT34",
-              "name": "TESAAISB-TAT34"
-            },
-            {
-              "id": "XCP12",
-              "name": "CHKGH123-XCP12"
-            },
-            {
-              "id": "RAI1",
-              "name": "poiuytre-RAI1"
-            },
-            {
-              "id": "HPO1",
-              "name": "ATLNGAUP-HPO1"
-            },
-            {
-              "id": "KJF12",
-              "name": "KJFDH123-KJF12"
-            },
-            {
-              "id": "SCC80",
-              "name": "SAIT9CC3-SCC80"
-            },
-            {
-              "id": "SAA12",
-              "name": "SAIT9AF8-SAA12"
-            },
-            {
-              "id": "SAA14",
-              "name": "SAIT1AA9-SAA14"
-            },
-            {
-              "id": "ATL35",
-              "name": "TTESSAAI-ATL35"
-            },
-            {
-              "id": "CWY1",
-              "name": "CWYMOWBS-CWY1"
-            },
-            {
-              "id": "ATL76",
-              "name": "TELEPAAI-ATL76"
-            },
-            {
-              "id": "DSL12",
-              "name": "DSLFK242-DSL12"
-            },
-            {
-              "id": "ATL53",
-              "name": "AAIATLTE-ATL53"
-            },
-            {
-              "id": "SAA11",
-              "name": "SAIT9AA2-SAA11"
-            },
-            {
-              "id": "ATL62",
-              "name": "TESSASCH-ATL62"
-            },
-            {
-              "id": "AUG1",
-              "name": "ASDFGHJK-AUG1"
-            },
-            {
-              "id": "POI22",
-              "name": "POIUY123-POI22"
-            },
-            {
-              "id": "SAA13",
-              "name": "SAIT1AA9-SAA13"
-            },
-            {
-              "id": "BHY17",
-              "name": "BHYTFRF3-BHY17"
-            },
-            {
-              "id": "LIS1",
-              "name": "HOSTPROF-LIS1"
-            },
-            {
-              "id": "SIP1",
-              "name": "ZXCVBNMK-SIP1"
-            },
-            {
-              "id": "ATL99",
-              "name": "TEESTAAI-ATL43"
-            },
-            {
-              "id": "ATL64",
-              "name": "FORLOAAJ-ATL64"
-            },
-            {
-              "id": "TAT33",
-              "name": "TESAAISA-TAT33"
-            },
-            {
-              "id": "RAD10",
-              "name": "INDIPUNE-RAD10"
-            },
-            {
-              "id": "RTW5",
-              "name": "BHYTFRY4-RTW5"
-            },
-            {
-              "id": "JGS1",
-              "name": "KSJKKKKK-JGS1"
-            },
-            {
-              "id": "ATL98",
-              "name": "TEESTAAI-ATL43"
-            },
-            {
-              "id": "WAN1",
-              "name": "LEIWANGW-WAN1"
-            },
-            {
-              "id": "ATL44",
-              "name": "ATLSANAB-ATL44"
-            },
-            {
-              "id": "RTD2",
-              "name": "BHYTFRk4-RTD2"
-            },
-            {
-              "id": "NIR1",
-              "name": "ORFLMANA-NIR1"
-            },
-            {
-              "id": "ATL75",
-              "name": "SANAAIRE-ATL75"
-            },
-            {
-              "id": "NUM1",
-              "name": "QWERTYUI-NUM1"
-            },
-            {
-              "id": "hvf32",
-              "name": "MDTWNJ21-hvf32"
-            },
-            {
-              "id": "RTZ4",
-              "name": "BHYTFRZ6-RTZ4"
-            },
-            {
-              "id": "ATL56",
-              "name": "ATLSANAC-ATL56"
-            },
-            {
-              "id": "AMS1",
-              "name": "AMSTNLBW-AMS1"
-            },
-            {
-              "id": "RCT1",
-              "name": "AMSTERNL-RCT1"
-            },
-            {
-              "id": "JAN1",
-              "name": "ORFLMATT-JAN1"
-            },
-            {
-              "id": "ABC14",
-              "name": "TESAAISA-ABC14"
-            },
-            {
-              "id": "TAT37",
-              "name": "TESAAISD-TAT37"
-            },
-            {
-              "id": "MIC54",
-              "name": "MICHIGAN-MIC54"
-            },
-            {
-              "id": "ABC11",
-              "name": "ATLSANAI-ABC11"
-            },
-            {
-              "id": "AMF11",
-              "name": "AMDOCS01-AMF11"
-            },
-            {
-              "id": "ATL63",
-              "name": "ATLSANEW-ATL63"
-            },
-            {
-              "id": "ABC12",
-              "name": "ATLSECIA-ABC12"
-            },
-            {
-              "id": "hvf20",
-              "name": "MDTWNJ21-hvf20"
-            },
-            {
-              "id": "ABC15",
-              "name": "AAITESAN-ABC15"
-            },
             {
               "id": "AVT1",
               "name": "AVTRFLHD-AVT1"
index c7780b4..abbe112 100644 (file)
@@ -5,22 +5,28 @@ import {ServiceModel} from '../../support/jsonBuilders/models/service.model';
 import {AaiServiceInstancesModel} from '../../support/jsonBuilders/models/serviceInstances.model';
 import {AAISubDetailsModel} from '../../support/jsonBuilders/models/aaiSubDetails.model';
 import {AAISubViewEditModel} from '../../support/jsonBuilders/models/aaiSubViewEdit.model';
+import {initServicePlanning} from "./viewOnlyDrawingBoard.e2e";
+
 
 describe('View Edit Page', function () {
   describe('basic UI tests', () => {
-    var jsonBuilderAAIService : JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
-
+    let jsonBuilderAAIService : JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+    let commonUuid = "6e59c5de-f052-46fa-aa7e-2fca9d674c44";
+    let serviceInvariantId = "d27e42cf-087e-4d31-88ac-6c4b7585f800";
 
-    var jsonBuilderAAISubViewEditModel: JsonBuilder<AAISubViewEditModel> = new JsonBuilder<AAISubViewEditModel>();
-    var jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
-    var jsonBuilderPNF: JsonBuilder<PnfModel> = new JsonBuilder<PnfModel>();
-    var jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
-    var jsonBuilderEmpty: JsonBuilder<Object> = new JsonBuilder<Object>();
+    let jsonBuilderAAISubViewEditModel: JsonBuilder<AAISubViewEditModel> = new JsonBuilder<AAISubViewEditModel>();
+    let jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
+    let jsonBuilderPNF: JsonBuilder<PnfModel> = new JsonBuilder<PnfModel>();
+    let jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
+    let jsonBuilderEmpty: JsonBuilder<Object> = new JsonBuilder<Object>();
     beforeEach(() => {
+      cy.window().then((win) => {
+        win.sessionStorage.clear();
+      });
       cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
-          Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+          Cypress.config('baseUrl') + "/rest/models/services/" + commonUuid,
           200, 0,
           "service-complexService",
           changeServiceModel)
@@ -147,7 +153,10 @@ describe('View Edit Page', function () {
           0,
           "aai_getPortMirroringSourcePorts - empty response")
       });
-
+      mockAsyncBulkResponse();
+      cy.initVidMock({serviceUuid: commonUuid, invariantId: serviceInvariantId});
+      cy.setReduxState();
+      cy.permissionVidMock();
       cy.login();
     });
 
@@ -155,6 +164,13 @@ describe('View Edit Page', function () {
       cy.screenshot();
     });
 
+    it(`should display the more actions button if user is permitted`, function () {
+      cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=USP%20VOICE&serviceType=VIRTUAL%20USP&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
+      cy.wait('@service-complexService');
+      cy.wait('@aai_getPortMirroringConfigsDate - empty response');
+      cy.getElementByDataTestsId("show-new-screen").should('be.visible').should('have.text', 'More actions').click();
+      });
+
     it(`should display service model name and version on each info form`, function () {
       let typesToIncludeModel:Array<string> = ['service', 'vnf', 'vfmodule', 'volume-group', 'network'];
       cy.visit('/serviceModels.htm#/instantiate?subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&subscriberName=SILVIA%20ROBBINS&serviceType=TYLER%20SILVIA&serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&aaiModelVersionId=6e59c5de-f052-46fa-aa7e-2fca9d674c44&isPermitted=true');
@@ -200,8 +216,65 @@ describe('View Edit Page', function () {
       cy.getElementByDataTestsId("activateButton").should('not.have.attr', 'disabled');
       cy.getElementByDataTestsId("deactivateButton").should('have.attr', 'disabled');
     });
+
+    it(`Upgrade a VFModule`, function(){
+      cy.initDrawingBoardUserPermission();
+      initServicePlanning("EDIT",
+        '../vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json');
+      upgradeTheVFM();
+      undoUpgradeForVFM();
+      upgradeTheVFM();
+      cy.getDrawingBoardDeployBtn().click();
+      cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
+        expect(Object(xhr.request.body).action).to.equal("None_Upgrade");
+        expect(Object(xhr.request.body).vnfs['VNF2_INSTANCE_ID'].action).to.equal("None_Upgrade");
+        expect(Object(xhr.request.body).vnfs['VNF2_INSTANCE_ID'].vfModules['dc229cd8-c132-4455-8517-5c1787c18b14']['3ef042c4-259f-45e0-9aba-0989bd8d1cc5'].action).to.equal("None_Upgrade");
+      });
+    });
+
+    it(`Upgrade a VFModule, Negative - latest version doesn't exist, upgrade button shouldn't exist`, function(){
+      setLatestVersionMockToEmptyResponse(serviceInvariantId);
+      cy.initDrawingBoardUserPermission();
+      initServicePlanning("EDIT",
+        '../vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json');
+      verifyMenuActionUpgradeDoesNotExist();
+    });
+
   });
 
+  function mockAsyncBulkResponse() {
+    cy.server().route({
+      url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk',
+      method: 'POST',
+      status: 200,
+      response: "[]",
+    }).as("expectedPostAsyncInstantiation");
+  }
+
+  function verifyMenuActionUpgradeDoesNotExist() {
+    cy.getElementByDataTestsId('node-undefined-dc229cd8-c132-4455-8517-5c1787c18b14-menu-btn').click()
+      .getElementByDataTestsId('context-menu-upgrade').should('not.exist');
+  }
+
+  function setLatestVersionMockToEmptyResponse(serviceUuid :string){
+    cy.server().route({
+      url: Cypress.config('baseUrl') + '/aai_get_newest_model_version_by_invariant/' + serviceUuid,
+      method: 'GET',
+      status: 200,
+      response: {},
+    }).as("expectLatestServiceModelUpgradeVersion")
+  }
+
+  function upgradeTheVFM() :Chainable<any>{
+    return cy.getElementByDataTestsId('node-undefined-dc229cd8-c132-4455-8517-5c1787c18b14-menu-btn').click()
+      .drawingBoardTreeClickOnContextMenuOptionByName("Upgrade");
+  }
+
+  function undoUpgradeForVFM() {
+    cy.getElementByDataTestsId('node-undefined-dc229cd8-c132-4455-8517-5c1787c18b14-menu-btn').click()
+      .drawingBoardTreeClickOnContextMenuOptionByName("Undo Upgrade");
+  }
+
   function changeFabric(serviceModel: ServiceModel) {
     serviceModel.service.uuid = "6e59c5de-f052-46fa-aa7e-2fca9d671234";
     return serviceModel;
@@ -532,4 +605,3 @@ describe('View Edit Page', function () {
     return serviceModel;
   }
 });
-
index 2f2ed14..fecf959 100644 (file)
@@ -4,17 +4,49 @@ import {JsonBuilder} from '../../support/jsonBuilders/jsonBuilder';
 import {ServiceModel} from '../../support/jsonBuilders/models/service.model';
 import {AsyncInstantiationModel} from "../../support/jsonBuilders/models/asyncInstantiation.model";
 
-describe('View only drawing board', function () {
-  var jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+var jsonBuilderAndMock: JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
+var jsonBuilderInstantiationBuilder: JsonBuilder<AsyncInstantiationModel> = new JsonBuilder<AsyncInstantiationModel>();
+const SERVICE_MODEL_ID: string = '6e59c5de-f052-46fa-aa7e-2fca9d674c44';
+const SERVICE_INVARIANT_ID: string = "d27e42cf-087e-4d31-88ac-6c4b7585f800";
+
+export const initServicePlanning = function (viewOrEdit: string, customModelFilePath?: string ){
+  const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
+  const SERVICE_TYPE: string = "TYLER SILVIA";
+  const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
+  if (Cypress._.isNil(customModelFilePath)){
+    customModelFilePath = '../vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json';
+  }
+
+  cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json').then((res) => {
+    jsonBuilderAndMock.basicJson(
+      res,
+      Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+      200,
+      0,
+      "ServiceTreeWithMultipleChildren_serviceModel",
+    )
+  });
 
-  var jsonBuilderInstantiationBuilder: JsonBuilder<AsyncInstantiationModel> = new JsonBuilder<AsyncInstantiationModel>();
+  cy.readFile(customModelFilePath).then((res) => {
+    jsonBuilderAndMock.basicJson(
+      res,
+      Cypress.config('baseUrl') + "/aai_get_service_instance_topology/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+      200, 0,
+      "ServiceTreeWithMultipleChildren_serviceInstance",
+    );
+  });
+  cy.openIframe(`app/ui/#/servicePlanning/${viewOrEdit}?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
+}
+
+describe('View only drawing board', function () {
+  const _VIEW = "VIEW";
 
   beforeEach(() => {
     cy.window().then((win) => {
       win.sessionStorage.clear();
       cy.preventErrorsOnLoading();
       cy.initAAIMock();
-      cy.initVidMock();
+      cy.initVidMock({serviceUuid:SERVICE_MODEL_ID, invariantId: SERVICE_INVARIANT_ID});
       cy.initZones();
       cy.permissionVidMock();
       cy.login();
@@ -105,43 +137,16 @@ describe('View only drawing board', function () {
 
 
   });
-  function initServicePlanning(){
-    const SUBSCRIBER_ID: string = "e433710f-9217-458d-a79d-1c7aff376d89";
-    const SERVICE_TYPE: string = "TYLER SILVIA";
-    const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
-    const SERVICE_MODEL_ID: string = '6e59c5de-f052-46fa-aa7e-2fca9d674c44';
 
-    cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json').then((res) => {
-      jsonBuilderAndMock.basicJson(
-        res,
-        Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-        200,
-        0,
-        "ServiceTreeWithMultipleChildren_serviceModel",
-      )
-    });
-
-    cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json').then((res) => {
-      jsonBuilderAndMock.basicJson(
-        res,
-        Cypress.config('baseUrl') + "/aai_get_service_instance_topology/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
-        200, 0,
-        "ServiceTreeWithMultipleChildren_serviceInstance",
-      )
-    });
-
-    cy.openIframe(`app/ui/#/servicePlanning/VIEW?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
-
-  }
   it('check component info for 2 trees for vnf, vf-module, and network', function(){
-    initServicePlanning();
+    initServicePlanning(_VIEW);
     testComponentInfoForVNF();
     testComponentInfoForVFMODULE();
     testComponentInfoForNetwork();
   });
 
   it(`when open service planning in view mode service instance is shown as expected - e2e with API's ServiceTreeWithMultipleChildren`, function () {
-    initServicePlanning();
+    initServicePlanning(_VIEW);
     /*
     0. title area -> generic stuff
                      instance name
index b48f939..e377d72 100644 (file)
@@ -590,128 +590,8 @@ describe('Vnf popup', function () {
                   "isPermitted": true
                 },
                 {
-                  "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                  "name": "AIN Web Tool-15-D-STTest2",
-                  "isPermitted": true
-                },
-                {
-                  "id": "1178612d2b394be4834ad77f567c0af2",
-                  "name": "AIN Web Tool-15-D-SSPtestcustome",
-                  "isPermitted": true
-                },
-                {
-                  "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                  "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                  "isPermitted": true
-                },
-                {
-                  "id": "de007636e25249238447264a988a927b",
-                  "name": "AIN Web Tool-15-D-dfsdf",
-                  "isPermitted": true
-                },
-                {
-                  "id": "62f29b3613634ca6a3065cbe0e020c44",
-                  "name": "AIN/SMS-16-D-Multiservices1",
-                  "isPermitted": true
-                },
-                {
-                  "id": "649289e30d3244e0b48098114d63c2aa",
-                  "name": "AIN Web Tool-15-D-SSPST66",
-                  "isPermitted": true
-                },
-                {
-                  "id": "3f21eeea6c2c486bba31dab816c05a32",
-                  "name": "AIN Web Tool-15-D-ASSPST47",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f60ce21d3ee6427586cff0d22b03b773",
-                  "name": "CESAR-100-D-sspjg67246",
-                  "isPermitted": true
-                },
-                {
-                  "id": "8774659e425f479895ae091bb5d46560",
-                  "name": "CESAR-100-D-sspjg68359",
-                  "isPermitted": true
-                },
-                {
-                  "id": "624eb554b0d147c19ff8885341760481",
-                  "name": "AINWebTool-15-D-iftach",
-                  "isPermitted": true
-                },
-                {
-                  "id": "214f55f5fc414c678059c383b03e4962",
-                  "name": "CESAR-100-D-sspjg612401",
-                  "isPermitted": true
-                },
-                {
-                  "id": "c90666c291664841bb98e4d981ff1db5",
-                  "name": "CESAR-100-D-sspjg621340",
-                  "isPermitted": true
-                },
-                {
-                  "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                  "name": "sspjg621351cloned",
-                  "isPermitted": true
-                },
-                {
-                  "id": "b386b768a3f24c8e953abbe0b3488c02",
-                  "name": "AINWebTool-15-D-eteancomp",
-                  "isPermitted": true
-                },
-                {
-                  "id": "dc6c4dbfd225474e9deaadd34968646c",
-                  "name": "AINWebTool-15-T-SPFET",
-                  "isPermitted": true
-                },
-                {
-                  "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                  "name": "AINWebTool-15-X-eeweww",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                  "name": "CESAR-100-D-spjg61909",
-                  "isPermitted": true
-                },
-                {
-                  "id": "05b91bd5137f4929878edd965755c06d",
-                  "name": "CESAR-100-D-sspjg621512cloned",
-                  "isPermitted": true
-                },
-                {
-                  "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                  "name": "AINWebTool-15-X-vdr",
-                  "isPermitted": true
-                },
-                {
-                  "id": "4008522be43741dcb1f5422022a2aa0b",
-                  "name": "AINWebTool-15-D-ssasa",
-                  "isPermitted": true
-                },
-                {
-                  "id": "f44e2e96a1b6476abfda2fa407b00169",
-                  "name": "AINWebTool-15-D-PFNPT",
-                  "isPermitted": true
-                },
-                {
-                  "id": "b69a52bec8a84669a37a1e8b72708be7",
-                  "name": "AINWebTool-15-X-vdre",
-                  "isPermitted": true
-                },
-                {
-                  "id": "fac7d9fd56154caeb9332202dcf2969f",
-                  "name": "AINWebTool-15-X-NONPODECOMP",
-                  "isPermitted": true
-                },
-                {
-                  "id": "2d34d8396e194eb49969fd61ffbff961",
-                  "name": "DN5242-Nov16-T5",
-                  "isPermitted": true
-                },
-                {
-                  "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                  "name": "ro-T11",
+                  "id": "d0a3e3f2964542259d155a81c41aadc3",
+                  "name": "test-hvf6-09",
                   "isPermitted": true
                 },
                 {
@@ -719,16 +599,6 @@ describe('Vnf popup', function () {
                   "name": "ro-T112",
                   "isPermitted": true
                 },
-                {
-                  "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                  "name": "DN5242-Nov21-T1",
-                  "isPermitted": true
-                },
-                {
-                  "id": "d0a3e3f2964542259d155a81c41aadc3",
-                  "name": "test-hvf6-09",
-                  "isPermitted": true
-                },
                 {
                   "id": "cbb99fe4ada84631b7baf046b6fd2044",
                   "name": "DN5242-Nov16-T3",
@@ -1038,754 +908,6 @@ describe('Vnf popup', function () {
               "id": "YYY1",
               "name": "UUUAIAAI-YYY1"
             },
-            {
-              "id": "BAN1",
-              "name": "VSDKYUTP-BAN1"
-            },
-            {
-              "id": "DKJ1",
-              "name": "DKJSJDKA-DKJ1"
-            },
-            {
-              "id": "MCS1",
-              "name": "ASACMAMS-MCS1"
-            },
-            {
-              "id": "UIO1",
-              "name": "uioclli1-UIO1"
-            },
-            {
-              "id": "RAJ1",
-              "name": "YGBIJNLQ-RAJ1"
-            },
-            {
-              "id": "OPA1",
-              "name": "opaclli1-OPA1"
-            },
-            {
-              "id": "SDE1",
-              "name": "ZXCVBNMA-SDE1"
-            },
-            {
-              "id": "VEN2",
-              "name": "FGHJUHIL-VEN2"
-            },
-            {
-              "id": "ORL1",
-              "name": "ORLDFLMA-ORL1"
-            },
-            {
-              "id": "JAD1",
-              "name": "JADECLLI-JAD1"
-            },
-            {
-              "id": "ZXL1",
-              "name": "LWLWCANN-ZXL1"
-            },
-            {
-              "id": "CKL1",
-              "name": "CLKSKCKK-CKL1"
-            },
-            {
-              "id": "SDF1",
-              "name": "sdfclli1-SDF1"
-            },
-            {
-              "id": "RAD1",
-              "name": "RADICAL1-RAD1"
-            },
-            {
-              "id": "KIT1",
-              "name": "BHYJFGLN-KIT1"
-            },
-            {
-              "id": "REL1",
-              "name": "INGERFGT-REL1"
-            },
-            {
-              "id": "JNL1",
-              "name": "CJALSDAC-JNL1"
-            },
-            {
-              "id": "OLK1",
-              "name": "OLKOLKLS-OLK1"
-            },
-            {
-              "id": "CHI1",
-              "name": "CHILLIWE-CHI1"
-            },
-            {
-              "id": "UUU4",
-              "name": "UUUAAAUU-UUU4"
-            },
-            {
-              "id": "TUF1",
-              "name": "TUFCLLI1-TUF1"
-            },
-            {
-              "id": "KJN1",
-              "name": "CKALDKSA-KJN1"
-            },
-            {
-              "id": "SAM1",
-              "name": "SNDGCA64-SAN1"
-            },
-            {
-              "id": "SCK1",
-              "name": "SCKSCKSK-SCK1"
-            },
-            {
-              "id": "HJH1",
-              "name": "AOEEQQQD-HJH1"
-            },
-            {
-              "id": "HGD1",
-              "name": "SDFQWHGD-HGD1"
-            },
-            {
-              "id": "KOR1",
-              "name": "HYFLNBVT-KOR1"
-            },
-            {
-              "id": "ATL43",
-              "name": "AICLOCID-ATL43"
-            },
-            {
-              "id": "ATL54",
-              "name": "AICFTAAI-ATL54"
-            },
-            {
-              "id": "ATL66",
-              "name": "CLLIAAII-ATL66"
-            },
-            {
-              "id": "VEL1",
-              "name": "BNMLKUIK-VEL1"
-            },
-            {
-              "id": "ICC1",
-              "name": "SANJITAT-ICC1"
-            },
-            {
-              "id": "MNT11",
-              "name": "WSXEFBTH-MNT11"
-            },
-            {
-              "id": "DEF2",
-              "name": "WSBHGTYL-DEF2"
-            },
-            {
-              "id": "MAD11",
-              "name": "SDFQWGKL-MAD11"
-            },
-            {
-              "id": "OLG1",
-              "name": "OLHOLHOL-OLG1"
-            },
-            {
-              "id": "GAR1",
-              "name": "NGFVSJKO-GAR1"
-            },
-            {
-              "id": "SAN22",
-              "name": "GNVLSCTL-SAN22"
-            },
-            {
-              "id": "HRG1",
-              "name": "HRGHRGGS-HRG1"
-            },
-            {
-              "id": "JCS1",
-              "name": "JCSJSCJS-JCS1"
-            },
-            {
-              "id": "DHA12",
-              "name": "WSXEDECF-DHA12"
-            },
-            {
-              "id": "HJE1",
-              "name": "AOEEWWWD-HJE1"
-            },
-            {
-              "id": "NCA1",
-              "name": "NCANCANN-NCA1"
-            },
-            {
-              "id": "IOP1",
-              "name": "iopclli1-IOP1"
-            },
-            {
-              "id": "RTY1",
-              "name": "rtyclli1-RTY1"
-            },
-            {
-              "id": "KAP1",
-              "name": "HIOUYTRQ-KAP1"
-            },
-            {
-              "id": "ZEN1",
-              "name": "ZENCLLI1-ZEN1"
-            },
-            {
-              "id": "HKA1",
-              "name": "JAKHLASS-HKA1"
-            },
-            {
-              "id": "CQK1",
-              "name": "CQKSCAKK-CQK1"
-            },
-            {
-              "id": "SAI1",
-              "name": "UBEKQLPD-SAI1"
-            },
-            {
-              "id": "ERT1",
-              "name": "ertclli1-ERT1"
-            },
-            {
-              "id": "IBB1",
-              "name": "PLMKOIJU-IBB1"
-            },
-            {
-              "id": "TIR2",
-              "name": "PLKINHYI-TIR2"
-            },
-            {
-              "id": "HSD1",
-              "name": "CHASKCDS-HSD1"
-            },
-            {
-              "id": "SLF78",
-              "name": "SDCTLFN1-SLF78"
-            },
-            {
-              "id": "SEE78",
-              "name": "SDCTEEE4-SEE78"
-            },
-            {
-              "id": "SAN13",
-              "name": "TOKYJPFA-SAN13"
-            },
-            {
-              "id": "SAA78",
-              "name": "SDCTAAA1-SAA78"
-            },
-            {
-              "id": "LUC1",
-              "name": "ATLDFGYC-LUC1"
-            },
-            {
-              "id": "AMD13",
-              "name": "MEMATLAN-AMD13"
-            },
-            {
-              "id": "TOR1",
-              "name": "TOROONXN-TOR1"
-            },
-            {
-              "id": "QWE1",
-              "name": "QWECLLI1-QWE1"
-            },
-            {
-              "id": "ZOG1",
-              "name": "ZOGASTRO-ZOG1"
-            },
-            {
-              "id": "CAL33",
-              "name": "CALIFORN-CAL33"
-            },
-            {
-              "id": "SHH78",
-              "name": "SDIT1HHH-SHH78"
-            },
-            {
-              "id": "DSA1",
-              "name": "LKJHGFDS-DSA1"
-            },
-            {
-              "id": "CLG1",
-              "name": "CLGRABAD-CLG1"
-            },
-            {
-              "id": "BNA1",
-              "name": "BNARAGBK-BNA1"
-            },
-            {
-              "id": "ATL84",
-              "name": "CANTTCOC-ATL84"
-            },
-            {
-              "id": "APP1",
-              "name": "WBHGTYUI-APP1"
-            },
-            {
-              "id": "RJN1",
-              "name": "RJNRBZAW-RJN1"
-            },
-            {
-              "id": "EHH78",
-              "name": "SDCSHHH5-EHH78"
-            },
-            {
-              "id": "mac10",
-              "name": "PKGTESTF-mac10"
-            },
-            {
-              "id": "SXB78",
-              "name": "SDCTGXB1-SXB78"
-            },
-            {
-              "id": "SAX78",
-              "name": "SDCTAXG1-SAX78"
-            },
-            {
-              "id": "SYD1",
-              "name": "SYDNAUBV-SYD1"
-            },
-            {
-              "id": "TOK1",
-              "name": "TOKYJPFA-TOK1"
-            },
-            {
-              "id": "KGM2",
-              "name": "KGMTNC20-KGM2"
-            },
-            {
-              "id": "DCC1b",
-              "name": "POIUYTGH-DCC1b"
-            },
-            {
-              "id": "SKK78",
-              "name": "SDCTKKK1-SKK78"
-            },
-            {
-              "id": "SGG78",
-              "name": "SDCTGGG1-SGG78"
-            },
-            {
-              "id": "SJJ78",
-              "name": "SDCTJJJ1-SJJ78"
-            },
-            {
-              "id": "SBX78",
-              "name": "SDCTBXG1-SBX78"
-            },
-            {
-              "id": "LAG1",
-              "name": "LARGIZON-LAG1"
-            },
-            {
-              "id": "IAA1",
-              "name": "QAZXSWED-IAA1"
-            },
-            {
-              "id": "POI1",
-              "name": "PLMNJKIU-POI1"
-            },
-            {
-              "id": "LAG1a",
-              "name": "LARGIZON-LAG1a"
-            },
-            {
-              "id": "PBL1",
-              "name": "PBLAPBAI-PBL1"
-            },
-            {
-              "id": "LAG45",
-              "name": "LARGIZON-LAG1a"
-            },
-            {
-              "id": "MAR1",
-              "name": "MNBVCXZM-MAR1"
-            },
-            {
-              "id": "HST70",
-              "name": "HSTNTX70-HST70"
-            },
-            {
-              "id": "DCC1a",
-              "name": "POIUYTGH-DCC1a"
-            },
-            {
-              "id": "TOL1",
-              "name": "TOLDOH21-TOL1"
-            },
-            {
-              "id": "LON1",
-              "name": "LONEENCO-LON1"
-            },
-            {
-              "id": "SJU78",
-              "name": "SDIT1JUB-SJU78"
-            },
-            {
-              "id": "STN27",
-              "name": "HSTNTX01-STN27"
-            },
-            {
-              "id": "SSW56",
-              "name": "ss8126GT-SSW56"
-            },
-            {
-              "id": "SBB78",
-              "name": "SDIT1BBB-SBB78"
-            },
-            {
-              "id": "DCC3",
-              "name": "POIUYTGH-DCC3"
-            },
-            {
-              "id": "GNV1",
-              "name": "GNVLSCTL-GNV1"
-            },
-            {
-              "id": "WAS1",
-              "name": "WASHDCSW-WAS1"
-            },
-            {
-              "id": "TOY1",
-              "name": "TORYONNZ-TOY1"
-            },
-            {
-              "id": "STT1",
-              "name": "STTLWA02-STT1"
-            },
-            {
-              "id": "STG1",
-              "name": "STTGGE62-STG1"
-            },
-            {
-              "id": "SLL78",
-              "name": "SDCTLLL1-SLL78"
-            },
-            {
-              "id": "SBU78",
-              "name": "SDIT1BUB-SBU78"
-            },
-            {
-              "id": "ATL2",
-              "name": "ATLNGANW-ATL2"
-            },
-            {
-              "id": "BOT1",
-              "name": "BOTHWAKY-BOT1"
-            },
-            {
-              "id": "SNG1",
-              "name": "SNGPSIAU-SNG1"
-            },
-            {
-              "id": "NYC1",
-              "name": "NYCMNY54-NYC1"
-            },
-            {
-              "id": "LAG1b",
-              "name": "LARGIZON-LAG1b"
-            },
-            {
-              "id": "AMD15",
-              "name": "AMDFAA01-AMD15"
-            },
-            {
-              "id": "SNA1",
-              "name": "SNANTXCA-SNA1"
-            },
-            {
-              "id": "PLT1",
-              "name": "PLTNCA60-PLT1"
-            },
-            {
-              "id": "TLP1",
-              "name": "TLPNXM18-TLP1"
-            },
-            {
-              "id": "SDD81",
-              "name": "SAIT1DD6-SDD81"
-            },
-            {
-              "id": "DCC1",
-              "name": "POIUYTGH-DCC1"
-            },
-            {
-              "id": "DCC2",
-              "name": "POIUYTGH-DCC2"
-            },
-            {
-              "id": "OKC1",
-              "name": "OKCBOK55-OKC1"
-            },
-            {
-              "id": "PAR1",
-              "name": "PARSFRCG-PAR1"
-            },
-            {
-              "id": "TES36",
-              "name": "ABCEETES-TES36"
-            },
-            {
-              "id": "COM1",
-              "name": "PLMKOPIU-COM1"
-            },
-            {
-              "id": "ANI1",
-              "name": "ATLNGTRE-ANI1"
-            },
-            {
-              "id": "SDG78",
-              "name": "SDIT1BDG-SDG78"
-            },
-            {
-              "id": "mac20",
-              "name": "PKGTESTF-mac20"
-            },
-            {
-              "id": "DSF45",
-              "name": "DSFBG123-DSF45"
-            },
-            {
-              "id": "HST25",
-              "name": "HSTNTX01-HST25"
-            },
-            {
-              "id": "AMD18",
-              "name": "AUDIMA01-AMD18"
-            },
-            {
-              "id": "SAA80",
-              "name": "SAIT9AA3-SAA80"
-            },
-            {
-              "id": "SSA56",
-              "name": "SSIT2AA7-SSA56"
-            },
-            {
-              "id": "SDD82",
-              "name": "SAIT1DD9-SDD82"
-            },
-            {
-              "id": "JCV1",
-              "name": "JCVLFLBW-JCV1"
-            },
-            {
-              "id": "SUL2",
-              "name": "WERTYUJK-SUL2"
-            },
-            {
-              "id": "PUR1",
-              "name": "purelyde-PUR1"
-            },
-            {
-              "id": "FDE55",
-              "name": "FDERT555-FDE55"
-            },
-            {
-              "id": "SITE",
-              "name": "LONEENCO-SITE"
-            },
-            {
-              "id": "ATL1",
-              "name": "ATLNGAMA-ATL1"
-            },
-            {
-              "id": "JUL1",
-              "name": "ZXCVBNMM-JUL1"
-            },
-            {
-              "id": "TAT34",
-              "name": "TESAAISB-TAT34"
-            },
-            {
-              "id": "XCP12",
-              "name": "CHKGH123-XCP12"
-            },
-            {
-              "id": "RAI1",
-              "name": "poiuytre-RAI1"
-            },
-            {
-              "id": "HPO1",
-              "name": "ATLNGAUP-HPO1"
-            },
-            {
-              "id": "KJF12",
-              "name": "KJFDH123-KJF12"
-            },
-            {
-              "id": "SCC80",
-              "name": "SAIT9CC3-SCC80"
-            },
-            {
-              "id": "SAA12",
-              "name": "SAIT9AF8-SAA12"
-            },
-            {
-              "id": "SAA14",
-              "name": "SAIT1AA9-SAA14"
-            },
-            {
-              "id": "ATL35",
-              "name": "TTESSAAI-ATL35"
-            },
-            {
-              "id": "CWY1",
-              "name": "CWYMOWBS-CWY1"
-            },
-            {
-              "id": "ATL76",
-              "name": "TELEPAAI-ATL76"
-            },
-            {
-              "id": "DSL12",
-              "name": "DSLFK242-DSL12"
-            },
-            {
-              "id": "ATL53",
-              "name": "AAIATLTE-ATL53"
-            },
-            {
-              "id": "SAA11",
-              "name": "SAIT9AA2-SAA11"
-            },
-            {
-              "id": "ATL62",
-              "name": "TESSASCH-ATL62"
-            },
-            {
-              "id": "AUG1",
-              "name": "ASDFGHJK-AUG1"
-            },
-            {
-              "id": "POI22",
-              "name": "POIUY123-POI22"
-            },
-            {
-              "id": "SAA13",
-              "name": "SAIT1AA9-SAA13"
-            },
-            {
-              "id": "BHY17",
-              "name": "BHYTFRF3-BHY17"
-            },
-            {
-              "id": "LIS1",
-              "name": "HOSTPROF-LIS1"
-            },
-            {
-              "id": "SIP1",
-              "name": "ZXCVBNMK-SIP1"
-            },
-            {
-              "id": "ATL99",
-              "name": "TEESTAAI-ATL43"
-            },
-            {
-              "id": "ATL64",
-              "name": "FORLOAAJ-ATL64"
-            },
-            {
-              "id": "TAT33",
-              "name": "TESAAISA-TAT33"
-            },
-            {
-              "id": "RAD10",
-              "name": "INDIPUNE-RAD10"
-            },
-            {
-              "id": "RTW5",
-              "name": "BHYTFRY4-RTW5"
-            },
-            {
-              "id": "JGS1",
-              "name": "KSJKKKKK-JGS1"
-            },
-            {
-              "id": "ATL98",
-              "name": "TEESTAAI-ATL43"
-            },
-            {
-              "id": "WAN1",
-              "name": "LEIWANGW-WAN1"
-            },
-            {
-              "id": "ATL44",
-              "name": "ATLSANAB-ATL44"
-            },
-            {
-              "id": "RTD2",
-              "name": "BHYTFRk4-RTD2"
-            },
-            {
-              "id": "NIR1",
-              "name": "ORFLMANA-NIR1"
-            },
-            {
-              "id": "ATL75",
-              "name": "SANAAIRE-ATL75"
-            },
-            {
-              "id": "NUM1",
-              "name": "QWERTYUI-NUM1"
-            },
-            {
-              "id": "hvf32",
-              "name": "MDTWNJ21-hvf32"
-            },
-            {
-              "id": "RTZ4",
-              "name": "BHYTFRZ6-RTZ4"
-            },
-            {
-              "id": "ATL56",
-              "name": "ATLSANAC-ATL56"
-            },
-            {
-              "id": "AMS1",
-              "name": "AMSTNLBW-AMS1"
-            },
-            {
-              "id": "RCT1",
-              "name": "AMSTERNL-RCT1"
-            },
-            {
-              "id": "JAN1",
-              "name": "ORFLMATT-JAN1"
-            },
-            {
-              "id": "ABC14",
-              "name": "TESAAISA-ABC14"
-            },
-            {
-              "id": "TAT37",
-              "name": "TESAAISD-TAT37"
-            },
-            {
-              "id": "MIC54",
-              "name": "MICHIGAN-MIC54"
-            },
-            {
-              "id": "ABC11",
-              "name": "ATLSANAI-ABC11"
-            },
-            {
-              "id": "AMF11",
-              "name": "AMDOCS01-AMF11"
-            },
-            {
-              "id": "ATL63",
-              "name": "ATLSANEW-ATL63"
-            },
-            {
-              "id": "ABC12",
-              "name": "ATLSECIA-ABC12"
-            },
-            {
-              "id": "hvf20",
-              "name": "MDTWNJ21-hvf20"
-            },
-            {
-              "id": "ABC15",
-              "name": "AAITESAN-ABC15"
-            },
             {
               "id": "AVT1",
               "name": "AVTRFLHD-AVT1"
index 4d2d7db..b1ba769 100644 (file)
@@ -85,7 +85,7 @@ describe('Delete vnf instance', function () {
       cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
         cy.readFile('../vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json').then((expectedResult) => {
           expectedResult.vnfs["2017-388_PASQUALE-vPE 0_1"].trackById = vnf.trackById;
-          cy.deepCompare(xhr.request.body, expectedResult);
+          cy.deepCompare(expectedResult, xhr.request.body);
         });
       });
     });
index 6dfa614..2bff2ed 100644 (file)
@@ -60,7 +60,7 @@
                   "extra-properties": {}
                 },
                 {
-                  "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4",
+                  "model-name": "VidPcrf051517..pcrf_kennedy_pcm..module-4",
                   "vf-module": {
                     "vf-module-id": "f91515e5-cf8d-4abf-aacc-5bc5c5a47f09",
                     "vf-module-name": "gg",
@@ -75,7 +75,7 @@
                   "extra-properties": {}
                 },
                 {
-                  "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-5",
+                  "model-name": "VidPcrf051517..pcrf_kennedy_pcm..module-5",
                   "vf-module": {
                     "vf-module-id": "f91515e5-cf8d-4abf-aacc-5bc5c5a47f05",
                     "vf-module-name": "ABC",
@@ -90,7 +90,7 @@
                   "extra-properties": {}
                 },
                 {
-                  "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4",
+                  "model-name": "VidPcrf051517..pcrf_kennedy_pcm..module-4",
                   "vf-module": {
                     "vf-module-id": "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77",
                     "vf-module-name": "my_vfModule",
                   "extra-properties": {}
                 },
                 {
-                  "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4",
+                  "model-name": "VidPcrf051517..pcrf_kennedy_pcm..module-4",
                   "vf-module": {
                     "vf-module-id": "a9b70ac0-5917-4203-a308-0e6920e6d09b",
                     "vf-module-name": "vf_module2",
index a962fc2..c9ff7a6 100644 (file)
             "isPermitted": true
           },
           {
-            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-            "name": "AIN Web Tool-15-D-STTest2",
-            "isPermitted": true
-          },
-          {
-            "id": "1178612d2b394be4834ad77f567c0af2",
-            "name": "AIN Web Tool-15-D-SSPtestcustome",
-            "isPermitted": true
-          },
-          {
-            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-            "name": "AIN Web Tool-15-D-UncheckedEcopm",
-            "isPermitted": true
-          },
-          {
-            "id": "de007636e25249238447264a988a927b",
-            "name": "AIN Web Tool-15-D-dfsdf",
-            "isPermitted": true
-          },
-          {
-            "id": "62f29b3613634ca6a3065cbe0e020c44",
-            "name": "AIN/SMS-16-D-Multiservices1",
-            "isPermitted": true
-          },
-          {
-            "id": "649289e30d3244e0b48098114d63c2aa",
-            "name": "AIN Web Tool-15-D-SSPST66",
-            "isPermitted": true
-          },
-          {
-            "id": "3f21eeea6c2c486bba31dab816c05a32",
-            "name": "AIN Web Tool-15-D-ASSPST47",
-            "isPermitted": true
-          },
-          {
-            "id": "f60ce21d3ee6427586cff0d22b03b773",
-            "name": "CESAR-100-D-sspjg67246",
-            "isPermitted": true
-          },
-          {
-            "id": "8774659e425f479895ae091bb5d46560",
-            "name": "CESAR-100-D-sspjg68359",
-            "isPermitted": true
-          },
-          {
-            "id": "624eb554b0d147c19ff8885341760481",
-            "name": "AINWebTool-15-D-iftach",
-            "isPermitted": true
-          },
-          {
-            "id": "214f55f5fc414c678059c383b03e4962",
-            "name": "CESAR-100-D-sspjg612401",
-            "isPermitted": true
-          },
-          {
-            "id": "c90666c291664841bb98e4d981ff1db5",
-            "name": "CESAR-100-D-sspjg621340",
-            "isPermitted": true
-          },
-          {
-            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-            "name": "sspjg621351cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "b386b768a3f24c8e953abbe0b3488c02",
-            "name": "AINWebTool-15-D-eteancomp",
-            "isPermitted": true
-          },
-          {
-            "id": "dc6c4dbfd225474e9deaadd34968646c",
-            "name": "AINWebTool-15-T-SPFET",
-            "isPermitted": true
-          },
-          {
-            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-            "name": "AINWebTool-15-X-eeweww",
-            "isPermitted": true
-          },
-          {
-            "id": "f2f3830e4c984d45bcd00e1a04158a79",
-            "name": "CESAR-100-D-spjg61909",
-            "isPermitted": true
-          },
-          {
-            "id": "05b91bd5137f4929878edd965755c06d",
-            "name": "CESAR-100-D-sspjg621512cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "7002fbe8482d4a989ddf445b1ce336e0",
-            "name": "AINWebTool-15-X-vdr",
-            "isPermitted": true
-          },
-          {
-            "id": "4008522be43741dcb1f5422022a2aa0b",
-            "name": "AINWebTool-15-D-ssasa",
-            "isPermitted": true
-          },
-          {
-            "id": "f44e2e96a1b6476abfda2fa407b00169",
-            "name": "AINWebTool-15-D-PFNPT",
-            "isPermitted": true
-          },
-          {
-            "id": "b69a52bec8a84669a37a1e8b72708be7",
-            "name": "AINWebTool-15-X-vdre",
-            "isPermitted": true
-          },
-          {
-            "id": "fac7d9fd56154caeb9332202dcf2969f",
-            "name": "AINWebTool-15-X-NONPODECOMP",
-            "isPermitted": true
-          },
-          {
-            "id": "2d34d8396e194eb49969fd61ffbff961",
-            "name": "DN5242-Nov16-T5",
-            "isPermitted": true
-          },
-          {
-            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-            "name": "ro-T11",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true
           },
           {
             "name": "ro-T112",
             "isPermitted": true
           },
-          {
-            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-            "name": "DN5242-Nov21-T1",
-            "isPermitted": true
-          },
-          {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
-            "isPermitted": true
-          },
           {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
         "id": "YYY1",
         "name": "UUUAIAAI-YYY1"
       },
-      {
-        "id": "BAN1",
-        "name": "VSDKYUTP-BAN1"
-      },
-      {
-        "id": "DKJ1",
-        "name": "DKJSJDKA-DKJ1"
-      },
-      {
-        "id": "MCS1",
-        "name": "ASACMAMS-MCS1"
-      },
-      {
-        "id": "UIO1",
-        "name": "uioclli1-UIO1"
-      },
-      {
-        "id": "RAJ1",
-        "name": "YGBIJNLQ-RAJ1"
-      },
-      {
-        "id": "OPA1",
-        "name": "opaclli1-OPA1"
-      },
-      {
-        "id": "SDE1",
-        "name": "ZXCVBNMA-SDE1"
-      },
-      {
-        "id": "VEN2",
-        "name": "FGHJUHIL-VEN2"
-      },
-      {
-        "id": "ORL1",
-        "name": "ORLDFLMA-ORL1"
-      },
-      {
-        "id": "JAD1",
-        "name": "JADECLLI-JAD1"
-      },
-      {
-        "id": "ZXL1",
-        "name": "LWLWCANN-ZXL1"
-      },
-      {
-        "id": "CKL1",
-        "name": "CLKSKCKK-CKL1"
-      },
-      {
-        "id": "SDF1",
-        "name": "sdfclli1-SDF1"
-      },
-      {
-        "id": "RAD1",
-        "name": "RADICAL1-RAD1"
-      },
-      {
-        "id": "KIT1",
-        "name": "BHYJFGLN-KIT1"
-      },
-      {
-        "id": "REL1",
-        "name": "INGERFGT-REL1"
-      },
-      {
-        "id": "JNL1",
-        "name": "CJALSDAC-JNL1"
-      },
-      {
-        "id": "OLK1",
-        "name": "OLKOLKLS-OLK1"
-      },
-      {
-        "id": "CHI1",
-        "name": "CHILLIWE-CHI1"
-      },
-      {
-        "id": "UUU4",
-        "name": "UUUAAAUU-UUU4"
-      },
-      {
-        "id": "TUF1",
-        "name": "TUFCLLI1-TUF1"
-      },
-      {
-        "id": "KJN1",
-        "name": "CKALDKSA-KJN1"
-      },
-      {
-        "id": "SAM1",
-        "name": "SNDGCA64-SAN1"
-      },
-      {
-        "id": "SCK1",
-        "name": "SCKSCKSK-SCK1"
-      },
-      {
-        "id": "HJH1",
-        "name": "AOEEQQQD-HJH1"
-      },
-      {
-        "id": "HGD1",
-        "name": "SDFQWHGD-HGD1"
-      },
-      {
-        "id": "KOR1",
-        "name": "HYFLNBVT-KOR1"
-      },
-      {
-        "id": "ATL43",
-        "name": "AICLOCID-ATL43"
-      },
-      {
-        "id": "ATL54",
-        "name": "AICFTAAI-ATL54"
-      },
-      {
-        "id": "ATL66",
-        "name": "CLLIAAII-ATL66"
-      },
-      {
-        "id": "VEL1",
-        "name": "BNMLKUIK-VEL1"
-      },
-      {
-        "id": "ICC1",
-        "name": "SANJITAT-ICC1"
-      },
-      {
-        "id": "MNT11",
-        "name": "WSXEFBTH-MNT11"
-      },
-      {
-        "id": "DEF2",
-        "name": "WSBHGTYL-DEF2"
-      },
-      {
-        "id": "MAD11",
-        "name": "SDFQWGKL-MAD11"
-      },
-      {
-        "id": "OLG1",
-        "name": "OLHOLHOL-OLG1"
-      },
-      {
-        "id": "GAR1",
-        "name": "NGFVSJKO-GAR1"
-      },
-      {
-        "id": "SAN22",
-        "name": "GNVLSCTL-SAN22"
-      },
-      {
-        "id": "HRG1",
-        "name": "HRGHRGGS-HRG1"
-      },
-      {
-        "id": "JCS1",
-        "name": "JCSJSCJS-JCS1"
-      },
-      {
-        "id": "DHA12",
-        "name": "WSXEDECF-DHA12"
-      },
-      {
-        "id": "HJE1",
-        "name": "AOEEWWWD-HJE1"
-      },
-      {
-        "id": "NCA1",
-        "name": "NCANCANN-NCA1"
-      },
-      {
-        "id": "IOP1",
-        "name": "iopclli1-IOP1"
-      },
-      {
-        "id": "RTY1",
-        "name": "rtyclli1-RTY1"
-      },
-      {
-        "id": "KAP1",
-        "name": "HIOUYTRQ-KAP1"
-      },
-      {
-        "id": "ZEN1",
-        "name": "ZENCLLI1-ZEN1"
-      },
-      {
-        "id": "HKA1",
-        "name": "JAKHLASS-HKA1"
-      },
-      {
-        "id": "CQK1",
-        "name": "CQKSCAKK-CQK1"
-      },
-      {
-        "id": "SAI1",
-        "name": "UBEKQLPD-SAI1"
-      },
-      {
-        "id": "ERT1",
-        "name": "ertclli1-ERT1"
-      },
-      {
-        "id": "IBB1",
-        "name": "PLMKOIJU-IBB1"
-      },
-      {
-        "id": "TIR2",
-        "name": "PLKINHYI-TIR2"
-      },
-      {
-        "id": "HSD1",
-        "name": "CHASKCDS-HSD1"
-      },
-      {
-        "id": "SLF78",
-        "name": "SDCTLFN1-SLF78"
-      },
-      {
-        "id": "SEE78",
-        "name": "SDCTEEE4-SEE78"
-      },
-      {
-        "id": "SAN13",
-        "name": "TOKYJPFA-SAN13"
-      },
-      {
-        "id": "SAA78",
-        "name": "SDCTAAA1-SAA78"
-      },
-      {
-        "id": "LUC1",
-        "name": "ATLDFGYC-LUC1"
-      },
-      {
-        "id": "AMD13",
-        "name": "MEMATLAN-AMD13"
-      },
-      {
-        "id": "TOR1",
-        "name": "TOROONXN-TOR1"
-      },
-      {
-        "id": "QWE1",
-        "name": "QWECLLI1-QWE1"
-      },
-      {
-        "id": "ZOG1",
-        "name": "ZOGASTRO-ZOG1"
-      },
-      {
-        "id": "CAL33",
-        "name": "CALIFORN-CAL33"
-      },
-      {
-        "id": "SHH78",
-        "name": "SDIT1HHH-SHH78"
-      },
-      {
-        "id": "DSA1",
-        "name": "LKJHGFDS-DSA1"
-      },
-      {
-        "id": "CLG1",
-        "name": "CLGRABAD-CLG1"
-      },
-      {
-        "id": "BNA1",
-        "name": "BNARAGBK-BNA1"
-      },
-      {
-        "id": "ATL84",
-        "name": "CANTTCOC-ATL84"
-      },
-      {
-        "id": "APP1",
-        "name": "WBHGTYUI-APP1"
-      },
-      {
-        "id": "RJN1",
-        "name": "RJNRBZAW-RJN1"
-      },
-      {
-        "id": "EHH78",
-        "name": "SDCSHHH5-EHH78"
-      },
-      {
-        "id": "mac10",
-        "name": "PKGTESTF-mac10"
-      },
-      {
-        "id": "SXB78",
-        "name": "SDCTGXB1-SXB78"
-      },
-      {
-        "id": "SAX78",
-        "name": "SDCTAXG1-SAX78"
-      },
-      {
-        "id": "SYD1",
-        "name": "SYDNAUBV-SYD1"
-      },
-      {
-        "id": "TOK1",
-        "name": "TOKYJPFA-TOK1"
-      },
-      {
-        "id": "KGM2",
-        "name": "KGMTNC20-KGM2"
-      },
-      {
-        "id": "DCC1b",
-        "name": "POIUYTGH-DCC1b"
-      },
-      {
-        "id": "SKK78",
-        "name": "SDCTKKK1-SKK78"
-      },
-      {
-        "id": "SGG78",
-        "name": "SDCTGGG1-SGG78"
-      },
-      {
-        "id": "SJJ78",
-        "name": "SDCTJJJ1-SJJ78"
-      },
-      {
-        "id": "SBX78",
-        "name": "SDCTBXG1-SBX78"
-      },
-      {
-        "id": "LAG1",
-        "name": "LARGIZON-LAG1"
-      },
-      {
-        "id": "IAA1",
-        "name": "QAZXSWED-IAA1"
-      },
-      {
-        "id": "POI1",
-        "name": "PLMNJKIU-POI1"
-      },
-      {
-        "id": "LAG1a",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "PBL1",
-        "name": "PBLAPBAI-PBL1"
-      },
-      {
-        "id": "LAG45",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "MAR1",
-        "name": "MNBVCXZM-MAR1"
-      },
-      {
-        "id": "HST70",
-        "name": "HSTNTX70-HST70"
-      },
-      {
-        "id": "DCC1a",
-        "name": "POIUYTGH-DCC1a"
-      },
-      {
-        "id": "TOL1",
-        "name": "TOLDOH21-TOL1"
-      },
-      {
-        "id": "LON1",
-        "name": "LONEENCO-LON1"
-      },
-      {
-        "id": "SJU78",
-        "name": "SDIT1JUB-SJU78"
-      },
-      {
-        "id": "STN27",
-        "name": "HSTNTX01-STN27"
-      },
-      {
-        "id": "SSW56",
-        "name": "ss8126GT-SSW56"
-      },
-      {
-        "id": "SBB78",
-        "name": "SDIT1BBB-SBB78"
-      },
-      {
-        "id": "DCC3",
-        "name": "POIUYTGH-DCC3"
-      },
-      {
-        "id": "GNV1",
-        "name": "GNVLSCTL-GNV1"
-      },
-      {
-        "id": "WAS1",
-        "name": "WASHDCSW-WAS1"
-      },
-      {
-        "id": "TOY1",
-        "name": "TORYONNZ-TOY1"
-      },
-      {
-        "id": "STT1",
-        "name": "STTLWA02-STT1"
-      },
-      {
-        "id": "STG1",
-        "name": "STTGGE62-STG1"
-      },
-      {
-        "id": "SLL78",
-        "name": "SDCTLLL1-SLL78"
-      },
-      {
-        "id": "SBU78",
-        "name": "SDIT1BUB-SBU78"
-      },
-      {
-        "id": "ATL2",
-        "name": "ATLNGANW-ATL2"
-      },
-      {
-        "id": "BOT1",
-        "name": "BOTHWAKY-BOT1"
-      },
-      {
-        "id": "SNG1",
-        "name": "SNGPSIAU-SNG1"
-      },
-      {
-        "id": "NYC1",
-        "name": "NYCMNY54-NYC1"
-      },
-      {
-        "id": "LAG1b",
-        "name": "LARGIZON-LAG1b"
-      },
-      {
-        "id": "AMD15",
-        "name": "AMDFAA01-AMD15"
-      },
-      {
-        "id": "SNA1",
-        "name": "SNANTXCA-SNA1"
-      },
-      {
-        "id": "PLT1",
-        "name": "PLTNCA60-PLT1"
-      },
-      {
-        "id": "TLP1",
-        "name": "TLPNXM18-TLP1"
-      },
-      {
-        "id": "SDD81",
-        "name": "SAIT1DD6-SDD81"
-      },
-      {
-        "id": "DCC1",
-        "name": "POIUYTGH-DCC1"
-      },
-      {
-        "id": "DCC2",
-        "name": "POIUYTGH-DCC2"
-      },
-      {
-        "id": "OKC1",
-        "name": "OKCBOK55-OKC1"
-      },
-      {
-        "id": "PAR1",
-        "name": "PARSFRCG-PAR1"
-      },
-      {
-        "id": "TES36",
-        "name": "ABCEETES-TES36"
-      },
-      {
-        "id": "COM1",
-        "name": "PLMKOPIU-COM1"
-      },
-      {
-        "id": "ANI1",
-        "name": "ATLNGTRE-ANI1"
-      },
-      {
-        "id": "SDG78",
-        "name": "SDIT1BDG-SDG78"
-      },
-      {
-        "id": "mac20",
-        "name": "PKGTESTF-mac20"
-      },
-      {
-        "id": "DSF45",
-        "name": "DSFBG123-DSF45"
-      },
-      {
-        "id": "HST25",
-        "name": "HSTNTX01-HST25"
-      },
-      {
-        "id": "AMD18",
-        "name": "AUDIMA01-AMD18"
-      },
-      {
-        "id": "SAA80",
-        "name": "SAIT9AA3-SAA80"
-      },
-      {
-        "id": "SSA56",
-        "name": "SSIT2AA7-SSA56"
-      },
-      {
-        "id": "SDD82",
-        "name": "SAIT1DD9-SDD82"
-      },
-      {
-        "id": "JCV1",
-        "name": "JCVLFLBW-JCV1"
-      },
-      {
-        "id": "SUL2",
-        "name": "WERTYUJK-SUL2"
-      },
-      {
-        "id": "PUR1",
-        "name": "purelyde-PUR1"
-      },
-      {
-        "id": "FDE55",
-        "name": "FDERT555-FDE55"
-      },
-      {
-        "id": "SITE",
-        "name": "LONEENCO-SITE"
-      },
-      {
-        "id": "ATL1",
-        "name": "ATLNGAMA-ATL1"
-      },
-      {
-        "id": "JUL1",
-        "name": "ZXCVBNMM-JUL1"
-      },
-      {
-        "id": "TAT34",
-        "name": "TESAAISB-TAT34"
-      },
-      {
-        "id": "XCP12",
-        "name": "CHKGH123-XCP12"
-      },
-      {
-        "id": "RAI1",
-        "name": "poiuytre-RAI1"
-      },
-      {
-        "id": "HPO1",
-        "name": "ATLNGAUP-HPO1"
-      },
-      {
-        "id": "KJF12",
-        "name": "KJFDH123-KJF12"
-      },
-      {
-        "id": "SCC80",
-        "name": "SAIT9CC3-SCC80"
-      },
-      {
-        "id": "SAA12",
-        "name": "SAIT9AF8-SAA12"
-      },
-      {
-        "id": "SAA14",
-        "name": "SAIT1AA9-SAA14"
-      },
-      {
-        "id": "ATL35",
-        "name": "TTESSAAI-ATL35"
-      },
-      {
-        "id": "CWY1",
-        "name": "CWYMOWBS-CWY1"
-      },
-      {
-        "id": "ATL76",
-        "name": "TELEPAAI-ATL76"
-      },
-      {
-        "id": "DSL12",
-        "name": "DSLFK242-DSL12"
-      },
-      {
-        "id": "ATL53",
-        "name": "AAIATLTE-ATL53"
-      },
-      {
-        "id": "SAA11",
-        "name": "SAIT9AA2-SAA11"
-      },
-      {
-        "id": "ATL62",
-        "name": "TESSASCH-ATL62"
-      },
-      {
-        "id": "AUG1",
-        "name": "ASDFGHJK-AUG1"
-      },
-      {
-        "id": "POI22",
-        "name": "POIUY123-POI22"
-      },
-      {
-        "id": "SAA13",
-        "name": "SAIT1AA9-SAA13"
-      },
-      {
-        "id": "BHY17",
-        "name": "BHYTFRF3-BHY17"
-      },
-      {
-        "id": "LIS1",
-        "name": "HOSTPROF-LIS1"
-      },
-      {
-        "id": "SIP1",
-        "name": "ZXCVBNMK-SIP1"
-      },
-      {
-        "id": "ATL99",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "ATL64",
-        "name": "FORLOAAJ-ATL64"
-      },
-      {
-        "id": "TAT33",
-        "name": "TESAAISA-TAT33"
-      },
-      {
-        "id": "RAD10",
-        "name": "INDIPUNE-RAD10"
-      },
-      {
-        "id": "RTW5",
-        "name": "BHYTFRY4-RTW5"
-      },
-      {
-        "id": "JGS1",
-        "name": "KSJKKKKK-JGS1"
-      },
-      {
-        "id": "ATL98",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "WAN1",
-        "name": "LEIWANGW-WAN1"
-      },
-      {
-        "id": "ATL44",
-        "name": "ATLSANAB-ATL44"
-      },
-      {
-        "id": "RTD2",
-        "name": "BHYTFRk4-RTD2"
-      },
-      {
-        "id": "NIR1",
-        "name": "ORFLMANA-NIR1"
-      },
-      {
-        "id": "ATL75",
-        "name": "SANAAIRE-ATL75"
-      },
-      {
-        "id": "NUM1",
-        "name": "QWERTYUI-NUM1"
-      },
-      {
-        "id": "hvf32",
-        "name": "MDTWNJ21-hvf32"
-      },
-      {
-        "id": "RTZ4",
-        "name": "BHYTFRZ6-RTZ4"
-      },
-      {
-        "id": "ATL56",
-        "name": "ATLSANAC-ATL56"
-      },
-      {
-        "id": "AMS1",
-        "name": "AMSTNLBW-AMS1"
-      },
-      {
-        "id": "RCT1",
-        "name": "AMSTERNL-RCT1"
-      },
-      {
-        "id": "JAN1",
-        "name": "ORFLMATT-JAN1"
-      },
-      {
-        "id": "ABC14",
-        "name": "TESAAISA-ABC14"
-      },
-      {
-        "id": "TAT37",
-        "name": "TESAAISD-TAT37"
-      },
-      {
-        "id": "MIC54",
-        "name": "MICHIGAN-MIC54"
-      },
-      {
-        "id": "ABC11",
-        "name": "ATLSANAI-ABC11"
-      },
-      {
-        "id": "AMF11",
-        "name": "AMDOCS01-AMF11"
-      },
-      {
-        "id": "ATL63",
-        "name": "ATLSANEW-ATL63"
-      },
-      {
-        "id": "ABC12",
-        "name": "ATLSECIA-ABC12"
-      },
-      {
-        "id": "hvf20",
-        "name": "MDTWNJ21-hvf20"
-      },
-      {
-        "id": "ABC15",
-        "name": "AAITESAN-ABC15"
-      },
       {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
index 6d984ba..c7f8821 100644 (file)
             "isPermitted": true
           },
           {
-            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-            "name": "AIN Web Tool-15-D-STTest2",
-            "isPermitted": true
-          },
-          {
-            "id": "1178612d2b394be4834ad77f567c0af2",
-            "name": "AIN Web Tool-15-D-SSPtestcustome",
-            "isPermitted": true
-          },
-          {
-            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-            "name": "AIN Web Tool-15-D-UncheckedEcopm",
-            "isPermitted": true
-          },
-          {
-            "id": "de007636e25249238447264a988a927b",
-            "name": "AIN Web Tool-15-D-dfsdf",
-            "isPermitted": true
-          },
-          {
-            "id": "62f29b3613634ca6a3065cbe0e020c44",
-            "name": "AIN/SMS-16-D-Multiservices1",
-            "isPermitted": true
-          },
-          {
-            "id": "649289e30d3244e0b48098114d63c2aa",
-            "name": "AIN Web Tool-15-D-SSPST66",
-            "isPermitted": true
-          },
-          {
-            "id": "3f21eeea6c2c486bba31dab816c05a32",
-            "name": "AIN Web Tool-15-D-ASSPST47",
-            "isPermitted": true
-          },
-          {
-            "id": "f60ce21d3ee6427586cff0d22b03b773",
-            "name": "CESAR-100-D-sspjg67246",
-            "isPermitted": true
-          },
-          {
-            "id": "8774659e425f479895ae091bb5d46560",
-            "name": "CESAR-100-D-sspjg68359",
-            "isPermitted": true
-          },
-          {
-            "id": "624eb554b0d147c19ff8885341760481",
-            "name": "AINWebTool-15-D-iftach",
-            "isPermitted": true
-          },
-          {
-            "id": "214f55f5fc414c678059c383b03e4962",
-            "name": "CESAR-100-D-sspjg612401",
-            "isPermitted": true
-          },
-          {
-            "id": "c90666c291664841bb98e4d981ff1db5",
-            "name": "CESAR-100-D-sspjg621340",
-            "isPermitted": true
-          },
-          {
-            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-            "name": "sspjg621351cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "b386b768a3f24c8e953abbe0b3488c02",
-            "name": "AINWebTool-15-D-eteancomp",
-            "isPermitted": true
-          },
-          {
-            "id": "dc6c4dbfd225474e9deaadd34968646c",
-            "name": "AINWebTool-15-T-SPFET",
-            "isPermitted": true
-          },
-          {
-            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-            "name": "AINWebTool-15-X-eeweww",
-            "isPermitted": true
-          },
-          {
-            "id": "f2f3830e4c984d45bcd00e1a04158a79",
-            "name": "CESAR-100-D-spjg61909",
-            "isPermitted": true
-          },
-          {
-            "id": "05b91bd5137f4929878edd965755c06d",
-            "name": "CESAR-100-D-sspjg621512cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "7002fbe8482d4a989ddf445b1ce336e0",
-            "name": "AINWebTool-15-X-vdr",
-            "isPermitted": true
-          },
-          {
-            "id": "4008522be43741dcb1f5422022a2aa0b",
-            "name": "AINWebTool-15-D-ssasa",
-            "isPermitted": true
-          },
-          {
-            "id": "f44e2e96a1b6476abfda2fa407b00169",
-            "name": "AINWebTool-15-D-PFNPT",
-            "isPermitted": true
-          },
-          {
-            "id": "b69a52bec8a84669a37a1e8b72708be7",
-            "name": "AINWebTool-15-X-vdre",
-            "isPermitted": true
-          },
-          {
-            "id": "fac7d9fd56154caeb9332202dcf2969f",
-            "name": "AINWebTool-15-X-NONPODECOMP",
-            "isPermitted": true
-          },
-          {
-            "id": "2d34d8396e194eb49969fd61ffbff961",
-            "name": "DN5242-Nov16-T5",
-            "isPermitted": true
-          },
-          {
-            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-            "name": "ro-T11",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true
           },
           {
             "name": "ro-T112",
             "isPermitted": true
           },
-          {
-            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-            "name": "DN5242-Nov21-T1",
-            "isPermitted": true
-          },
-          {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
-            "isPermitted": true
-          },
           {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
         "id": "YYY1",
         "name": "UUUAIAAI-YYY1"
       },
-      {
-        "id": "BAN1",
-        "name": "VSDKYUTP-BAN1"
-      },
-      {
-        "id": "DKJ1",
-        "name": "DKJSJDKA-DKJ1"
-      },
-      {
-        "id": "MCS1",
-        "name": "ASACMAMS-MCS1"
-      },
-      {
-        "id": "UIO1",
-        "name": "uioclli1-UIO1"
-      },
-      {
-        "id": "RAJ1",
-        "name": "YGBIJNLQ-RAJ1"
-      },
-      {
-        "id": "OPA1",
-        "name": "opaclli1-OPA1"
-      },
-      {
-        "id": "SDE1",
-        "name": "ZXCVBNMA-SDE1"
-      },
-      {
-        "id": "VEN2",
-        "name": "FGHJUHIL-VEN2"
-      },
-      {
-        "id": "ORL1",
-        "name": "ORLDFLMA-ORL1"
-      },
-      {
-        "id": "JAD1",
-        "name": "JADECLLI-JAD1"
-      },
-      {
-        "id": "ZXL1",
-        "name": "LWLWCANN-ZXL1"
-      },
-      {
-        "id": "CKL1",
-        "name": "CLKSKCKK-CKL1"
-      },
-      {
-        "id": "SDF1",
-        "name": "sdfclli1-SDF1"
-      },
-      {
-        "id": "RAD1",
-        "name": "RADICAL1-RAD1"
-      },
-      {
-        "id": "KIT1",
-        "name": "BHYJFGLN-KIT1"
-      },
-      {
-        "id": "REL1",
-        "name": "INGERFGT-REL1"
-      },
-      {
-        "id": "JNL1",
-        "name": "CJALSDAC-JNL1"
-      },
-      {
-        "id": "OLK1",
-        "name": "OLKOLKLS-OLK1"
-      },
-      {
-        "id": "CHI1",
-        "name": "CHILLIWE-CHI1"
-      },
-      {
-        "id": "UUU4",
-        "name": "UUUAAAUU-UUU4"
-      },
-      {
-        "id": "TUF1",
-        "name": "TUFCLLI1-TUF1"
-      },
-      {
-        "id": "KJN1",
-        "name": "CKALDKSA-KJN1"
-      },
-      {
-        "id": "SAM1",
-        "name": "SNDGCA64-SAN1"
-      },
-      {
-        "id": "SCK1",
-        "name": "SCKSCKSK-SCK1"
-      },
-      {
-        "id": "HJH1",
-        "name": "AOEEQQQD-HJH1"
-      },
-      {
-        "id": "HGD1",
-        "name": "SDFQWHGD-HGD1"
-      },
-      {
-        "id": "KOR1",
-        "name": "HYFLNBVT-KOR1"
-      },
-      {
-        "id": "ATL43",
-        "name": "AICLOCID-ATL43"
-      },
-      {
-        "id": "ATL54",
-        "name": "AICFTAAI-ATL54"
-      },
-      {
-        "id": "ATL66",
-        "name": "CLLIAAII-ATL66"
-      },
-      {
-        "id": "VEL1",
-        "name": "BNMLKUIK-VEL1"
-      },
-      {
-        "id": "ICC1",
-        "name": "SANJITAT-ICC1"
-      },
-      {
-        "id": "MNT11",
-        "name": "WSXEFBTH-MNT11"
-      },
-      {
-        "id": "DEF2",
-        "name": "WSBHGTYL-DEF2"
-      },
-      {
-        "id": "MAD11",
-        "name": "SDFQWGKL-MAD11"
-      },
-      {
-        "id": "OLG1",
-        "name": "OLHOLHOL-OLG1"
-      },
-      {
-        "id": "GAR1",
-        "name": "NGFVSJKO-GAR1"
-      },
-      {
-        "id": "SAN22",
-        "name": "GNVLSCTL-SAN22"
-      },
-      {
-        "id": "HRG1",
-        "name": "HRGHRGGS-HRG1"
-      },
-      {
-        "id": "JCS1",
-        "name": "JCSJSCJS-JCS1"
-      },
-      {
-        "id": "DHA12",
-        "name": "WSXEDECF-DHA12"
-      },
-      {
-        "id": "HJE1",
-        "name": "AOEEWWWD-HJE1"
-      },
-      {
-        "id": "NCA1",
-        "name": "NCANCANN-NCA1"
-      },
-      {
-        "id": "IOP1",
-        "name": "iopclli1-IOP1"
-      },
-      {
-        "id": "RTY1",
-        "name": "rtyclli1-RTY1"
-      },
-      {
-        "id": "KAP1",
-        "name": "HIOUYTRQ-KAP1"
-      },
-      {
-        "id": "ZEN1",
-        "name": "ZENCLLI1-ZEN1"
-      },
-      {
-        "id": "HKA1",
-        "name": "JAKHLASS-HKA1"
-      },
-      {
-        "id": "CQK1",
-        "name": "CQKSCAKK-CQK1"
-      },
-      {
-        "id": "SAI1",
-        "name": "UBEKQLPD-SAI1"
-      },
-      {
-        "id": "ERT1",
-        "name": "ertclli1-ERT1"
-      },
-      {
-        "id": "IBB1",
-        "name": "PLMKOIJU-IBB1"
-      },
-      {
-        "id": "TIR2",
-        "name": "PLKINHYI-TIR2"
-      },
-      {
-        "id": "HSD1",
-        "name": "CHASKCDS-HSD1"
-      },
-      {
-        "id": "SLF78",
-        "name": "SDCTLFN1-SLF78"
-      },
-      {
-        "id": "SEE78",
-        "name": "SDCTEEE4-SEE78"
-      },
-      {
-        "id": "SAN13",
-        "name": "TOKYJPFA-SAN13"
-      },
-      {
-        "id": "SAA78",
-        "name": "SDCTAAA1-SAA78"
-      },
-      {
-        "id": "LUC1",
-        "name": "ATLDFGYC-LUC1"
-      },
-      {
-        "id": "AMD13",
-        "name": "MEMATLAN-AMD13"
-      },
-      {
-        "id": "TOR1",
-        "name": "TOROONXN-TOR1"
-      },
-      {
-        "id": "QWE1",
-        "name": "QWECLLI1-QWE1"
-      },
-      {
-        "id": "ZOG1",
-        "name": "ZOGASTRO-ZOG1"
-      },
-      {
-        "id": "CAL33",
-        "name": "CALIFORN-CAL33"
-      },
-      {
-        "id": "SHH78",
-        "name": "SDIT1HHH-SHH78"
-      },
-      {
-        "id": "DSA1",
-        "name": "LKJHGFDS-DSA1"
-      },
-      {
-        "id": "CLG1",
-        "name": "CLGRABAD-CLG1"
-      },
-      {
-        "id": "BNA1",
-        "name": "BNARAGBK-BNA1"
-      },
-      {
-        "id": "ATL84",
-        "name": "CANTTCOC-ATL84"
-      },
-      {
-        "id": "APP1",
-        "name": "WBHGTYUI-APP1"
-      },
-      {
-        "id": "RJN1",
-        "name": "RJNRBZAW-RJN1"
-      },
-      {
-        "id": "EHH78",
-        "name": "SDCSHHH5-EHH78"
-      },
-      {
-        "id": "mac10",
-        "name": "PKGTESTF-mac10"
-      },
-      {
-        "id": "SXB78",
-        "name": "SDCTGXB1-SXB78"
-      },
-      {
-        "id": "SAX78",
-        "name": "SDCTAXG1-SAX78"
-      },
-      {
-        "id": "SYD1",
-        "name": "SYDNAUBV-SYD1"
-      },
-      {
-        "id": "TOK1",
-        "name": "TOKYJPFA-TOK1"
-      },
-      {
-        "id": "KGM2",
-        "name": "KGMTNC20-KGM2"
-      },
-      {
-        "id": "DCC1b",
-        "name": "POIUYTGH-DCC1b"
-      },
-      {
-        "id": "SKK78",
-        "name": "SDCTKKK1-SKK78"
-      },
-      {
-        "id": "SGG78",
-        "name": "SDCTGGG1-SGG78"
-      },
-      {
-        "id": "SJJ78",
-        "name": "SDCTJJJ1-SJJ78"
-      },
-      {
-        "id": "SBX78",
-        "name": "SDCTBXG1-SBX78"
-      },
-      {
-        "id": "LAG1",
-        "name": "LARGIZON-LAG1"
-      },
-      {
-        "id": "IAA1",
-        "name": "QAZXSWED-IAA1"
-      },
-      {
-        "id": "POI1",
-        "name": "PLMNJKIU-POI1"
-      },
-      {
-        "id": "LAG1a",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "PBL1",
-        "name": "PBLAPBAI-PBL1"
-      },
-      {
-        "id": "LAG45",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "MAR1",
-        "name": "MNBVCXZM-MAR1"
-      },
-      {
-        "id": "HST70",
-        "name": "HSTNTX70-HST70"
-      },
-      {
-        "id": "DCC1a",
-        "name": "POIUYTGH-DCC1a"
-      },
-      {
-        "id": "TOL1",
-        "name": "TOLDOH21-TOL1"
-      },
-      {
-        "id": "LON1",
-        "name": "LONEENCO-LON1"
-      },
-      {
-        "id": "SJU78",
-        "name": "SDIT1JUB-SJU78"
-      },
-      {
-        "id": "STN27",
-        "name": "HSTNTX01-STN27"
-      },
-      {
-        "id": "SSW56",
-        "name": "ss8126GT-SSW56"
-      },
-      {
-        "id": "SBB78",
-        "name": "SDIT1BBB-SBB78"
-      },
-      {
-        "id": "DCC3",
-        "name": "POIUYTGH-DCC3"
-      },
-      {
-        "id": "GNV1",
-        "name": "GNVLSCTL-GNV1"
-      },
-      {
-        "id": "WAS1",
-        "name": "WASHDCSW-WAS1"
-      },
-      {
-        "id": "TOY1",
-        "name": "TORYONNZ-TOY1"
-      },
-      {
-        "id": "STT1",
-        "name": "STTLWA02-STT1"
-      },
-      {
-        "id": "STG1",
-        "name": "STTGGE62-STG1"
-      },
-      {
-        "id": "SLL78",
-        "name": "SDCTLLL1-SLL78"
-      },
-      {
-        "id": "SBU78",
-        "name": "SDIT1BUB-SBU78"
-      },
-      {
-        "id": "ATL2",
-        "name": "ATLNGANW-ATL2"
-      },
-      {
-        "id": "BOT1",
-        "name": "BOTHWAKY-BOT1"
-      },
-      {
-        "id": "SNG1",
-        "name": "SNGPSIAU-SNG1"
-      },
-      {
-        "id": "NYC1",
-        "name": "NYCMNY54-NYC1"
-      },
-      {
-        "id": "LAG1b",
-        "name": "LARGIZON-LAG1b"
-      },
-      {
-        "id": "AMD15",
-        "name": "AMDFAA01-AMD15"
-      },
-      {
-        "id": "SNA1",
-        "name": "SNANTXCA-SNA1"
-      },
-      {
-        "id": "PLT1",
-        "name": "PLTNCA60-PLT1"
-      },
-      {
-        "id": "TLP1",
-        "name": "TLPNXM18-TLP1"
-      },
-      {
-        "id": "SDD81",
-        "name": "SAIT1DD6-SDD81"
-      },
-      {
-        "id": "DCC1",
-        "name": "POIUYTGH-DCC1"
-      },
-      {
-        "id": "DCC2",
-        "name": "POIUYTGH-DCC2"
-      },
-      {
-        "id": "OKC1",
-        "name": "OKCBOK55-OKC1"
-      },
-      {
-        "id": "PAR1",
-        "name": "PARSFRCG-PAR1"
-      },
-      {
-        "id": "TES36",
-        "name": "ABCEETES-TES36"
-      },
-      {
-        "id": "COM1",
-        "name": "PLMKOPIU-COM1"
-      },
-      {
-        "id": "ANI1",
-        "name": "ATLNGTRE-ANI1"
-      },
-      {
-        "id": "SDG78",
-        "name": "SDIT1BDG-SDG78"
-      },
-      {
-        "id": "mac20",
-        "name": "PKGTESTF-mac20"
-      },
-      {
-        "id": "DSF45",
-        "name": "DSFBG123-DSF45"
-      },
-      {
-        "id": "HST25",
-        "name": "HSTNTX01-HST25"
-      },
-      {
-        "id": "AMD18",
-        "name": "AUDIMA01-AMD18"
-      },
-      {
-        "id": "SAA80",
-        "name": "SAIT9AA3-SAA80"
-      },
-      {
-        "id": "SSA56",
-        "name": "SSIT2AA7-SSA56"
-      },
-      {
-        "id": "SDD82",
-        "name": "SAIT1DD9-SDD82"
-      },
-      {
-        "id": "JCV1",
-        "name": "JCVLFLBW-JCV1"
-      },
-      {
-        "id": "SUL2",
-        "name": "WERTYUJK-SUL2"
-      },
-      {
-        "id": "PUR1",
-        "name": "purelyde-PUR1"
-      },
-      {
-        "id": "FDE55",
-        "name": "FDERT555-FDE55"
-      },
-      {
-        "id": "SITE",
-        "name": "LONEENCO-SITE"
-      },
-      {
-        "id": "ATL1",
-        "name": "ATLNGAMA-ATL1"
-      },
-      {
-        "id": "JUL1",
-        "name": "ZXCVBNMM-JUL1"
-      },
-      {
-        "id": "TAT34",
-        "name": "TESAAISB-TAT34"
-      },
-      {
-        "id": "XCP12",
-        "name": "CHKGH123-XCP12"
-      },
-      {
-        "id": "RAI1",
-        "name": "poiuytre-RAI1"
-      },
-      {
-        "id": "HPO1",
-        "name": "ATLNGAUP-HPO1"
-      },
-      {
-        "id": "KJF12",
-        "name": "KJFDH123-KJF12"
-      },
-      {
-        "id": "SCC80",
-        "name": "SAIT9CC3-SCC80"
-      },
-      {
-        "id": "SAA12",
-        "name": "SAIT9AF8-SAA12"
-      },
-      {
-        "id": "SAA14",
-        "name": "SAIT1AA9-SAA14"
-      },
-      {
-        "id": "ATL35",
-        "name": "TTESSAAI-ATL35"
-      },
-      {
-        "id": "CWY1",
-        "name": "CWYMOWBS-CWY1"
-      },
-      {
-        "id": "ATL76",
-        "name": "TELEPAAI-ATL76"
-      },
-      {
-        "id": "DSL12",
-        "name": "DSLFK242-DSL12"
-      },
-      {
-        "id": "ATL53",
-        "name": "AAIATLTE-ATL53"
-      },
-      {
-        "id": "SAA11",
-        "name": "SAIT9AA2-SAA11"
-      },
-      {
-        "id": "ATL62",
-        "name": "TESSASCH-ATL62"
-      },
-      {
-        "id": "AUG1",
-        "name": "ASDFGHJK-AUG1"
-      },
-      {
-        "id": "POI22",
-        "name": "POIUY123-POI22"
-      },
-      {
-        "id": "SAA13",
-        "name": "SAIT1AA9-SAA13"
-      },
-      {
-        "id": "BHY17",
-        "name": "BHYTFRF3-BHY17"
-      },
-      {
-        "id": "LIS1",
-        "name": "HOSTPROF-LIS1"
-      },
-      {
-        "id": "SIP1",
-        "name": "ZXCVBNMK-SIP1"
-      },
-      {
-        "id": "ATL99",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "ATL64",
-        "name": "FORLOAAJ-ATL64"
-      },
-      {
-        "id": "TAT33",
-        "name": "TESAAISA-TAT33"
-      },
-      {
-        "id": "RAD10",
-        "name": "INDIPUNE-RAD10"
-      },
-      {
-        "id": "RTW5",
-        "name": "BHYTFRY4-RTW5"
-      },
-      {
-        "id": "JGS1",
-        "name": "KSJKKKKK-JGS1"
-      },
-      {
-        "id": "ATL98",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "WAN1",
-        "name": "LEIWANGW-WAN1"
-      },
-      {
-        "id": "ATL44",
-        "name": "ATLSANAB-ATL44"
-      },
-      {
-        "id": "RTD2",
-        "name": "BHYTFRk4-RTD2"
-      },
-      {
-        "id": "NIR1",
-        "name": "ORFLMANA-NIR1"
-      },
-      {
-        "id": "ATL75",
-        "name": "SANAAIRE-ATL75"
-      },
-      {
-        "id": "NUM1",
-        "name": "QWERTYUI-NUM1"
-      },
-      {
-        "id": "hvf32",
-        "name": "MDTWNJ21-hvf32"
-      },
-      {
-        "id": "RTZ4",
-        "name": "BHYTFRZ6-RTZ4"
-      },
-      {
-        "id": "ATL56",
-        "name": "ATLSANAC-ATL56"
-      },
-      {
-        "id": "AMS1",
-        "name": "AMSTNLBW-AMS1"
-      },
-      {
-        "id": "RCT1",
-        "name": "AMSTERNL-RCT1"
-      },
-      {
-        "id": "JAN1",
-        "name": "ORFLMATT-JAN1"
-      },
-      {
-        "id": "ABC14",
-        "name": "TESAAISA-ABC14"
-      },
-      {
-        "id": "TAT37",
-        "name": "TESAAISD-TAT37"
-      },
-      {
-        "id": "MIC54",
-        "name": "MICHIGAN-MIC54"
-      },
-      {
-        "id": "ABC11",
-        "name": "ATLSANAI-ABC11"
-      },
-      {
-        "id": "AMF11",
-        "name": "AMDOCS01-AMF11"
-      },
-      {
-        "id": "ATL63",
-        "name": "ATLSANEW-ATL63"
-      },
-      {
-        "id": "ABC12",
-        "name": "ATLSECIA-ABC12"
-      },
-      {
-        "id": "hvf20",
-        "name": "MDTWNJ21-hvf20"
-      },
-      {
-        "id": "ABC15",
-        "name": "AAITESAN-ABC15"
-      },
       {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
index 2451d1e..d1d2386 100644 (file)
@@ -16,5 +16,7 @@
   "FLAG_VF_MODULE_RESUME_STATUS_CREATE" : true,
   "FLAG_1906_COMPONENT_INFO": true,
   "FLAG_1908_RESUME_MACRO_SERVICE": true,
-  "FLAG_ENABLE_WEBPACK_MODERN_UI": true
+  "FLAG_ENABLE_WEBPACK_MODERN_UI": true,
+  "FLAG_FLASH_REPLACE_VF_MODULE": true,
+  "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT": true
 }
index 2c43efd..b87f407 100644 (file)
             "isPermitted": true
           },
           {
-            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-            "name": "AIN Web Tool-15-D-STTest2",
-            "isPermitted": true
-          },
-          {
-            "id": "1178612d2b394be4834ad77f567c0af2",
-            "name": "AIN Web Tool-15-D-SSPtestcustome",
-            "isPermitted": true
-          },
-          {
-            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-            "name": "AIN Web Tool-15-D-UncheckedEcopm",
-            "isPermitted": true
-          },
-          {
-            "id": "de007636e25249238447264a988a927b",
-            "name": "AIN Web Tool-15-D-dfsdf",
-            "isPermitted": true
-          },
-          {
-            "id": "62f29b3613634ca6a3065cbe0e020c44",
-            "name": "AIN/SMS-16-D-Multiservices1",
-            "isPermitted": true
-          },
-          {
-            "id": "649289e30d3244e0b48098114d63c2aa",
-            "name": "AIN Web Tool-15-D-SSPST66",
-            "isPermitted": true
-          },
-          {
-            "id": "3f21eeea6c2c486bba31dab816c05a32",
-            "name": "AIN Web Tool-15-D-ASSPST47",
-            "isPermitted": true
-          },
-          {
-            "id": "f60ce21d3ee6427586cff0d22b03b773",
-            "name": "CESAR-100-D-sspjg67246",
-            "isPermitted": true
-          },
-          {
-            "id": "8774659e425f479895ae091bb5d46560",
-            "name": "CESAR-100-D-sspjg68359",
-            "isPermitted": true
-          },
-          {
-            "id": "624eb554b0d147c19ff8885341760481",
-            "name": "AINWebTool-15-D-iftach",
-            "isPermitted": true
-          },
-          {
-            "id": "214f55f5fc414c678059c383b03e4962",
-            "name": "CESAR-100-D-sspjg612401",
-            "isPermitted": true
-          },
-          {
-            "id": "c90666c291664841bb98e4d981ff1db5",
-            "name": "CESAR-100-D-sspjg621340",
-            "isPermitted": true
-          },
-          {
-            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-            "name": "sspjg621351cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "b386b768a3f24c8e953abbe0b3488c02",
-            "name": "AINWebTool-15-D-eteancomp",
-            "isPermitted": true
-          },
-          {
-            "id": "dc6c4dbfd225474e9deaadd34968646c",
-            "name": "AINWebTool-15-T-SPFET",
-            "isPermitted": true
-          },
-          {
-            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-            "name": "AINWebTool-15-X-eeweww",
-            "isPermitted": true
-          },
-          {
-            "id": "f2f3830e4c984d45bcd00e1a04158a79",
-            "name": "CESAR-100-D-spjg61909",
-            "isPermitted": true
-          },
-          {
-            "id": "05b91bd5137f4929878edd965755c06d",
-            "name": "CESAR-100-D-sspjg621512cloned",
-            "isPermitted": true
-          },
-          {
-            "id": "7002fbe8482d4a989ddf445b1ce336e0",
-            "name": "AINWebTool-15-X-vdr",
-            "isPermitted": true
-          },
-          {
-            "id": "4008522be43741dcb1f5422022a2aa0b",
-            "name": "AINWebTool-15-D-ssasa",
-            "isPermitted": true
-          },
-          {
-            "id": "f44e2e96a1b6476abfda2fa407b00169",
-            "name": "AINWebTool-15-D-PFNPT",
-            "isPermitted": true
-          },
-          {
-            "id": "b69a52bec8a84669a37a1e8b72708be7",
-            "name": "AINWebTool-15-X-vdre",
-            "isPermitted": true
-          },
-          {
-            "id": "fac7d9fd56154caeb9332202dcf2969f",
-            "name": "AINWebTool-15-X-NONPODECOMP",
-            "isPermitted": true
-          },
-          {
-            "id": "2d34d8396e194eb49969fd61ffbff961",
-            "name": "DN5242-Nov16-T5",
-            "isPermitted": true
-          },
-          {
-            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-            "name": "ro-T11",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true
           },
           {
             "name": "ro-T112",
             "isPermitted": true
           },
-          {
-            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-            "name": "DN5242-Nov21-T1",
-            "isPermitted": true
-          },
-          {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
-            "isPermitted": true
-          },
           {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
         "id": "YYY1",
         "name": "UUUAIAAI-YYY1"
       },
-      {
-        "id": "BAN1",
-        "name": "VSDKYUTP-BAN1"
-      },
-      {
-        "id": "DKJ1",
-        "name": "DKJSJDKA-DKJ1"
-      },
-      {
-        "id": "MCS1",
-        "name": "ASACMAMS-MCS1"
-      },
-      {
-        "id": "UIO1",
-        "name": "uioclli1-UIO1"
-      },
-      {
-        "id": "RAJ1",
-        "name": "YGBIJNLQ-RAJ1"
-      },
-      {
-        "id": "OPA1",
-        "name": "opaclli1-OPA1"
-      },
-      {
-        "id": "SDE1",
-        "name": "ZXCVBNMA-SDE1"
-      },
-      {
-        "id": "VEN2",
-        "name": "FGHJUHIL-VEN2"
-      },
-      {
-        "id": "ORL1",
-        "name": "ORLDFLMA-ORL1"
-      },
-      {
-        "id": "JAD1",
-        "name": "JADECLLI-JAD1"
-      },
-      {
-        "id": "ZXL1",
-        "name": "LWLWCANN-ZXL1"
-      },
-      {
-        "id": "CKL1",
-        "name": "CLKSKCKK-CKL1"
-      },
-      {
-        "id": "SDF1",
-        "name": "sdfclli1-SDF1"
-      },
-      {
-        "id": "RAD1",
-        "name": "RADICAL1-RAD1"
-      },
-      {
-        "id": "KIT1",
-        "name": "BHYJFGLN-KIT1"
-      },
-      {
-        "id": "REL1",
-        "name": "INGERFGT-REL1"
-      },
-      {
-        "id": "JNL1",
-        "name": "CJALSDAC-JNL1"
-      },
-      {
-        "id": "OLK1",
-        "name": "OLKOLKLS-OLK1"
-      },
-      {
-        "id": "CHI1",
-        "name": "CHILLIWE-CHI1"
-      },
-      {
-        "id": "UUU4",
-        "name": "UUUAAAUU-UUU4"
-      },
-      {
-        "id": "TUF1",
-        "name": "TUFCLLI1-TUF1"
-      },
-      {
-        "id": "KJN1",
-        "name": "CKALDKSA-KJN1"
-      },
-      {
-        "id": "SAM1",
-        "name": "SNDGCA64-SAN1"
-      },
-      {
-        "id": "SCK1",
-        "name": "SCKSCKSK-SCK1"
-      },
-      {
-        "id": "HJH1",
-        "name": "AOEEQQQD-HJH1"
-      },
-      {
-        "id": "HGD1",
-        "name": "SDFQWHGD-HGD1"
-      },
-      {
-        "id": "KOR1",
-        "name": "HYFLNBVT-KOR1"
-      },
-      {
-        "id": "ATL43",
-        "name": "AICLOCID-ATL43"
-      },
-      {
-        "id": "ATL54",
-        "name": "AICFTAAI-ATL54"
-      },
-      {
-        "id": "ATL66",
-        "name": "CLLIAAII-ATL66"
-      },
-      {
-        "id": "VEL1",
-        "name": "BNMLKUIK-VEL1"
-      },
-      {
-        "id": "ICC1",
-        "name": "SANJITAT-ICC1"
-      },
-      {
-        "id": "MNT11",
-        "name": "WSXEFBTH-MNT11"
-      },
-      {
-        "id": "DEF2",
-        "name": "WSBHGTYL-DEF2"
-      },
-      {
-        "id": "MAD11",
-        "name": "SDFQWGKL-MAD11"
-      },
-      {
-        "id": "OLG1",
-        "name": "OLHOLHOL-OLG1"
-      },
-      {
-        "id": "GAR1",
-        "name": "NGFVSJKO-GAR1"
-      },
-      {
-        "id": "SAN22",
-        "name": "GNVLSCTL-SAN22"
-      },
-      {
-        "id": "HRG1",
-        "name": "HRGHRGGS-HRG1"
-      },
-      {
-        "id": "JCS1",
-        "name": "JCSJSCJS-JCS1"
-      },
-      {
-        "id": "DHA12",
-        "name": "WSXEDECF-DHA12"
-      },
-      {
-        "id": "HJE1",
-        "name": "AOEEWWWD-HJE1"
-      },
-      {
-        "id": "NCA1",
-        "name": "NCANCANN-NCA1"
-      },
-      {
-        "id": "IOP1",
-        "name": "iopclli1-IOP1"
-      },
-      {
-        "id": "RTY1",
-        "name": "rtyclli1-RTY1"
-      },
-      {
-        "id": "KAP1",
-        "name": "HIOUYTRQ-KAP1"
-      },
-      {
-        "id": "ZEN1",
-        "name": "ZENCLLI1-ZEN1"
-      },
-      {
-        "id": "HKA1",
-        "name": "JAKHLASS-HKA1"
-      },
-      {
-        "id": "CQK1",
-        "name": "CQKSCAKK-CQK1"
-      },
-      {
-        "id": "SAI1",
-        "name": "UBEKQLPD-SAI1"
-      },
-      {
-        "id": "ERT1",
-        "name": "ertclli1-ERT1"
-      },
-      {
-        "id": "IBB1",
-        "name": "PLMKOIJU-IBB1"
-      },
-      {
-        "id": "TIR2",
-        "name": "PLKINHYI-TIR2"
-      },
-      {
-        "id": "HSD1",
-        "name": "CHASKCDS-HSD1"
-      },
-      {
-        "id": "SLF78",
-        "name": "SDCTLFN1-SLF78"
-      },
-      {
-        "id": "SEE78",
-        "name": "SDCTEEE4-SEE78"
-      },
-      {
-        "id": "SAN13",
-        "name": "TOKYJPFA-SAN13"
-      },
-      {
-        "id": "SAA78",
-        "name": "SDCTAAA1-SAA78"
-      },
-      {
-        "id": "LUC1",
-        "name": "ATLDFGYC-LUC1"
-      },
-      {
-        "id": "AMD13",
-        "name": "MEMATLAN-AMD13"
-      },
-      {
-        "id": "TOR1",
-        "name": "TOROONXN-TOR1"
-      },
-      {
-        "id": "QWE1",
-        "name": "QWECLLI1-QWE1"
-      },
-      {
-        "id": "ZOG1",
-        "name": "ZOGASTRO-ZOG1"
-      },
-      {
-        "id": "CAL33",
-        "name": "CALIFORN-CAL33"
-      },
-      {
-        "id": "SHH78",
-        "name": "SDIT1HHH-SHH78"
-      },
-      {
-        "id": "DSA1",
-        "name": "LKJHGFDS-DSA1"
-      },
-      {
-        "id": "CLG1",
-        "name": "CLGRABAD-CLG1"
-      },
-      {
-        "id": "BNA1",
-        "name": "BNARAGBK-BNA1"
-      },
-      {
-        "id": "ATL84",
-        "name": "CANTTCOC-ATL84"
-      },
-      {
-        "id": "APP1",
-        "name": "WBHGTYUI-APP1"
-      },
-      {
-        "id": "RJN1",
-        "name": "RJNRBZAW-RJN1"
-      },
-      {
-        "id": "EHH78",
-        "name": "SDCSHHH5-EHH78"
-      },
-      {
-        "id": "mac10",
-        "name": "PKGTESTF-mac10"
-      },
-      {
-        "id": "SXB78",
-        "name": "SDCTGXB1-SXB78"
-      },
-      {
-        "id": "SAX78",
-        "name": "SDCTAXG1-SAX78"
-      },
-      {
-        "id": "SYD1",
-        "name": "SYDNAUBV-SYD1"
-      },
-      {
-        "id": "TOK1",
-        "name": "TOKYJPFA-TOK1"
-      },
-      {
-        "id": "KGM2",
-        "name": "KGMTNC20-KGM2"
-      },
-      {
-        "id": "DCC1b",
-        "name": "POIUYTGH-DCC1b"
-      },
-      {
-        "id": "SKK78",
-        "name": "SDCTKKK1-SKK78"
-      },
-      {
-        "id": "SGG78",
-        "name": "SDCTGGG1-SGG78"
-      },
-      {
-        "id": "SJJ78",
-        "name": "SDCTJJJ1-SJJ78"
-      },
-      {
-        "id": "SBX78",
-        "name": "SDCTBXG1-SBX78"
-      },
-      {
-        "id": "LAG1",
-        "name": "LARGIZON-LAG1"
-      },
-      {
-        "id": "IAA1",
-        "name": "QAZXSWED-IAA1"
-      },
-      {
-        "id": "POI1",
-        "name": "PLMNJKIU-POI1"
-      },
-      {
-        "id": "LAG1a",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "PBL1",
-        "name": "PBLAPBAI-PBL1"
-      },
-      {
-        "id": "LAG45",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "MAR1",
-        "name": "MNBVCXZM-MAR1"
-      },
-      {
-        "id": "HST70",
-        "name": "HSTNTX70-HST70"
-      },
-      {
-        "id": "DCC1a",
-        "name": "POIUYTGH-DCC1a"
-      },
-      {
-        "id": "TOL1",
-        "name": "TOLDOH21-TOL1"
-      },
-      {
-        "id": "LON1",
-        "name": "LONEENCO-LON1"
-      },
-      {
-        "id": "SJU78",
-        "name": "SDIT1JUB-SJU78"
-      },
-      {
-        "id": "STN27",
-        "name": "HSTNTX01-STN27"
-      },
-      {
-        "id": "SSW56",
-        "name": "ss8126GT-SSW56"
-      },
-      {
-        "id": "SBB78",
-        "name": "SDIT1BBB-SBB78"
-      },
-      {
-        "id": "DCC3",
-        "name": "POIUYTGH-DCC3"
-      },
-      {
-        "id": "GNV1",
-        "name": "GNVLSCTL-GNV1"
-      },
-      {
-        "id": "WAS1",
-        "name": "WASHDCSW-WAS1"
-      },
-      {
-        "id": "TOY1",
-        "name": "TORYONNZ-TOY1"
-      },
-      {
-        "id": "STT1",
-        "name": "STTLWA02-STT1"
-      },
-      {
-        "id": "STG1",
-        "name": "STTGGE62-STG1"
-      },
-      {
-        "id": "SLL78",
-        "name": "SDCTLLL1-SLL78"
-      },
-      {
-        "id": "SBU78",
-        "name": "SDIT1BUB-SBU78"
-      },
-      {
-        "id": "ATL2",
-        "name": "ATLNGANW-ATL2"
-      },
-      {
-        "id": "BOT1",
-        "name": "BOTHWAKY-BOT1"
-      },
-      {
-        "id": "SNG1",
-        "name": "SNGPSIAU-SNG1"
-      },
-      {
-        "id": "NYC1",
-        "name": "NYCMNY54-NYC1"
-      },
-      {
-        "id": "LAG1b",
-        "name": "LARGIZON-LAG1b"
-      },
-      {
-        "id": "AMD15",
-        "name": "AMDFAA01-AMD15"
-      },
-      {
-        "id": "SNA1",
-        "name": "SNANTXCA-SNA1"
-      },
-      {
-        "id": "PLT1",
-        "name": "PLTNCA60-PLT1"
-      },
-      {
-        "id": "TLP1",
-        "name": "TLPNXM18-TLP1"
-      },
-      {
-        "id": "SDD81",
-        "name": "SAIT1DD6-SDD81"
-      },
-      {
-        "id": "DCC1",
-        "name": "POIUYTGH-DCC1"
-      },
-      {
-        "id": "DCC2",
-        "name": "POIUYTGH-DCC2"
-      },
-      {
-        "id": "OKC1",
-        "name": "OKCBOK55-OKC1"
-      },
-      {
-        "id": "PAR1",
-        "name": "PARSFRCG-PAR1"
-      },
-      {
-        "id": "TES36",
-        "name": "ABCEETES-TES36"
-      },
-      {
-        "id": "COM1",
-        "name": "PLMKOPIU-COM1"
-      },
-      {
-        "id": "ANI1",
-        "name": "ATLNGTRE-ANI1"
-      },
-      {
-        "id": "SDG78",
-        "name": "SDIT1BDG-SDG78"
-      },
-      {
-        "id": "mac20",
-        "name": "PKGTESTF-mac20"
-      },
-      {
-        "id": "DSF45",
-        "name": "DSFBG123-DSF45"
-      },
-      {
-        "id": "HST25",
-        "name": "HSTNTX01-HST25"
-      },
-      {
-        "id": "AMD18",
-        "name": "AUDIMA01-AMD18"
-      },
-      {
-        "id": "SAA80",
-        "name": "SAIT9AA3-SAA80"
-      },
-      {
-        "id": "SSA56",
-        "name": "SSIT2AA7-SSA56"
-      },
-      {
-        "id": "SDD82",
-        "name": "SAIT1DD9-SDD82"
-      },
-      {
-        "id": "JCV1",
-        "name": "JCVLFLBW-JCV1"
-      },
-      {
-        "id": "SUL2",
-        "name": "WERTYUJK-SUL2"
-      },
-      {
-        "id": "PUR1",
-        "name": "purelyde-PUR1"
-      },
-      {
-        "id": "FDE55",
-        "name": "FDERT555-FDE55"
-      },
-      {
-        "id": "SITE",
-        "name": "LONEENCO-SITE"
-      },
-      {
-        "id": "ATL1",
-        "name": "ATLNGAMA-ATL1"
-      },
-      {
-        "id": "JUL1",
-        "name": "ZXCVBNMM-JUL1"
-      },
-      {
-        "id": "TAT34",
-        "name": "TESAAISB-TAT34"
-      },
-      {
-        "id": "XCP12",
-        "name": "CHKGH123-XCP12"
-      },
-      {
-        "id": "RAI1",
-        "name": "poiuytre-RAI1"
-      },
-      {
-        "id": "HPO1",
-        "name": "ATLNGAUP-HPO1"
-      },
-      {
-        "id": "KJF12",
-        "name": "KJFDH123-KJF12"
-      },
-      {
-        "id": "SCC80",
-        "name": "SAIT9CC3-SCC80"
-      },
-      {
-        "id": "SAA12",
-        "name": "SAIT9AF8-SAA12"
-      },
-      {
-        "id": "SAA14",
-        "name": "SAIT1AA9-SAA14"
-      },
-      {
-        "id": "ATL35",
-        "name": "TTESSAAI-ATL35"
-      },
-      {
-        "id": "CWY1",
-        "name": "CWYMOWBS-CWY1"
-      },
-      {
-        "id": "ATL76",
-        "name": "TELEPAAI-ATL76"
-      },
-      {
-        "id": "DSL12",
-        "name": "DSLFK242-DSL12"
-      },
-      {
-        "id": "ATL53",
-        "name": "AAIATLTE-ATL53"
-      },
-      {
-        "id": "SAA11",
-        "name": "SAIT9AA2-SAA11"
-      },
-      {
-        "id": "ATL62",
-        "name": "TESSASCH-ATL62"
-      },
-      {
-        "id": "AUG1",
-        "name": "ASDFGHJK-AUG1"
-      },
-      {
-        "id": "POI22",
-        "name": "POIUY123-POI22"
-      },
-      {
-        "id": "SAA13",
-        "name": "SAIT1AA9-SAA13"
-      },
-      {
-        "id": "BHY17",
-        "name": "BHYTFRF3-BHY17"
-      },
-      {
-        "id": "LIS1",
-        "name": "HOSTPROF-LIS1"
-      },
-      {
-        "id": "SIP1",
-        "name": "ZXCVBNMK-SIP1"
-      },
-      {
-        "id": "ATL99",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "ATL64",
-        "name": "FORLOAAJ-ATL64"
-      },
-      {
-        "id": "TAT33",
-        "name": "TESAAISA-TAT33"
-      },
-      {
-        "id": "RAD10",
-        "name": "INDIPUNE-RAD10"
-      },
-      {
-        "id": "RTW5",
-        "name": "BHYTFRY4-RTW5"
-      },
-      {
-        "id": "JGS1",
-        "name": "KSJKKKKK-JGS1"
-      },
-      {
-        "id": "ATL98",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "WAN1",
-        "name": "LEIWANGW-WAN1"
-      },
-      {
-        "id": "ATL44",
-        "name": "ATLSANAB-ATL44"
-      },
-      {
-        "id": "RTD2",
-        "name": "BHYTFRk4-RTD2"
-      },
-      {
-        "id": "NIR1",
-        "name": "ORFLMANA-NIR1"
-      },
-      {
-        "id": "ATL75",
-        "name": "SANAAIRE-ATL75"
-      },
-      {
-        "id": "NUM1",
-        "name": "QWERTYUI-NUM1"
-      },
-      {
-        "id": "hvf32",
-        "name": "MDTWNJ21-hvf32"
-      },
-      {
-        "id": "RTZ4",
-        "name": "BHYTFRZ6-RTZ4"
-      },
-      {
-        "id": "ATL56",
-        "name": "ATLSANAC-ATL56"
-      },
-      {
-        "id": "AMS1",
-        "name": "AMSTNLBW-AMS1"
-      },
-      {
-        "id": "RCT1",
-        "name": "AMSTERNL-RCT1"
-      },
-      {
-        "id": "JAN1",
-        "name": "ORFLMATT-JAN1"
-      },
-      {
-        "id": "ABC14",
-        "name": "TESAAISA-ABC14"
-      },
-      {
-        "id": "TAT37",
-        "name": "TESAAISD-TAT37"
-      },
-      {
-        "id": "MIC54",
-        "name": "MICHIGAN-MIC54"
-      },
-      {
-        "id": "ABC11",
-        "name": "ATLSANAI-ABC11"
-      },
-      {
-        "id": "AMF11",
-        "name": "AMDOCS01-AMF11"
-      },
-      {
-        "id": "ATL63",
-        "name": "ATLSANEW-ATL63"
-      },
-      {
-        "id": "ABC12",
-        "name": "ATLSECIA-ABC12"
-      },
-      {
-        "id": "hvf20",
-        "name": "MDTWNJ21-hvf20"
-      },
-      {
-        "id": "ABC15",
-        "name": "AAITESAN-ABC15"
-      },
       {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
index a96da4c..61d4c23 100644 (file)
             "cloudOwner": "irma-aic"
           },
           {
-            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-            "name": "AIN Web Tool-15-D-STTest2",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "1178612d2b394be4834ad77f567c0af2",
-            "name": "AIN Web Tool-15-D-SSPtestcustome",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-            "name": "AIN Web Tool-15-D-UncheckedEcopm",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "de007636e25249238447264a988a927b",
-            "name": "AIN Web Tool-15-D-dfsdf",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "62f29b3613634ca6a3065cbe0e020c44",
-            "name": "AIN/SMS-16-D-Multiservices1",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "649289e30d3244e0b48098114d63c2aa",
-            "name": "AIN Web Tool-15-D-SSPST66",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "3f21eeea6c2c486bba31dab816c05a32",
-            "name": "AIN Web Tool-15-D-ASSPST47",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "f60ce21d3ee6427586cff0d22b03b773",
-            "name": "CESAR-100-D-sspjg67246",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "8774659e425f479895ae091bb5d46560",
-            "name": "CESAR-100-D-sspjg68359",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "624eb554b0d147c19ff8885341760481",
-            "name": "AINWebTool-15-D-iftach",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "214f55f5fc414c678059c383b03e4962",
-            "name": "CESAR-100-D-sspjg612401",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "c90666c291664841bb98e4d981ff1db5",
-            "name": "CESAR-100-D-sspjg621340",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-            "name": "sspjg621351cloned",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "b386b768a3f24c8e953abbe0b3488c02",
-            "name": "AINWebTool-15-D-eteancomp",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "dc6c4dbfd225474e9deaadd34968646c",
-            "name": "AINWebTool-15-T-SPFET",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-            "name": "AINWebTool-15-X-eeweww",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "f2f3830e4c984d45bcd00e1a04158a79",
-            "name": "CESAR-100-D-spjg61909",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "05b91bd5137f4929878edd965755c06d",
-            "name": "CESAR-100-D-sspjg621512cloned",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "7002fbe8482d4a989ddf445b1ce336e0",
-            "name": "AINWebTool-15-X-vdr",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "4008522be43741dcb1f5422022a2aa0b",
-            "name": "AINWebTool-15-D-ssasa",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "f44e2e96a1b6476abfda2fa407b00169",
-            "name": "AINWebTool-15-D-PFNPT",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "b69a52bec8a84669a37a1e8b72708be7",
-            "name": "AINWebTool-15-X-vdre",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "fac7d9fd56154caeb9332202dcf2969f",
-            "name": "AINWebTool-15-X-NONPODECOMP",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "2d34d8396e194eb49969fd61ffbff961",
-            "name": "DN5242-Nov16-T5",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-            "name": "ro-T11",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           },
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           },
-          {
-            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-            "name": "DN5242-Nov21-T1",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
-          {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          },
           {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
         "id": "YYY1",
         "name": "UUUAIAAI-YYY1"
       },
-      {
-        "id": "BAN1",
-        "name": "VSDKYUTP-BAN1"
-      },
-      {
-        "id": "DKJ1",
-        "name": "DKJSJDKA-DKJ1"
-      },
-      {
-        "id": "MCS1",
-        "name": "ASACMAMS-MCS1"
-      },
-      {
-        "id": "UIO1",
-        "name": "uioclli1-UIO1"
-      },
-      {
-        "id": "RAJ1",
-        "name": "YGBIJNLQ-RAJ1"
-      },
-      {
-        "id": "OPA1",
-        "name": "opaclli1-OPA1"
-      },
-      {
-        "id": "SDE1",
-        "name": "ZXCVBNMA-SDE1"
-      },
-      {
-        "id": "VEN2",
-        "name": "FGHJUHIL-VEN2"
-      },
-      {
-        "id": "ORL1",
-        "name": "ORLDFLMA-ORL1"
-      },
-      {
-        "id": "JAD1",
-        "name": "JADECLLI-JAD1"
-      },
-      {
-        "id": "ZXL1",
-        "name": "LWLWCANN-ZXL1"
-      },
-      {
-        "id": "CKL1",
-        "name": "CLKSKCKK-CKL1"
-      },
-      {
-        "id": "SDF1",
-        "name": "sdfclli1-SDF1"
-      },
-      {
-        "id": "RAD1",
-        "name": "RADICAL1-RAD1"
-      },
-      {
-        "id": "KIT1",
-        "name": "BHYJFGLN-KIT1"
-      },
-      {
-        "id": "REL1",
-        "name": "INGERFGT-REL1"
-      },
-      {
-        "id": "JNL1",
-        "name": "CJALSDAC-JNL1"
-      },
-      {
-        "id": "OLK1",
-        "name": "OLKOLKLS-OLK1"
-      },
-      {
-        "id": "CHI1",
-        "name": "CHILLIWE-CHI1"
-      },
-      {
-        "id": "UUU4",
-        "name": "UUUAAAUU-UUU4"
-      },
-      {
-        "id": "TUF1",
-        "name": "TUFCLLI1-TUF1"
-      },
-      {
-        "id": "KJN1",
-        "name": "CKALDKSA-KJN1"
-      },
-      {
-        "id": "SAM1",
-        "name": "SNDGCA64-SAN1"
-      },
-      {
-        "id": "SCK1",
-        "name": "SCKSCKSK-SCK1"
-      },
-      {
-        "id": "HJH1",
-        "name": "AOEEQQQD-HJH1"
-      },
-      {
-        "id": "HGD1",
-        "name": "SDFQWHGD-HGD1"
-      },
-      {
-        "id": "KOR1",
-        "name": "HYFLNBVT-KOR1"
-      },
-      {
-        "id": "ATL43",
-        "name": "AICLOCID-ATL43"
-      },
-      {
-        "id": "ATL54",
-        "name": "AICFTAAI-ATL54"
-      },
-      {
-        "id": "ATL66",
-        "name": "CLLIAAII-ATL66"
-      },
-      {
-        "id": "VEL1",
-        "name": "BNMLKUIK-VEL1"
-      },
-      {
-        "id": "ICC1",
-        "name": "SANJITAT-ICC1"
-      },
-      {
-        "id": "MNT11",
-        "name": "WSXEFBTH-MNT11"
-      },
-      {
-        "id": "DEF2",
-        "name": "WSBHGTYL-DEF2"
-      },
-      {
-        "id": "MAD11",
-        "name": "SDFQWGKL-MAD11"
-      },
-      {
-        "id": "OLG1",
-        "name": "OLHOLHOL-OLG1"
-      },
-      {
-        "id": "GAR1",
-        "name": "NGFVSJKO-GAR1"
-      },
-      {
-        "id": "SAN22",
-        "name": "GNVLSCTL-SAN22"
-      },
-      {
-        "id": "HRG1",
-        "name": "HRGHRGGS-HRG1"
-      },
-      {
-        "id": "JCS1",
-        "name": "JCSJSCJS-JCS1"
-      },
-      {
-        "id": "DHA12",
-        "name": "WSXEDECF-DHA12"
-      },
-      {
-        "id": "HJE1",
-        "name": "AOEEWWWD-HJE1"
-      },
-      {
-        "id": "NCA1",
-        "name": "NCANCANN-NCA1"
-      },
-      {
-        "id": "IOP1",
-        "name": "iopclli1-IOP1"
-      },
-      {
-        "id": "RTY1",
-        "name": "rtyclli1-RTY1"
-      },
-      {
-        "id": "KAP1",
-        "name": "HIOUYTRQ-KAP1"
-      },
-      {
-        "id": "ZEN1",
-        "name": "ZENCLLI1-ZEN1"
-      },
-      {
-        "id": "HKA1",
-        "name": "JAKHLASS-HKA1"
-      },
-      {
-        "id": "CQK1",
-        "name": "CQKSCAKK-CQK1"
-      },
-      {
-        "id": "SAI1",
-        "name": "UBEKQLPD-SAI1"
-      },
-      {
-        "id": "ERT1",
-        "name": "ertclli1-ERT1"
-      },
-      {
-        "id": "IBB1",
-        "name": "PLMKOIJU-IBB1"
-      },
-      {
-        "id": "TIR2",
-        "name": "PLKINHYI-TIR2"
-      },
-      {
-        "id": "HSD1",
-        "name": "CHASKCDS-HSD1"
-      },
-      {
-        "id": "SLF78",
-        "name": "SDCTLFN1-SLF78"
-      },
-      {
-        "id": "SEE78",
-        "name": "SDCTEEE4-SEE78"
-      },
-      {
-        "id": "SAN13",
-        "name": "TOKYJPFA-SAN13"
-      },
-      {
-        "id": "SAA78",
-        "name": "SDCTAAA1-SAA78"
-      },
-      {
-        "id": "LUC1",
-        "name": "ATLDFGYC-LUC1"
-      },
-      {
-        "id": "AMD13",
-        "name": "MEMATLAN-AMD13"
-      },
-      {
-        "id": "TOR1",
-        "name": "TOROONXN-TOR1"
-      },
-      {
-        "id": "QWE1",
-        "name": "QWECLLI1-QWE1"
-      },
-      {
-        "id": "ZOG1",
-        "name": "ZOGASTRO-ZOG1"
-      },
-      {
-        "id": "CAL33",
-        "name": "CALIFORN-CAL33"
-      },
-      {
-        "id": "SHH78",
-        "name": "SDIT1HHH-SHH78"
-      },
-      {
-        "id": "DSA1",
-        "name": "LKJHGFDS-DSA1"
-      },
-      {
-        "id": "CLG1",
-        "name": "CLGRABAD-CLG1"
-      },
-      {
-        "id": "BNA1",
-        "name": "BNARAGBK-BNA1"
-      },
-      {
-        "id": "ATL84",
-        "name": "CANTTCOC-ATL84"
-      },
-      {
-        "id": "APP1",
-        "name": "WBHGTYUI-APP1"
-      },
-      {
-        "id": "RJN1",
-        "name": "RJNRBZAW-RJN1"
-      },
-      {
-        "id": "EHH78",
-        "name": "SDCSHHH5-EHH78"
-      },
-      {
-        "id": "mac10",
-        "name": "PKGTESTF-mac10"
-      },
-      {
-        "id": "SXB78",
-        "name": "SDCTGXB1-SXB78"
-      },
-      {
-        "id": "SAX78",
-        "name": "SDCTAXG1-SAX78"
-      },
-      {
-        "id": "SYD1",
-        "name": "SYDNAUBV-SYD1"
-      },
-      {
-        "id": "TOK1",
-        "name": "TOKYJPFA-TOK1"
-      },
-      {
-        "id": "KGM2",
-        "name": "KGMTNC20-KGM2"
-      },
-      {
-        "id": "DCC1b",
-        "name": "POIUYTGH-DCC1b"
-      },
-      {
-        "id": "SKK78",
-        "name": "SDCTKKK1-SKK78"
-      },
-      {
-        "id": "SGG78",
-        "name": "SDCTGGG1-SGG78"
-      },
-      {
-        "id": "SJJ78",
-        "name": "SDCTJJJ1-SJJ78"
-      },
-      {
-        "id": "SBX78",
-        "name": "SDCTBXG1-SBX78"
-      },
-      {
-        "id": "LAG1",
-        "name": "LARGIZON-LAG1"
-      },
-      {
-        "id": "IAA1",
-        "name": "QAZXSWED-IAA1"
-      },
-      {
-        "id": "POI1",
-        "name": "PLMNJKIU-POI1"
-      },
-      {
-        "id": "LAG1a",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "PBL1",
-        "name": "PBLAPBAI-PBL1"
-      },
-      {
-        "id": "LAG45",
-        "name": "LARGIZON-LAG1a"
-      },
-      {
-        "id": "MAR1",
-        "name": "MNBVCXZM-MAR1"
-      },
-      {
-        "id": "HST70",
-        "name": "HSTNTX70-HST70"
-      },
-      {
-        "id": "DCC1a",
-        "name": "POIUYTGH-DCC1a"
-      },
-      {
-        "id": "TOL1",
-        "name": "TOLDOH21-TOL1"
-      },
-      {
-        "id": "LON1",
-        "name": "LONEENCO-LON1"
-      },
-      {
-        "id": "SJU78",
-        "name": "SDIT1JUB-SJU78"
-      },
-      {
-        "id": "STN27",
-        "name": "HSTNTX01-STN27"
-      },
-      {
-        "id": "SSW56",
-        "name": "ss8126GT-SSW56"
-      },
-      {
-        "id": "SBB78",
-        "name": "SDIT1BBB-SBB78"
-      },
-      {
-        "id": "DCC3",
-        "name": "POIUYTGH-DCC3"
-      },
-      {
-        "id": "GNV1",
-        "name": "GNVLSCTL-GNV1"
-      },
-      {
-        "id": "WAS1",
-        "name": "WASHDCSW-WAS1"
-      },
-      {
-        "id": "TOY1",
-        "name": "TORYONNZ-TOY1"
-      },
-      {
-        "id": "STT1",
-        "name": "STTLWA02-STT1"
-      },
-      {
-        "id": "STG1",
-        "name": "STTGGE62-STG1"
-      },
-      {
-        "id": "SLL78",
-        "name": "SDCTLLL1-SLL78"
-      },
-      {
-        "id": "SBU78",
-        "name": "SDIT1BUB-SBU78"
-      },
-      {
-        "id": "ATL2",
-        "name": "ATLNGANW-ATL2"
-      },
-      {
-        "id": "BOT1",
-        "name": "BOTHWAKY-BOT1"
-      },
-      {
-        "id": "SNG1",
-        "name": "SNGPSIAU-SNG1"
-      },
-      {
-        "id": "NYC1",
-        "name": "NYCMNY54-NYC1"
-      },
-      {
-        "id": "LAG1b",
-        "name": "LARGIZON-LAG1b"
-      },
-      {
-        "id": "AMD15",
-        "name": "AMDFAA01-AMD15"
-      },
-      {
-        "id": "SNA1",
-        "name": "SNANTXCA-SNA1"
-      },
-      {
-        "id": "PLT1",
-        "name": "PLTNCA60-PLT1"
-      },
-      {
-        "id": "TLP1",
-        "name": "TLPNXM18-TLP1"
-      },
-      {
-        "id": "SDD81",
-        "name": "SAIT1DD6-SDD81"
-      },
-      {
-        "id": "DCC1",
-        "name": "POIUYTGH-DCC1"
-      },
-      {
-        "id": "DCC2",
-        "name": "POIUYTGH-DCC2"
-      },
-      {
-        "id": "OKC1",
-        "name": "OKCBOK55-OKC1"
-      },
-      {
-        "id": "PAR1",
-        "name": "PARSFRCG-PAR1"
-      },
-      {
-        "id": "TES36",
-        "name": "ABCEETES-TES36"
-      },
-      {
-        "id": "COM1",
-        "name": "PLMKOPIU-COM1"
-      },
-      {
-        "id": "ANI1",
-        "name": "ATLNGTRE-ANI1"
-      },
-      {
-        "id": "SDG78",
-        "name": "SDIT1BDG-SDG78"
-      },
-      {
-        "id": "mac20",
-        "name": "PKGTESTF-mac20"
-      },
-      {
-        "id": "DSF45",
-        "name": "DSFBG123-DSF45"
-      },
-      {
-        "id": "HST25",
-        "name": "HSTNTX01-HST25"
-      },
-      {
-        "id": "AMD18",
-        "name": "AUDIMA01-AMD18"
-      },
-      {
-        "id": "SAA80",
-        "name": "SAIT9AA3-SAA80"
-      },
-      {
-        "id": "SSA56",
-        "name": "SSIT2AA7-SSA56"
-      },
-      {
-        "id": "SDD82",
-        "name": "SAIT1DD9-SDD82"
-      },
-      {
-        "id": "JCV1",
-        "name": "JCVLFLBW-JCV1"
-      },
-      {
-        "id": "SUL2",
-        "name": "WERTYUJK-SUL2"
-      },
-      {
-        "id": "PUR1",
-        "name": "purelyde-PUR1"
-      },
-      {
-        "id": "FDE55",
-        "name": "FDERT555-FDE55"
-      },
-      {
-        "id": "SITE",
-        "name": "LONEENCO-SITE"
-      },
-      {
-        "id": "ATL1",
-        "name": "ATLNGAMA-ATL1"
-      },
-      {
-        "id": "JUL1",
-        "name": "ZXCVBNMM-JUL1"
-      },
-      {
-        "id": "TAT34",
-        "name": "TESAAISB-TAT34"
-      },
-      {
-        "id": "XCP12",
-        "name": "CHKGH123-XCP12"
-      },
-      {
-        "id": "RAI1",
-        "name": "poiuytre-RAI1"
-      },
-      {
-        "id": "HPO1",
-        "name": "ATLNGAUP-HPO1"
-      },
-      {
-        "id": "KJF12",
-        "name": "KJFDH123-KJF12"
-      },
-      {
-        "id": "SCC80",
-        "name": "SAIT9CC3-SCC80"
-      },
-      {
-        "id": "SAA12",
-        "name": "SAIT9AF8-SAA12"
-      },
-      {
-        "id": "SAA14",
-        "name": "SAIT1AA9-SAA14"
-      },
-      {
-        "id": "ATL35",
-        "name": "TTESSAAI-ATL35"
-      },
-      {
-        "id": "CWY1",
-        "name": "CWYMOWBS-CWY1"
-      },
-      {
-        "id": "ATL76",
-        "name": "TELEPAAI-ATL76"
-      },
-      {
-        "id": "DSL12",
-        "name": "DSLFK242-DSL12"
-      },
-      {
-        "id": "ATL53",
-        "name": "AAIATLTE-ATL53"
-      },
-      {
-        "id": "SAA11",
-        "name": "SAIT9AA2-SAA11"
-      },
-      {
-        "id": "ATL62",
-        "name": "TESSASCH-ATL62"
-      },
-      {
-        "id": "AUG1",
-        "name": "ASDFGHJK-AUG1"
-      },
-      {
-        "id": "POI22",
-        "name": "POIUY123-POI22"
-      },
-      {
-        "id": "SAA13",
-        "name": "SAIT1AA9-SAA13"
-      },
-      {
-        "id": "BHY17",
-        "name": "BHYTFRF3-BHY17"
-      },
-      {
-        "id": "LIS1",
-        "name": "HOSTPROF-LIS1"
-      },
-      {
-        "id": "SIP1",
-        "name": "ZXCVBNMK-SIP1"
-      },
-      {
-        "id": "ATL99",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "ATL64",
-        "name": "FORLOAAJ-ATL64"
-      },
-      {
-        "id": "TAT33",
-        "name": "TESAAISA-TAT33"
-      },
-      {
-        "id": "RAD10",
-        "name": "INDIPUNE-RAD10"
-      },
-      {
-        "id": "RTW5",
-        "name": "BHYTFRY4-RTW5"
-      },
-      {
-        "id": "JGS1",
-        "name": "KSJKKKKK-JGS1"
-      },
-      {
-        "id": "ATL98",
-        "name": "TEESTAAI-ATL43"
-      },
-      {
-        "id": "WAN1",
-        "name": "LEIWANGW-WAN1"
-      },
-      {
-        "id": "ATL44",
-        "name": "ATLSANAB-ATL44"
-      },
-      {
-        "id": "RTD2",
-        "name": "BHYTFRk4-RTD2"
-      },
-      {
-        "id": "NIR1",
-        "name": "ORFLMANA-NIR1"
-      },
-      {
-        "id": "ATL75",
-        "name": "SANAAIRE-ATL75"
-      },
-      {
-        "id": "NUM1",
-        "name": "QWERTYUI-NUM1"
-      },
-      {
-        "id": "hvf32",
-        "name": "MDTWNJ21-hvf32"
-      },
-      {
-        "id": "RTZ4",
-        "name": "BHYTFRZ6-RTZ4"
-      },
-      {
-        "id": "ATL56",
-        "name": "ATLSANAC-ATL56"
-      },
-      {
-        "id": "AMS1",
-        "name": "AMSTNLBW-AMS1"
-      },
-      {
-        "id": "RCT1",
-        "name": "AMSTERNL-RCT1"
-      },
-      {
-        "id": "JAN1",
-        "name": "ORFLMATT-JAN1"
-      },
-      {
-        "id": "ABC14",
-        "name": "TESAAISA-ABC14"
-      },
-      {
-        "id": "TAT37",
-        "name": "TESAAISD-TAT37"
-      },
-      {
-        "id": "MIC54",
-        "name": "MICHIGAN-MIC54"
-      },
-      {
-        "id": "ABC11",
-        "name": "ATLSANAI-ABC11"
-      },
-      {
-        "id": "AMF11",
-        "name": "AMDOCS01-AMF11"
-      },
-      {
-        "id": "ATL63",
-        "name": "ATLSANEW-ATL63"
-      },
-      {
-        "id": "ABC12",
-        "name": "ATLSECIA-ABC12"
-      },
-      {
-        "id": "hvf20",
-        "name": "MDTWNJ21-hvf20"
-      },
-      {
-        "id": "ABC15",
-        "name": "AAITESAN-ABC15"
-      },
       {
         "id": "AVT1",
         "name": "AVTRFLHD-AVT1"
index 8b25488..9698f47 100644 (file)
@@ -6,6 +6,7 @@ declare namespace Cypress {
     initAuditInfoMSO: typeof initAuditInfoMSO;
     initAuditInfoMSOALaCarte: typeof initAuditInfoMSOALaCarte;
     initAsyncInstantiation : typeof  initAsyncInstantiation;
+    mockLatestVersionForService : typeof  mockLatestVersionForService;
   }
 }
 
@@ -106,14 +107,31 @@ function initAsyncInstantiation(response? : JSON, delay?: number, status?: numbe
   })
 }
 
+function mockLatestVersionForService(uuidObject :any) {
+  if(uuidObject && uuidObject.serviceUuid && uuidObject.invariantId){
+    cy.server().route({
+      url: Cypress.config('baseUrl') + '/aai_get_newest_model_version_by_invariant/' + uuidObject.invariantId,
+      method: 'GET',
+      status: 200,
+      response: {
+        "modelVersionId": uuidObject.serviceUuid,
+        "modelName": "SERVICE_INSTANCE_NAME",
+        "modelVersion": "2.0",
+        "distributionStatus": "DISTRIBUTION_COMPLETE_OK",
+        "resourceVersion": "resourceVersion",
+        "modelDescription": "modelDescription"
+      },
+    }).as("expectLatestServiceModelUpgradeVersion")
+  }
+}
 
-
-function initVidMock(): void {
+function initVidMock(...args :any): void {
   initGetToMenuInfo();
   initCategoryParameter();
   initFlags();
   initAuditInfoVID();
   initAuditInfoMSO();
+  mockLatestVersionForService(args[0]);
 }
 
 
@@ -123,3 +141,5 @@ Cypress.Commands.add('initCategoryParameter', initCategoryParameter);
 Cypress.Commands.add('initAuditInfoMSO', initAuditInfoMSO);
 Cypress.Commands.add('initAuditInfoMSOALaCarte', initAuditInfoMSOALaCarte);
 Cypress.Commands.add('initAsyncInstantiation', initAsyncInstantiation);
+Cypress.Commands.add('mockLatestVersionForService', mockLatestVersionForService);
+
index a940ae1..3bd60d7 100644 (file)
@@ -25,6 +25,10 @@ function drawingBoardTreeClickOnContextMenuOptionByName(optionName : string) : C
       return cy.getElementByDataTestsId('context-menu-edit').click({force : true});
     case 'Delete':
       return cy.getElementByDataTestsId('context-menu-delete').trigger('mouseover').click();
+    case 'Upgrade':
+      return cy.getElementByDataTestsId('context-menu-upgrade').trigger('mouseover').click();
+    case 'Undo Upgrade':
+      return cy.getElementByDataTestsId('context-menu-undoUpgrade').trigger('mouseover').click();
     default:
       return cy.getElementByDataTestsId('context-menu-duplicate').click({force : true});
   }
@@ -57,6 +61,11 @@ function IsDeleteTagShownOnNode(index: number)
   cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "1");
 }
 
+function IsUpgradeTagShownOnNode(index: number)
+{
+  cy.getElementByDataTestsId('upgrade-status-type').eq(index).should("contain.text", "Upgrade").should("contain.css", "opacity", "1");
+}
+
 function IsDeleteTagNotShownOnNode(index: number)
 {
   cy.getElementByDataTestsId('delete-status-type').eq(index).should("contain.text", "Delete").should("contain.css", "opacity", "0");
@@ -68,6 +77,5 @@ Cypress.Commands.add('nodeWithLineThrough', nodeWithLineThrough);
 Cypress.Commands.add('nodeWithoutLineThrough', nodeWithoutLineThrough);
 Cypress.Commands.add('IsDeleteTagShownOnNode', IsDeleteTagShownOnNode);
 Cypress.Commands.add('IsDeleteTagNotShownOnNode', IsDeleteTagNotShownOnNode);
-
 Cypress.Commands.add('isNodeDeleted', isNodeDeleted);
 Cypress.Commands.add('isNodeNotDeleted', isNodeNotDeleted);
index 1f2031d..096e615 100644 (file)
@@ -14,7 +14,7 @@
     "@bahmutov/add-typescript-to-cypress": "2.0.0",
     "@types/lodash": "4.14.121",
     "cypress": "^3.1.0",
-    "typescript": "2.9.2",
+    "typescript": "3.1.6",
     "rxjs": "^6.3.3",
     "rxjs-compat": "^6.3.3"
   }
index 15389eb..1c2179b 100644 (file)
@@ -46,7 +46,7 @@
     "@turf/turf": "5.1.6",
     "@types/lodash": "4.14.121",
     "angular-svg-icon": "5.0.0",
-    "angular-tree-component": "7.0.1",
+    "angular-tree-component": "8.4.0",
     "angular2-datatable": "0.6.0",
     "angular2-multiselect-dropdown": "2.5.0",
     "angular5-csv": "^0.2.10",
@@ -97,8 +97,8 @@
     "jest-sonar-reporter": "2.0.0",
     "ngx-wallaby-jest": "0.0.1",
     "npm-run-all": "^4.1.5",
-    "onap-ui-angular": "5.1.71",
-    "onap-ui-common": "1.0.86",
+    "onap-ui-angular": "5.2.4",
+    "onap-ui-common": "1.0.105",
     "prettier": "1.16.4",
     "pretty-quick": "^1.10.0",
     "ts-mockito": "2.3.1",
index 67b5405..25d1703 100644 (file)
@@ -40,7 +40,7 @@ import {VpnStepService} from "./service-planning/objectsToTree/models/vrf/vrfMod
 
 @NgModule({
   imports: [
-    TreeModule,
+    TreeModule.forRoot(),
     BrowserModule,
     ContextMenuModule,
     FormsModule,
index 4a305b1..d486fb4 100644 (file)
@@ -1,18 +1,17 @@
 import {Injectable} from "@angular/core";
-import {CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router} from "@angular/router";
+import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from "@angular/router";
 import {NgRedux} from "@angular-redux/store";
-import {Observable} from "rxjs";
+import {Observable, of} from "rxjs";
 import {HttpClient} from "@angular/common/http";
 import {AppState} from "../../../shared/store/reducers";
 import {updateDrawingBoardStatus} from "../../../shared/storeUtil/utils/global/global.actions";
 import {DrawingBoardModes} from "../../service-planning/drawing-board.modes";
-import {of} from "rxjs";
 
 @Injectable()
 export class DrawingBoardGuard implements CanActivate {
   constructor(private store: NgRedux<AppState>, private _http: HttpClient, private _router : Router) { }
   canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-      let url : string = `/vid/roles/service_permissions?subscriberId=${next.queryParams['subscriberId']}&serviceType=${next.queryParams['serviceType']}`;
+      let url : string = `../../roles/service_permissions?subscriberId=${next.queryParams['subscriberId']}&serviceType=${next.queryParams['serviceType']}`;
       const viewMode = state.url.includes(DrawingBoardModes.RETRY_EDIT)? DrawingBoardModes.RETRY: DrawingBoardModes.VIEW;
       return this._http.get(url)
         .map((result : DrawingBoardPermissions) => {
index 4680760..7a18bce 100644 (file)
@@ -7,7 +7,7 @@
         [testId]="'backBtn'"
         [size]="'large'"
         [name]="'navigation-arrow-back'">
-              </svg-icon>
+      </svg-icon>
     </span>
 
     <div class="header-col middleDetails" style="padding-top: 7px;padding-left: 13px;line-height: 100%;" *ngIf="isServiceFailed">
     <span [attr.data-tests-id]="'isViewOnly-status-test'" class="service-instance-label purple">{{getModeName()}}</span>
   </div>
 
-
   <div class="right-header">
-    <span class="action-status-type-header delete" [attr.data-tests-id]="'delete-status-type-header'" *ngIf="isDeleted === true">Delete</span>
-    <span class="action-status-type-header resume" [attr.data-tests-id]="'resume-status-type-header'" *ngIf="isResume === true">Resume</span>
+    <span
+      *ngIf = "isUpgrade || isDeleted || isResume"
+      [ngClass] = "isDeleted===true ? 'action-status-type-header delete' : 'action-status-type-header resume'"
+      [attr.data-tests-id]="determineDataTestId()">
+      {{getAction()}}
+    </span>
     <span class="menu-container notShowOnViewMode notShowOnRetryMode">
       <span [attr.data-tests-id]="'openMenuBtn'" class="icon-browse" (click)="onContextMenu($event)"></span>
       <context-menu>
index 51f9053..7923313 100644 (file)
@@ -39,12 +39,16 @@ export class DrawingBoardHeader {
   mode : DrawingBoardModes = DrawingBoardModes.CREATE;
   serviceOrchStatus: string;
   isDeleted: boolean = false;
+  isUpgrade: boolean = false;
   isResume: boolean = false;
   store : NgRedux<AppState>;
   drawingBoardPermissions : DrawingBoardPermissions;
   drawingBoardHeaderService : DrawingBoardHeaderService;
   isServiceFailed: boolean;
   serviceStatusMessage: string;
+  private readonly action: string;
+  private presentedAction: string;
+
   constructor(private _contextMenuService: ContextMenuService, private dialogService: DialogService,
               private _iframeService : IframeService,
               private route: ActivatedRoute, private msoService: MsoService,
@@ -68,6 +72,11 @@ export class DrawingBoardHeader {
           });
         }
       });
+    if (!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action)){
+      if (this.store.getState().service.serviceInstance[this.serviceModelId].action.includes("Upgrade")) {
+        this.isUpgrade = true;
+      }
+    }
   }
 
 
@@ -114,6 +123,7 @@ export class DrawingBoardHeader {
       this.serviceOrchStatus =  serviceInstance.orchStatus || "";
       this.isServiceFailed = serviceInstance.isFailed;
       this.serviceStatusMessage = serviceInstance.statusMessage;
+      this.isUpgrade = serviceInstance.isUpgraded;
     }
   }
 
@@ -131,12 +141,25 @@ export class DrawingBoardHeader {
     });
   }
 
+
+
   onDeleteUndoDeleteClick(){
     this.cancelResume(this.serviceModelId);
     this.isDeleted = !this.isDeleted;
     this._drawingBoardHeaderService.deleteService(this.serviceModelId, this.isDeleted)
   }
 
+  determineDataTestId() :string {
+    switch(true) {
+      case this.isResume:
+        return'resume-status-type-header';
+      case this.isDeleted:
+        return 'delete-status-type-header';
+      case this.isUpgrade:
+        return 'upgrade-status-type-header';
+    }
+  }
+
   onResumeUndoResumeClick(){
     this.cancelDelete(this.serviceModelId);
     this.isResume = !this.isResume;
@@ -174,9 +197,14 @@ export class DrawingBoardHeader {
       instanceFields.subscriberName = this.store.getState().service.subscribers.find(sub => sub.id === instanceFields.globalSubscriberId).name;
       instanceFields.owningEntityName = this.extractOwningEntityNameAccordingtoId(instanceFields.owningEntityId);
     }
-    return _.omit(instanceFields,'optionalGroupMembersMap');
+    return _.omit(instanceFields,['optionalGroupMembersMap', 'upgradedVFMSonsCounter', 'isUpgraded', 'latestAvailableVersion']);
   }
 
+  private getAction(): string {
+    if(!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action))
+      return this.store.getState().service.serviceInstance[this.serviceModelId].action.split('_').pop();
+    return;
+  }
 
   public deployService(): void {
       let instanceFields = this.extractServiceFields();
index 7df2f3a..1b71d90 100644 (file)
@@ -36,6 +36,15 @@ export class DrawingBoardHeaderService{
     }
   }
 
+  upgradeService(serviceModelId: string, isUpgraded: boolean ) {
+    if(isUpgraded){
+      this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.Upgrade));
+    }
+    else{
+      this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.None));
+    }
+  }
+
   showAuditInfo(serviceModelId) : void {
     let instance: ServiceInstance = this.store.getState().service.serviceInstance[serviceModelId];
     let model =  new ServiceModel(this.store.getState().service.serviceHierarchy[serviceModelId]);
index 6be5036..0e2d8e2 100644 (file)
@@ -28,6 +28,7 @@ import {ComponentInfoService} from "../component-info/component-info.service";
 import {ComponentInfoModel} from "../component-info/component-info-model";
 import {ObjectToModelTreeService} from "../objectsToTree/objectToModelTree/objectToModelTree.service";
 import {DrawingBoardModes} from "../drawing-board.modes";
+import {ServiceInstanceActions} from "../../../shared/models/serviceInstanceActions";
 
 @Component({
   selector: 'drawing-board-tree',
@@ -203,6 +204,24 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
     return false;
   }
 
+
+
+  isUpgraded(node: ITreeNode): boolean {
+    return this.isLabeledAsAction(node, "Upgrade");
+  }
+
+  isDeleted(node: ITreeNode): boolean {
+    return this.isLabeledAsAction(node, "Delete");
+  }
+
+  private isLabeledAsAction(node: ITreeNode, action) {
+    let nodeAction = node.data.action.split('_').pop();
+    if (!_.isNil(nodeAction)) {
+      return nodeAction === action;
+    }
+    return false;
+  }
+
   public selectNode(node: ITreeNode): void {
     node.expand();
     this._sharedTreeService.setSelectedVNF(node);
@@ -220,6 +239,13 @@ export class DrawingBoardTreeComponent implements OnInit, AfterViewInit {
     this.tree.treeModel.getNodeById(id).parent.expand();
   }
 
+  getcontextMenuOptionLabel(contextMenuOption: TreeNodeContextMenuModel): string{
+    let optionLabel = contextMenuOption.label;
+    if(contextMenuOption.label === ServiceInstanceActions.Upgrade) {
+      return optionLabel.concat(" to V" + this._store.getState().service.serviceInstance[this.serviceModelId].latestAvailableVersion);
+    }
+    return optionLabel;
+  }
 }
 
 
index e1d88a6..8db53e8 100644 (file)
               <div [attr.data-tests-id]="contextMenuOption.dataTestId">
                 <div style="float: left;margin-top: 3px;">
                   <svg-icon
-                    [ngClass]="contextMenuOption.iconClass"
                     class="icon-edit"
+                    [ngClass]="contextMenuOption.iconClass"
                     [size]="'small'"
                     [name]="contextMenuOption.iconClass">
                 </svg-icon></div>
-                <div style="padding-left: 25px;">{{contextMenuOption.label}}</div>
+                <div style="padding-left: 25px;">{{getcontextMenuOptionLabel(contextMenuOption)}}</div>
               </div>
             </ng-template>
           </context-menu>
                 [size]="'medium'"
                 [name]="'alert-triangle-o'">
               </svg-icon>
-            </span>
+          </span>
           <span *ngIf="drawingBoardTreeService.isVFModuleMissingData(node, serviceModelId)" class="icon-alert"
                 tooltip="{{ missingDataTooltip }}" tooltipPlacement="left"
                 [attr.data-tests-id]="'node-'+node.data.modelId +'-' +node.data.modelName+'-alert-icon'"></span>
         </div>
 
         <div class="action-status">
-          <span class="action-status-type delete" [attr.data-tests-id]="'delete-status-type'" [ngStyle]="{ 'opacity': node.data.action.split('_').pop() !== 'Delete' ? '0' : '1'}">Delete</span>
+          <span
+            [ngClass]="isUpgraded(node)?'action-status-type upgrade':'action-status-type delete'"
+            [attr.data-tests-id]="isUpgraded(node)?'action-status-type':'delete-status-type'" [ngStyle]="{ 'opacity': isUpgraded(node) || isDeleted(node) ? '1' : '0'}">{{isUpgraded(node)?"Upgrade":"Delete"}}</span>
         </div>
-
       </div>
     </ng-template>
   </tree-root>
 
 
 
+
index e08e69e..b774e03 100644 (file)
@@ -341,15 +341,21 @@ drawing-board-tree {
                   line-height: 42px;
                   width: 95px;
                   min-width: 95px;
-                  .action-status-type.delete {
+                  .action-status-type {
                     background: transparent;
                     font-family: OpenSans-SemiBold;
                     font-size: 12px;
-                    color: red;
                     border-radius: 50px;
                     border: 1px solid gray;
-                    padding: 5px 20px;
+                    padding: 5px 17px;
+                    &.delete {
+                      color: red;
+                    }
+                    &.upgrade{
+                      color: #009FDB;
+                    }
                   }
+
                 }
 
                 .model-info.rightBorder {
index b804342..e5979f7 100644 (file)
@@ -1,8 +1,5 @@
-import {TestBed, getTestBed} from '@angular/core/testing';
-import {
-  HttpClientTestingModule,
-  HttpTestingController
-} from '@angular/common/http/testing';
+import {getTestBed, TestBed} from '@angular/core/testing';
+import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
 import {NgRedux} from "@angular-redux/store";
 import {DrawingBoardTreeService, TreeNodeContextMenuModel} from "./drawing-board-tree.service";
 import {ITreeNode} from "angular-tree-component/dist/defs/api";
@@ -74,10 +71,12 @@ describe('Drawing board tree Service', () => {
       new TreeNodeContextMenuModel('addGroupMember', 'context-menu-addGroupMember', 'Add group members', 'plus'),
       new TreeNodeContextMenuModel('delete', 'context-menu-delete', 'Delete', 'trash-o'),
       new TreeNodeContextMenuModel('remove', 'context-menu-remove', 'Remove', 'trash-o'),
+      new TreeNodeContextMenuModel('upgrade', 'context-menu-upgrade', 'Upgrade', 'upgrade'),
       new TreeNodeContextMenuModel('undoDelete', 'context-menu-undoDelete', 'Undo Delete', 'undo-delete'),
+      new TreeNodeContextMenuModel('undoUpgrade', 'context-menu-undoUpgrade', 'Undo Upgrade', 'undo-delete'),
       new TreeNodeContextMenuModel('changeAssociations', 'context-menu-changeAssociations', 'Change Associations', 'edit-file-o')
     ];
-    expect(options.length).toEqual(8);
+    expect(options.length).toEqual(10);
     expect(options).toEqual(expected);
   });
 
index acf6224..28b6e51 100644 (file)
@@ -42,7 +42,9 @@ export class  DrawingBoardTreeService {
       new TreeNodeContextMenuModel('addGroupMember', 'context-menu-addGroupMember', 'Add group members', 'plus'),
       new TreeNodeContextMenuModel('delete', 'context-menu-delete', 'Delete', 'trash-o'),
       new TreeNodeContextMenuModel('remove', 'context-menu-remove', 'Remove', 'trash-o'),
+      new TreeNodeContextMenuModel('upgrade', 'context-menu-upgrade', 'Upgrade', 'upgrade'),
       new TreeNodeContextMenuModel('undoDelete', 'context-menu-undoDelete', 'Undo Delete', 'undo-delete'),
+      new TreeNodeContextMenuModel('undoUpgrade', 'context-menu-undoUpgrade', 'Undo Upgrade', 'undo-delete'),
       new TreeNodeContextMenuModel('changeAssociations', 'context-menu-changeAssociations', 'Change Associations', 'edit-file-o')
     ];
   }
index bfe1d00..47a6dcb 100644 (file)
@@ -23,10 +23,12 @@ import {
   deleteActionVfModuleInstance,
   removeVfModuleInstance,
   undoDeleteVfModuleInstance,
-  updateVFModulePosition
+  undoUgradeVFModule,
+  updateVFModulePosition,
+  upgradeVFModule
 } from "../../../../../shared/storeUtil/utils/vfModule/vfModule.actions";
 import {ComponentInfoService} from "../../../component-info/component-info.service";
-import {ComponentInfoModel, ComponentInfoType} from "../../../component-info/component-info-model";
+import {ComponentInfoType} from "../../../component-info/component-info-model";
 import {ModelInformationItem} from "../../../../../shared/components/model-information/model-information.component";
 
 export class VFModuleModelInfo implements ILevelNodeInfo {
@@ -353,10 +355,32 @@ export class VFModuleModelInfo implements ILevelNodeInfo {
         },
         visible: (node) => this._sharedTreeService.shouldShowUndoDelete(node),
         enable: (node, serviceModelId) => this._sharedTreeService.shouldShowUndoDelete(node) && this._sharedTreeService.shouldShowDelete(node.parent) && !this._sharedTreeService.isServiceOnDeleteMode(serviceModelId)
-      }
+      },
+      upgrade : {
+        method : (node, serviceModelId) => {
+          this._sharedTreeService.upgradeBottomUp(node, serviceModelId);
+          this._store.dispatch(upgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceModelId, node.data.dynamicModelName));
+        },
+        visible: (node,serviceModelId) => {
+          return this._sharedTreeService.shouldShowUpgrade(node, serviceModelId);
+        },
+        enable:  (node, serviceModelId) => {
+          return this._sharedTreeService.shouldShowUpgrade(node, serviceModelId);
+        }
+      },
+      undoUpgrade: {
+        method: (node, serviceModelId) => {
+          this._sharedTreeService.undoUpgradeBottomUp(node, serviceModelId);
+          this._store.dispatch(undoUgradeVFModule(node.data.modelName,  node.parent.data.vnfStoreKey, serviceModelId, node.data.dynamicModelName));
+        },
+        visible: (node) => {
+          return this._sharedTreeService.shouldShowUndoUpgrade(node);
+        },
+        enable: (node) => {
+          return this._sharedTreeService.shouldShowUndoUpgrade(node);
+        }
+      },
     };
-
-
   }
 
   updatePosition(that , node, instanceId, parentStoreKey): void {
index 2bdeda0..ebcba16 100644 (file)
@@ -29,7 +29,9 @@ import {ServiceInstanceActions} from "../../../../../shared/models/serviceInstan
 import {
   deleteActionVnfInstance,
   undoDeleteActionVnfInstance,
-  updateVnfPosition
+  undoUpgradeVnf,
+  updateVnfPosition,
+  upgradeVnf
 } from "../../../../../shared/storeUtil/utils/vnf/vnf.actions";
 import * as _ from 'lodash';
 import {IModalConfig} from "onap-ui-angular/dist/modals/models/modal-config";
@@ -278,7 +280,21 @@ export class VnfModelInfo implements ILevelNodeInfo {
         },
         visible: (node) => this._sharedTreeService.shouldShowUndoDelete(node),
         enable: (node, serviceModelId) => this._sharedTreeService.shouldShowUndoDelete(node) && !this._sharedTreeService.isServiceOnDeleteMode(serviceModelId)
-      }
+      },
+      upgrade: {
+        method: (node, serviceModelId) => {
+          this._store.dispatch(upgradeVnf(node.data.vnfStoreKey, serviceModelId));
+        },
+        visible: () => false,
+        enable: () => false
+      },
+      undoUpgrade: {
+        method: (node, serviceModelId) => {
+          this._store.dispatch(undoUpgradeVnf(node.data.vnfStoreKey, serviceModelId));
+        },
+        visible: () => false,
+        enable: () => false
+      },
     }
   }
 
index 9cd928e..f303434 100644 (file)
@@ -8,7 +8,9 @@ import {
 } from "../../../../../../../shared/storeUtil/utils/global/global.actions";
 import {ElementsTableService} from "../../../../../../../shared/components/searchMembersModal/members-table/elements-table.service";
 import {
-  ICriteria, ISearchField, ITableContent,
+  ICriteria,
+  ISearchField,
+  ITableContent,
   ModalInformation
 } from "../../../../../../../shared/components/searchMembersModal/members-table/element-table-row.model";
 import {Observable, of} from "rxjs";
@@ -76,7 +78,7 @@ export class NetworkStepService {
 
   getNetworks = (serviceInstance): Observable<any[]> => {
     let cloudRegion = serviceInstance.lcpCloudRegionId;
-    let tenantId = serviceInstance.tenantName;
+    let tenantId = serviceInstance.tenantId;
     return this._aaiService.retrieveActiveNetwork(cloudRegion, tenantId).map((networks: NetworkModalRow[]) => {
       this.generateRolesOptions(networks);
       return this.sortElementsResultByField(networks, this.uniqObjectField);
index cad23ff..89e20a2 100644 (file)
@@ -50,13 +50,27 @@ class MockAppStore<T> {
   }
 }
 
-class MockVnfModelInfo<T> {
-  getModel() {
-    return {}
+
+
+
+function getNodeWithData(menuAction:string){
+  const nodeData = {
+    menuActions: {}
+  };
+  nodeData['menuActions'][menuAction] =  {
+    method: (node, serviceModelId) => {}
   }
+  const node = {
+    parent: {
+      data: nodeData,
+      parent: {
+        data: nodeData
+      }
+    }
+  };
+  return node
 }
 
-
 describe('Shared Tree Service', () => {
   let injector;
   let service: SharedTreeService;
@@ -110,6 +124,25 @@ describe('Shared Tree Service', () => {
     expect(service).toBeDefined();
   });
 
+  test('SharedTreeService upgradeBottomUp should call redux actions', () => {
+    const serviceModelId = "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
+    const node = getNodeWithData("upgrade")
+    spyOn(node.parent.data.menuActions['upgrade'], 'method');
+    service.upgradeBottomUp(node, serviceModelId);
+    expect(node.parent.data.menuActions['upgrade'].method).toBeCalledWith(node.parent, serviceModelId);
+    expect(node.parent.data.menuActions['upgrade'].method).toBeCalledTimes(2);
+
+  });
+
+  test('SharedTreeService undoUpgradeBottomUp should call redux actions', () => {
+    const serviceModelId = "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd";
+    const node = getNodeWithData("undoUpgrade")
+    spyOn(node.parent.data.menuActions['undoUpgrade'], 'method');
+    service.undoUpgradeBottomUp(node, serviceModelId);
+    expect(node.parent.data.menuActions['undoUpgrade'].method).toBeCalledWith(node.parent, serviceModelId);
+    expect(node.parent.data.menuActions['undoUpgrade'].method).toBeCalledTimes(2);
+  });
+
   test('shouldShowDeleteInstanceWithChildrenModal should open modal if child exist with action create', () => {
     jest.spyOn(MessageBoxService.openModal, 'next');
     let foo = () => {
@@ -128,7 +161,9 @@ describe('Shared Tree Service', () => {
   test('openAuditInfoModal should open modal for failed instance', () => {
     jest.spyOn(AuditInfoModalComponent.openInstanceAuditInfoModal, 'next');
 
-    let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null, null, null, null, null, null, null, null, null,null);
+    let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null,
+      null, null, null, null,
+      null, null, null, null,null);
     const modelMock = {"a": "a"};
     const instanceMock = {"instance": "instance", "trackById": "123456789"};
     const instanceTypeMock = "instanceTypeMock";
@@ -1331,128 +1366,8 @@ function getStore() {
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           }, {
-            "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-            "name": "AIN Web Tool-15-D-STTest2",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "1178612d2b394be4834ad77f567c0af2",
-            "name": "AIN Web Tool-15-D-SSPtestcustome",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-            "name": "AIN Web Tool-15-D-UncheckedEcopm",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "de007636e25249238447264a988a927b",
-            "name": "AIN Web Tool-15-D-dfsdf",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "62f29b3613634ca6a3065cbe0e020c44",
-            "name": "AIN/SMS-16-D-Multiservices1",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "649289e30d3244e0b48098114d63c2aa",
-            "name": "AIN Web Tool-15-D-SSPST66",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "3f21eeea6c2c486bba31dab816c05a32",
-            "name": "AIN Web Tool-15-D-ASSPST47",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "f60ce21d3ee6427586cff0d22b03b773",
-            "name": "CESAR-100-D-sspjg67246",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "8774659e425f479895ae091bb5d46560",
-            "name": "CESAR-100-D-sspjg68359",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "624eb554b0d147c19ff8885341760481",
-            "name": "AINWebTool-15-D-iftach",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "214f55f5fc414c678059c383b03e4962",
-            "name": "CESAR-100-D-sspjg612401",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "c90666c291664841bb98e4d981ff1db5",
-            "name": "CESAR-100-D-sspjg621340",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-            "name": "sspjg621351cloned",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "b386b768a3f24c8e953abbe0b3488c02",
-            "name": "AINWebTool-15-D-eteancomp",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "dc6c4dbfd225474e9deaadd34968646c",
-            "name": "AINWebTool-15-T-SPFET",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-            "name": "AINWebTool-15-X-eeweww",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "f2f3830e4c984d45bcd00e1a04158a79",
-            "name": "CESAR-100-D-spjg61909",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "05b91bd5137f4929878edd965755c06d",
-            "name": "CESAR-100-D-sspjg621512cloned",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "7002fbe8482d4a989ddf445b1ce336e0",
-            "name": "AINWebTool-15-X-vdr",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "4008522be43741dcb1f5422022a2aa0b",
-            "name": "AINWebTool-15-D-ssasa",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "f44e2e96a1b6476abfda2fa407b00169",
-            "name": "AINWebTool-15-D-PFNPT",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "b69a52bec8a84669a37a1e8b72708be7",
-            "name": "AINWebTool-15-X-vdre",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "fac7d9fd56154caeb9332202dcf2969f",
-            "name": "AINWebTool-15-X-NONPODECOMP",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "2d34d8396e194eb49969fd61ffbff961",
-            "name": "DN5242-Nov16-T5",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-            "name": "ro-T11",
+            "id": "d0a3e3f2964542259d155a81c41aadc3",
+            "name": "test-hvf6-09",
             "isPermitted": true,
             "cloudOwner": "irma-aic"
           }, {
@@ -1460,16 +1375,6 @@ function getStore() {
             "name": "ro-T112",
             "isPermitted": true,
             "cloudOwner": "irma-aic"
-          }, {
-            "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-            "name": "DN5242-Nov21-T1",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
-          }, {
-            "id": "d0a3e3f2964542259d155a81c41aadc3",
-            "name": "test-hvf6-09",
-            "isPermitted": true,
-            "cloudOwner": "irma-aic"
           }, {
             "id": "cbb99fe4ada84631b7baf046b6fd2044",
             "name": "DN5242-Nov16-T3",
@@ -1567,199 +1472,28 @@ function getStore() {
           "isPermitted": false
         }, {"id": "7", "name": "vVM", "isPermitted": false}, {"id": "4", "name": "vVoiceMail", "isPermitted": false}]
       },
-      "aicZones": [{"id": "ATL53", "name": "AAIATLTE-ATL53"}, {"id": "ABC15", "name": "AAITESAN-ABC15"}, {
-        "id": "TES36",
-        "name": "ABCEETES-TES36"
-      }, {"id": "ATL54", "name": "AICFTAAI-ATL54"}, {"id": "ATL43", "name": "AICLOCID-ATL43"}, {
-        "id": "AMD15",
-        "name": "AMDFAA01-AMD15"
-      }, {"id": "AMF11", "name": "AMDOCS01-AMF11"}, {"id": "RCT1", "name": "AMSTERNL-RCT1"}, {
-        "id": "AMS1",
-        "name": "AMSTNLBW-AMS1"
-      }, {"id": "HJH1", "name": "AOEEQQQD-HJH1"}, {"id": "HJE1", "name": "AOEEWWWD-HJE1"}, {
-        "id": "MCS1",
-        "name": "ASACMAMS-MCS1"
-      }, {"id": "AUG1", "name": "ASDFGHJK-AUG1"}, {"id": "LUC1", "name": "ATLDFGYC-LUC1"}, {
-        "id": "ATL1",
-        "name": "ATLNGAMA-ATL1"
-      }, {"id": "ATL2", "name": "ATLNGANW-ATL2"}, {"id": "HPO1", "name": "ATLNGAUP-HPO1"}, {
-        "id": "ANI1",
-        "name": "ATLNGTRE-ANI1"
-      }, {"id": "ATL44", "name": "ATLSANAB-ATL44"}, {"id": "ATL56", "name": "ATLSANAC-ATL56"}, {
-        "id": "ABC11",
-        "name": "ATLSANAI-ABC11"
-      }, {"id": "ATL34", "name": "ATLSANAI-ATL34"}, {"id": "ATL63", "name": "ATLSANEW-ATL63"}, {
-        "id": "ABC12",
-        "name": "ATLSECIA-ABC12"
-      }, {"id": "AMD18", "name": "AUDIMA01-AMD18"}, {"id": "AVT1", "name": "AVTRFLHD-AVT1"}, {
-        "id": "KIT1",
-        "name": "BHYJFGLN-KIT1"
-      }, {"id": "BHY17", "name": "BHYTFRF3-BHY17"}, {"id": "RTW5", "name": "BHYTFRY4-RTW5"}, {
-        "id": "RTZ4",
-        "name": "BHYTFRZ6-RTZ4"
-      }, {"id": "RTD2", "name": "BHYTFRk4-RTD2"}, {"id": "BNA1", "name": "BNARAGBK-BNA1"}, {
-        "id": "VEL1",
-        "name": "BNMLKUIK-VEL1"
-      }, {"id": "BOT1", "name": "BOTHWAKY-BOT1"}, {"id": "CAL33", "name": "CALIFORN-CAL33"}, {
-        "id": "ATL84",
-        "name": "CANTTCOC-ATL84"
-      }, {"id": "HSD1", "name": "CHASKCDS-HSD1"}, {"id": "CHI1", "name": "CHILLIWE-CHI1"}, {
-        "id": "XCP12",
-        "name": "CHKGH123-XCP12"
-      }, {"id": "JNL1", "name": "CJALSDAC-JNL1"}, {"id": "KJN1", "name": "CKALDKSA-KJN1"}, {
-        "id": "CLG1",
-        "name": "CLGRABAD-CLG1"
-      }, {"id": "CKL1", "name": "CLKSKCKK-CKL1"}, {"id": "ATL66", "name": "CLLIAAII-ATL66"}, {
-        "id": "CQK1",
-        "name": "CQKSCAKK-CQK1"
-      }, {"id": "CWY1", "name": "CWYMOWBS-CWY1"}, {"id": "DKJ1", "name": "DKJSJDKA-DKJ1"}, {
-        "id": "DSF45",
-        "name": "DSFBG123-DSF45"
-      }, {"id": "DSL12", "name": "DSLFK242-DSL12"}, {"id": "FDE55", "name": "FDERT555-FDE55"}, {
-        "id": "VEN2",
-        "name": "FGHJUHIL-VEN2"
-      }, {"id": "ATL64", "name": "FORLOAAJ-ATL64"}, {"id": "GNV1", "name": "GNVLSCTL-GNV1"}, {
-        "id": "SAN22",
-        "name": "GNVLSCTL-SAN22"
-      }, {"id": "KAP1", "name": "HIOUYTRQ-KAP1"}, {"id": "LIS1", "name": "HOSTPROF-LIS1"}, {
-        "id": "HRG1",
-        "name": "HRGHRGGS-HRG1"
-      }, {"id": "HST25", "name": "HSTNTX01-HST25"}, {"id": "STN27", "name": "HSTNTX01-STN27"}, {
-        "id": "HST70",
-        "name": "HSTNTX70-HST70"
-      }, {"id": "KOR1", "name": "HYFLNBVT-KOR1"}, {"id": "RAD10", "name": "INDIPUNE-RAD10"}, {
-        "id": "REL1",
-        "name": "INGERFGT-REL1"
-      }, {"id": "JAD1", "name": "JADECLLI-JAD1"}, {"id": "HKA1", "name": "JAKHLASS-HKA1"}, {
-        "id": "JCS1",
-        "name": "JCSJSCJS-JCS1"
-      }, {"id": "JCV1", "name": "JCVLFLBW-JCV1"}, {"id": "KGM2", "name": "KGMTNC20-KGM2"}, {
-        "id": "KJF12",
-        "name": "KJFDH123-KJF12"
-      }, {"id": "JGS1", "name": "KSJKKKKK-JGS1"}, {"id": "LAG1", "name": "LARGIZON-LAG1"}, {
-        "id": "LAG1a",
-        "name": "LARGIZON-LAG1a"
-      }, {"id": "LAG45", "name": "LARGIZON-LAG1a"}, {"id": "LAG1b", "name": "LARGIZON-LAG1b"}, {
-        "id": "WAN1",
-        "name": "LEIWANGW-WAN1"
-      }, {"id": "DSA1", "name": "LKJHGFDS-DSA1"}, {"id": "LON1", "name": "LONEENCO-LON1"}, {
-        "id": "SITE",
-        "name": "LONEENCO-SITE"
-      }, {"id": "ZXL1", "name": "LWLWCANN-ZXL1"}, {"id": "hvf20", "name": "MDTWNJ21-hvf20"}, {
-        "id": "hvf32",
-        "name": "MDTWNJ21-hvf32"
-      }, {"id": "AMD13", "name": "MEMATLAN-AMD13"}, {"id": "MIC54", "name": "MICHIGAN-MIC54"}, {
-        "id": "MAR1",
-        "name": "MNBVCXZM-MAR1"
-      }, {"id": "NCA1", "name": "NCANCANN-NCA1"}, {"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {
-        "id": "GAR1",
-        "name": "NGFVSJKO-GAR1"
-      }, {"id": "NYC1", "name": "NYCMNY54-NYC1"}, {"id": "OKC1", "name": "OKCBOK55-OKC1"}, {
-        "id": "OLG1",
-        "name": "OLHOLHOL-OLG1"
-      }, {"id": "OLK1", "name": "OLKOLKLS-OLK1"}, {"id": "NIR1", "name": "ORFLMANA-NIR1"}, {
-        "id": "JAN1",
-        "name": "ORFLMATT-JAN1"
-      }, {"id": "ORL1", "name": "ORLDFLMA-ORL1"}, {"id": "PAR1", "name": "PARSFRCG-PAR1"}, {
-        "id": "PBL1",
-        "name": "PBLAPBAI-PBL1"
-      }, {"id": "mac10", "name": "PKGTESTF-mac10"}, {"id": "mac20", "name": "PKGTESTF-mac20"}, {
-        "id": "TIR2",
-        "name": "PLKINHYI-TIR2"
-      }, {"id": "IBB1", "name": "PLMKOIJU-IBB1"}, {"id": "COM1", "name": "PLMKOPIU-COM1"}, {
-        "id": "POI1",
-        "name": "PLMNJKIU-POI1"
-      }, {"id": "PLT1", "name": "PLTNCA60-PLT1"}, {"id": "POI22", "name": "POIUY123-POI22"}, {
-        "id": "DCC1",
-        "name": "POIUYTGH-DCC1"
-      }, {"id": "DCC1a", "name": "POIUYTGH-DCC1a"}, {"id": "DCC1b", "name": "POIUYTGH-DCC1b"}, {
-        "id": "DCC2",
-        "name": "POIUYTGH-DCC2"
-      }, {"id": "DCC3", "name": "POIUYTGH-DCC3"}, {"id": "IAA1", "name": "QAZXSWED-IAA1"}, {
-        "id": "QWE1",
-        "name": "QWECLLI1-QWE1"
-      }, {"id": "NUM1", "name": "QWERTYUI-NUM1"}, {"id": "RAD1", "name": "RADICAL1-RAD1"}, {
-        "id": "RJN1",
-        "name": "RJNRBZAW-RJN1"
-      }, {"id": "SAA13", "name": "SAIT1AA9-SAA13"}, {"id": "SAA14", "name": "SAIT1AA9-SAA14"}, {
-        "id": "SDD81",
-        "name": "SAIT1DD6-SDD81"
-      }, {"id": "SDD82", "name": "SAIT1DD9-SDD82"}, {"id": "SAA11", "name": "SAIT9AA2-SAA11"}, {
-        "id": "SAA80",
-        "name": "SAIT9AA3-SAA80"
-      }, {"id": "SAA12", "name": "SAIT9AF8-SAA12"}, {"id": "SCC80", "name": "SAIT9CC3-SCC80"}, {
-        "id": "ATL75",
-        "name": "SANAAIRE-ATL75"
-      }, {"id": "ICC1", "name": "SANJITAT-ICC1"}, {"id": "SCK1", "name": "SCKSCKSK-SCK1"}, {
-        "id": "EHH78",
-        "name": "SDCSHHH5-EHH78"
-      }, {"id": "SAA78", "name": "SDCTAAA1-SAA78"}, {"id": "SAX78", "name": "SDCTAXG1-SAX78"}, {
-        "id": "SBX78",
-        "name": "SDCTBXG1-SBX78"
-      }, {"id": "SEE78", "name": "SDCTEEE4-SEE78"}, {"id": "SGG78", "name": "SDCTGGG1-SGG78"}, {
-        "id": "SXB78",
-        "name": "SDCTGXB1-SXB78"
-      }, {"id": "SJJ78", "name": "SDCTJJJ1-SJJ78"}, {"id": "SKK78", "name": "SDCTKKK1-SKK78"}, {
-        "id": "SLF78",
-        "name": "SDCTLFN1-SLF78"
-      }, {"id": "SLL78", "name": "SDCTLLL1-SLL78"}, {"id": "MAD11", "name": "SDFQWGKL-MAD11"}, {
-        "id": "HGD1",
-        "name": "SDFQWHGD-HGD1"
-      }, {"id": "SBB78", "name": "SDIT1BBB-SBB78"}, {"id": "SDG78", "name": "SDIT1BDG-SDG78"}, {
-        "id": "SBU78",
-        "name": "SDIT1BUB-SBU78"
-      }, {"id": "SHH78", "name": "SDIT1HHH-SHH78"}, {"id": "SJU78", "name": "SDIT1JUB-SJU78"}, {
-        "id": "SNA1",
-        "name": "SNANTXCA-SNA1"
-      }, {"id": "SAM1", "name": "SNDGCA64-SAN1"}, {"id": "SNG1", "name": "SNGPSIAU-SNG1"}, {
-        "id": "SSA56",
-        "name": "SSIT2AA7-SSA56"
-      }, {"id": "STG1", "name": "STTGGE62-STG1"}, {"id": "STT1", "name": "STTLWA02-STT1"}, {
-        "id": "SYD1",
-        "name": "SYDNAUBV-SYD1"
-      }, {"id": "ATL99", "name": "TEESTAAI-ATL43"}, {"id": "ATL98", "name": "TEESTAAI-ATL43"}, {
-        "id": "ATL76",
-        "name": "TELEPAAI-ATL76"
-      }, {"id": "ABC14", "name": "TESAAISA-ABC14"}, {"id": "TAT33", "name": "TESAAISA-TAT33"}, {
-        "id": "TAT34",
-        "name": "TESAAISB-TAT34"
-      }, {"id": "TAT37", "name": "TESAAISD-TAT37"}, {"id": "ATL62", "name": "TESSASCH-ATL62"}, {
-        "id": "TLP1",
-        "name": "TLPNXM18-TLP1"
-      }, {"id": "SAN13", "name": "TOKYJPFA-SAN13"}, {"id": "TOK1", "name": "TOKYJPFA-TOK1"}, {
-        "id": "TOL1",
-        "name": "TOLDOH21-TOL1"
-      }, {"id": "TOR1", "name": "TOROONXN-TOR1"}, {"id": "TOY1", "name": "TORYONNZ-TOY1"}, {
-        "id": "ATL35",
-        "name": "TTESSAAI-ATL35"
-      }, {"id": "TUF1", "name": "TUFCLLI1-TUF1"}, {"id": "SAI1", "name": "UBEKQLPD-SAI1"}, {
-        "id": "UUU4",
-        "name": "UUUAAAUU-UUU4"
-      }, {"id": "YYY1", "name": "UUUAIAAI-YYY1"}, {"id": "BAN1", "name": "VSDKYUTP-BAN1"}, {
-        "id": "WAS1",
-        "name": "WASHDCSW-WAS1"
-      }, {"id": "APP1", "name": "WBHGTYUI-APP1"}, {"id": "SUL2", "name": "WERTYUJK-SUL2"}, {
-        "id": "DEF2",
-        "name": "WSBHGTYL-DEF2"
-      }, {"id": "DHA12", "name": "WSXEDECF-DHA12"}, {"id": "MNT11", "name": "WSXEFBTH-MNT11"}, {
-        "id": "RAJ1",
-        "name": "YGBIJNLQ-RAJ1"
-      }, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {"id": "ZEN1", "name": "ZENCLLI1-ZEN1"}, {
-        "id": "ZOG1",
-        "name": "ZOGASTRO-ZOG1"
-      }, {"id": "SDE1", "name": "ZXCVBNMA-SDE1"}, {"id": "SIP1", "name": "ZXCVBNMK-SIP1"}, {
-        "id": "JUL1",
-        "name": "ZXCVBNMM-JUL1"
-      }, {"id": "ERT1", "name": "ertclli1-ERT1"}, {"id": "IOP1", "name": "iopclli1-IOP1"}, {
-        "id": "OPA1",
-        "name": "opaclli1-OPA1"
-      }, {"id": "RAI1", "name": "poiuytre-RAI1"}, {"id": "PUR1", "name": "purelyde-PUR1"}, {
-        "id": "RTY1",
-        "name": "rtyclli1-RTY1"
-      }, {"id": "SDF1", "name": "sdfclli1-SDF1"}, {"id": "SSW56", "name": "ss8126GT-SSW56"}, {
-        "id": "UIO1",
-        "name": "uioclli1-UIO1"
-      }],
+      "aicZones": [
+        {
+          "id": "NFT1",
+          "name": "NFTJSSSS-NFT1"
+        },
+        {
+          "id": "JAG1",
+          "name": "YUDFJULP-JAG1"
+        },
+        {
+          "id": "YYY1",
+          "name": "UUUAIAAI-YYY1"
+        },
+        {
+          "id": "AVT1",
+          "name": "AVTRFLHD-AVT1"
+        },
+        {
+          "id": "ATL34",
+          "name": "ATLSANAI-ATL34"
+        }
+      ],
       "categoryParameters": {
         "owningEntityList": [{
           "id": "aaa1",
index 7df03fd..c56cc49 100644 (file)
@@ -7,10 +7,12 @@ import {MessageBoxService} from "../../../shared/components/messageBox/messageBo
 import * as _ from "lodash";
 import {DrawingBoardModes} from "../drawing-board.modes";
 import {AuditInfoModalComponent} from "../../../shared/components/auditInfoModal/auditInfoModal.component";
-import {VnfModelInfo} from "./models/vnf/vnf.model.info";
 import {ILevelNodeInfo} from "./models/basic.model.info";
 import {ComponentInfoModel, ComponentInfoType} from "../component-info/component-info-model";
 import {ModelInformationItem} from "../../../shared/components/model-information/model-information.component";
+import {undoUpgradeService, upgradeService} from "../../../shared/storeUtil/utils/service/service.actions";
+import {VNFMethods} from "../../../shared/storeUtil/utils/vnf/vnf.actions";
+import {FeatureFlagsService, Features} from "../../../shared/services/featureFlag/feature-flags.service";
 
 @Injectable()
 export class SharedTreeService {
@@ -106,16 +108,7 @@ export class SharedTreeService {
    * should return true if can delete
    **********************************************/
   shouldShowDelete(node): boolean {
-    const mode = this._store.getState().global.drawingBoardStatus;
-    if (!_.isNil(node) && !_.isNil(node.data) && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions['delete'])) {
-      if (mode !== DrawingBoardModes.EDIT || node.data.action === ServiceInstanceActions.Create) {
-        return false;
-      } else if (node.data.action === ServiceInstanceActions.None) {
-        return true
-      }
-      return false;
-    }
-    return false;
+    return this.shouldShowButtonGeneric(node, "delete")
   }
 
   /**********************************************
@@ -145,6 +138,78 @@ export class SharedTreeService {
     }
     return false;
   }
+  /**********************************************
+   * enabled only on edit/design
+   * enabled only if there's a newer version for VNF-M
+   **********************************************/
+  upgradeBottomUp(node,serviceModelId: string): void {
+    this.iterateOverTreeBranchAndRunAction(node, serviceModelId, VNFMethods.UPGRADE);
+    this._store.dispatch(upgradeService(serviceModelId));
+  }
+
+  private iterateOverTreeBranchAndRunAction(node, serviceModelId: string, actionMethod) {
+    while (_.has(node.parent, 'data') && _.has(node.parent.data, 'menuActions')
+    && !_.isNil(node.parent.data.menuActions[actionMethod])) {
+      node = node.parent;
+      node.data.menuActions[actionMethod]['method'](node, serviceModelId);
+    }
+  }
+
+  /****************************************************
+   * should return true if customer can upgrade a VFM *
+   ****************************************************/
+  shouldShowUpgrade(node, serviceModelId): boolean {
+    if (FeatureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE, this._store) &&
+      this.isThereAnUpdatedLatestVersion(serviceModelId)) {
+      return this.shouldShowButtonGeneric(node, VNFMethods.UPGRADE);
+    }
+    else {
+      return false
+    }
+  }
+
+  private isThereAnUpdatedLatestVersion(serviceModelId) : boolean{
+    let serviceInstance = this._store.getState().service.serviceInstance[serviceModelId];
+    return !_.isNil(serviceInstance.latestAvailableVersion) && (Number(serviceInstance.modelInfo.modelVersion) < serviceInstance.latestAvailableVersion);
+  }
+
+  private shouldShowButtonGeneric(node, method) {
+    const mode = this._store.getState().global.drawingBoardStatus;
+    if (!_.isNil(node) && !_.isNil(node.data) && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions[method])) {
+      if (mode !== DrawingBoardModes.EDIT || node.data.action === ServiceInstanceActions.Create) {
+        return false;
+      }
+      else if (node.data.action === ServiceInstanceActions.None) {
+        return true
+      }
+    }
+    return false;
+  }
+
+  /**********************************************
+   * return boolean according to
+   * current defined action of VFModule node
+   **********************************************/
+  shouldShowUndoUpgrade(node): boolean {
+    const mode = this._store.getState().global.drawingBoardStatus;
+    if (mode === DrawingBoardModes.EDIT && !_.isNil(node.data.action) && !_.isNil(node.data.menuActions[VNFMethods.UNDO_UPGRADE])) {
+      if (node.data.action === ServiceInstanceActions.Upgrade) {
+        return false;
+      } else if (node.data.action.split('_').pop() === ServiceInstanceActions.Upgrade) {
+        return true
+      }
+      return false;
+    }
+    return false;
+  }
+  /**********************************************
+   * enabled only on edit/design
+   * enabled only if there's a newer version for VNF-M
+   **********************************************/
+  undoUpgradeBottomUp(node,serviceModelId: string): void {
+    this.iterateOverTreeBranchAndRunAction(node, serviceModelId, VNFMethods.UNDO_UPGRADE);
+    this._store.dispatch(undoUpgradeService(serviceModelId));
+  }
   /**********************************************
    * should return true if can duplicate by mode
    **********************************************/
index d90c65e..a6a29d1 100644 (file)
@@ -508,128 +508,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -879,754 +759,6 @@ class MockAppStore<T> {
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index fbcca06..351f839 100644 (file)
@@ -529,128 +529,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -658,16 +538,6 @@ class MockAppStore<T> {
                 "name": "ro-T112",
                 "isPermitted": true
               },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -900,754 +770,6 @@ class MockAppStore<T> {
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index a99856c..66afac9 100644 (file)
@@ -528,128 +528,8 @@ class MockAppStore<T> {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -657,16 +537,6 @@ class MockAppStore<T> {
                 "name": "ro-T112",
                 "isPermitted": true
               },
-              {
-                "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-                "name": "DN5242-Nov21-T1",
-                "isPermitted": true
-              },
-              {
-                "id": "d0a3e3f2964542259d155a81c41aadc3",
-                "name": "test-hvf6-09",
-                "isPermitted": true
-              },
               {
                 "id": "cbb99fe4ada84631b7baf046b6fd2044",
                 "name": "DN5242-Nov16-T3",
@@ -899,754 +769,6 @@ class MockAppStore<T> {
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index e854f8e..fa77bed 100644 (file)
@@ -539,128 +539,8 @@ class MockAppStore<T>{
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -910,754 +790,6 @@ class MockAppStore<T>{
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index 69cb7dc..54af063 100644 (file)
@@ -1753,124 +1753,28 @@ class MockReduxStore<T> {
               "id": "092eb9e8e4b7412e8787dd091bc58e86",
               "name": "USP-SIP-IC-24335-T-01",
               "isPermitted": true
-            }],
-            "hvf6": [{
-              "id": "bae71557c5bb4d5aac6743a4e5f1d054",
-              "name": "AIN Web Tool-15-D-testalexandria",
-              "isPermitted": true
-            }, {
-              "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-              "name": "AIN Web Tool-15-D-STTest2",
-              "isPermitted": true
-            }, {
-              "id": "1178612d2b394be4834ad77f567c0af2",
-              "name": "AIN Web Tool-15-D-SSPtestcustome",
-              "isPermitted": true
-            }, {
-              "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-              "name": "AIN Web Tool-15-D-UncheckedEcopm",
-              "isPermitted": true
-            }, {
-              "id": "de007636e25249238447264a988a927b",
-              "name": "AIN Web Tool-15-D-dfsdf",
-              "isPermitted": true
-            }, {
-              "id": "62f29b3613634ca6a3065cbe0e020c44",
-              "name": "AIN/SMS-16-D-Multiservices1",
-              "isPermitted": true
-            }, {
-              "id": "649289e30d3244e0b48098114d63c2aa",
-              "name": "AIN Web Tool-15-D-SSPST66",
-              "isPermitted": true
-            }, {
-              "id": "3f21eeea6c2c486bba31dab816c05a32",
-              "name": "AIN Web Tool-15-D-ASSPST47",
-              "isPermitted": true
-            }, {
-              "id": "f60ce21d3ee6427586cff0d22b03b773",
-              "name": "CESAR-100-D-sspjg67246",
-              "isPermitted": true
-            }, {
-              "id": "8774659e425f479895ae091bb5d46560",
-              "name": "CESAR-100-D-sspjg68359",
-              "isPermitted": true
-            }, {
-              "id": "624eb554b0d147c19ff8885341760481",
-              "name": "AINWebTool-15-D-iftach",
-              "isPermitted": true
-            }, {
-              "id": "214f55f5fc414c678059c383b03e4962",
-              "name": "CESAR-100-D-sspjg612401",
-              "isPermitted": true
-            }, {
-              "id": "c90666c291664841bb98e4d981ff1db5",
-              "name": "CESAR-100-D-sspjg621340",
-              "isPermitted": true
-            }, {
-              "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-              "name": "sspjg621351cloned",
-              "isPermitted": true
-            }, {
-              "id": "b386b768a3f24c8e953abbe0b3488c02",
-              "name": "AINWebTool-15-D-eteancomp",
-              "isPermitted": true
-            }, {
-              "id": "dc6c4dbfd225474e9deaadd34968646c",
-              "name": "AINWebTool-15-T-SPFET",
-              "isPermitted": true
-            }, {
-              "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-              "name": "AINWebTool-15-X-eeweww",
-              "isPermitted": true
-            }, {
-              "id": "f2f3830e4c984d45bcd00e1a04158a79",
-              "name": "CESAR-100-D-spjg61909",
-              "isPermitted": true
-            }, {
-              "id": "05b91bd5137f4929878edd965755c06d",
-              "name": "CESAR-100-D-sspjg621512cloned",
-              "isPermitted": true
-            }, {
-              "id": "7002fbe8482d4a989ddf445b1ce336e0",
-              "name": "AINWebTool-15-X-vdr",
-              "isPermitted": true
-            }, {
-              "id": "4008522be43741dcb1f5422022a2aa0b",
-              "name": "AINWebTool-15-D-ssasa",
-              "isPermitted": true
-            }, {
-              "id": "f44e2e96a1b6476abfda2fa407b00169",
-              "name": "AINWebTool-15-D-PFNPT",
-              "isPermitted": true
-            }, {
-              "id": "b69a52bec8a84669a37a1e8b72708be7",
-              "name": "AINWebTool-15-X-vdre",
-              "isPermitted": true
-            }, {
-              "id": "fac7d9fd56154caeb9332202dcf2969f",
-              "name": "AINWebTool-15-X-NONPODECOMP",
-              "isPermitted": true
-            }, {
-              "id": "2d34d8396e194eb49969fd61ffbff961",
-              "name": "DN5242-Nov16-T5",
-              "isPermitted": true
-            }, {
-              "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-              "name": "ro-T11",
-              "isPermitted": true
-            }, {
-              "id": "fa45ca53c80b492fa8be5477cd84fc2b",
-              "name": "ro-T112",
-              "isPermitted": true
-            }, {
-              "id": "4914ab0ab3a743e58f0eefdacc1dde77",
-              "name": "DN5242-Nov21-T1",
-              "isPermitted": true
-            }, {
-              "id": "d0a3e3f2964542259d155a81c41aadc3",
-              "name": "test-hvf6-09",
-              "isPermitted": true
-            }, {"id": "cbb99fe4ada84631b7baf046b6fd2044", "name": "DN5242-Nov16-T3", "isPermitted": true}]
+            }], "hvf6": [
+              {
+                "id": "bae71557c5bb4d5aac6743a4e5f1d054",
+                "name": "AIN Web Tool-15-D-testalexandria",
+                "isPermitted": true
+              },
+              {
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
+                "isPermitted": true
+              },
+              {
+                "id": "fa45ca53c80b492fa8be5477cd84fc2b",
+                "name": "ro-T112",
+                "isPermitted": true
+              },
+              {
+                "id": "cbb99fe4ada84631b7baf046b6fd2044",
+                "name": "DN5242-Nov16-T3",
+                "isPermitted": true
+              }
+            ]
           }
         },
         "productFamilies": [{
@@ -1977,199 +1881,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "name": "UUUAIAAI-YYY1"
-        }, {"id": "BAN1", "name": "VSDKYUTP-BAN1"}, {"id": "DKJ1", "name": "DKJSJDKA-DKJ1"}, {
-          "id": "MCS1",
-          "name": "ASACMAMS-MCS1"
-        }, {"id": "UIO1", "name": "uioclli1-UIO1"}, {"id": "RAJ1", "name": "YGBIJNLQ-RAJ1"}, {
-          "id": "OPA1",
-          "name": "opaclli1-OPA1"
-        }, {"id": "SDE1", "name": "ZXCVBNMA-SDE1"}, {"id": "VEN2", "name": "FGHJUHIL-VEN2"}, {
-          "id": "ORL1",
-          "name": "ORLDFLMA-ORL1"
-        }, {"id": "JAD1", "name": "JADECLLI-JAD1"}, {"id": "ZXL1", "name": "LWLWCANN-ZXL1"}, {
-          "id": "CKL1",
-          "name": "CLKSKCKK-CKL1"
-        }, {"id": "SDF1", "name": "sdfclli1-SDF1"}, {"id": "RAD1", "name": "RADICAL1-RAD1"}, {
-          "id": "KIT1",
-          "name": "BHYJFGLN-KIT1"
-        }, {"id": "REL1", "name": "INGERFGT-REL1"}, {"id": "JNL1", "name": "CJALSDAC-JNL1"}, {
-          "id": "OLK1",
-          "name": "OLKOLKLS-OLK1"
-        }, {"id": "CHI1", "name": "CHILLIWE-CHI1"}, {"id": "UUU4", "name": "UUUAAAUU-UUU4"}, {
-          "id": "TUF1",
-          "name": "TUFCLLI1-TUF1"
-        }, {"id": "KJN1", "name": "CKALDKSA-KJN1"}, {"id": "SAM1", "name": "SNDGCA64-SAN1"}, {
-          "id": "SCK1",
-          "name": "SCKSCKSK-SCK1"
-        }, {"id": "HJH1", "name": "AOEEQQQD-HJH1"}, {"id": "HGD1", "name": "SDFQWHGD-HGD1"}, {
-          "id": "KOR1",
-          "name": "HYFLNBVT-KOR1"
-        }, {"id": "ATL43", "name": "AICLOCID-ATL43"}, {"id": "ATL54", "name": "AICFTAAI-ATL54"}, {
-          "id": "ATL66",
-          "name": "CLLIAAII-ATL66"
-        }, {"id": "VEL1", "name": "BNMLKUIK-VEL1"}, {"id": "ICC1", "name": "SANJITAT-ICC1"}, {
-          "id": "MNT11",
-          "name": "WSXEFBTH-MNT11"
-        }, {"id": "DEF2", "name": "WSBHGTYL-DEF2"}, {"id": "MAD11", "name": "SDFQWGKL-MAD11"}, {
-          "id": "OLG1",
-          "name": "OLHOLHOL-OLG1"
-        }, {"id": "GAR1", "name": "NGFVSJKO-GAR1"}, {"id": "SAN22", "name": "GNVLSCTL-SAN22"}, {
-          "id": "HRG1",
-          "name": "HRGHRGGS-HRG1"
-        }, {"id": "JCS1", "name": "JCSJSCJS-JCS1"}, {"id": "DHA12", "name": "WSXEDECF-DHA12"}, {
-          "id": "HJE1",
-          "name": "AOEEWWWD-HJE1"
-        }, {"id": "NCA1", "name": "NCANCANN-NCA1"}, {"id": "IOP1", "name": "iopclli1-IOP1"}, {
-          "id": "RTY1",
-          "name": "rtyclli1-RTY1"
-        }, {"id": "KAP1", "name": "HIOUYTRQ-KAP1"}, {"id": "ZEN1", "name": "ZENCLLI1-ZEN1"}, {
-          "id": "HKA1",
-          "name": "JAKHLASS-HKA1"
-        }, {"id": "CQK1", "name": "CQKSCAKK-CQK1"}, {"id": "SAI1", "name": "UBEKQLPD-SAI1"}, {
-          "id": "ERT1",
-          "name": "ertclli1-ERT1"
-        }, {"id": "IBB1", "name": "PLMKOIJU-IBB1"}, {"id": "TIR2", "name": "PLKINHYI-TIR2"}, {
-          "id": "HSD1",
-          "name": "CHASKCDS-HSD1"
-        }, {"id": "SLF78", "name": "SDCTLFN1-SLF78"}, {"id": "SEE78", "name": "SDCTEEE4-SEE78"}, {
-          "id": "SAN13",
-          "name": "TOKYJPFA-SAN13"
-        }, {"id": "SAA78", "name": "SDCTAAA1-SAA78"}, {"id": "LUC1", "name": "ATLDFGYC-LUC1"}, {
-          "id": "AMD13",
-          "name": "MEMATLAN-AMD13"
-        }, {"id": "TOR1", "name": "TOROONXN-TOR1"}, {"id": "QWE1", "name": "QWECLLI1-QWE1"}, {
-          "id": "ZOG1",
-          "name": "ZOGASTRO-ZOG1"
-        }, {"id": "CAL33", "name": "CALIFORN-CAL33"}, {"id": "SHH78", "name": "SDIT1HHH-SHH78"}, {
-          "id": "DSA1",
-          "name": "LKJHGFDS-DSA1"
-        }, {"id": "CLG1", "name": "CLGRABAD-CLG1"}, {"id": "BNA1", "name": "BNARAGBK-BNA1"}, {
-          "id": "ATL84",
-          "name": "CANTTCOC-ATL84"
-        }, {"id": "APP1", "name": "WBHGTYUI-APP1"}, {"id": "RJN1", "name": "RJNRBZAW-RJN1"}, {
-          "id": "EHH78",
-          "name": "SDCSHHH5-EHH78"
-        }, {"id": "mac10", "name": "PKGTESTF-mac10"}, {"id": "SXB78", "name": "SDCTGXB1-SXB78"}, {
-          "id": "SAX78",
-          "name": "SDCTAXG1-SAX78"
-        }, {"id": "SYD1", "name": "SYDNAUBV-SYD1"}, {"id": "TOK1", "name": "TOKYJPFA-TOK1"}, {
-          "id": "KGM2",
-          "name": "KGMTNC20-KGM2"
-        }, {"id": "DCC1b", "name": "POIUYTGH-DCC1b"}, {"id": "SKK78", "name": "SDCTKKK1-SKK78"}, {
-          "id": "SGG78",
-          "name": "SDCTGGG1-SGG78"
-        }, {"id": "SJJ78", "name": "SDCTJJJ1-SJJ78"}, {"id": "SBX78", "name": "SDCTBXG1-SBX78"}, {
-          "id": "LAG1",
-          "name": "LARGIZON-LAG1"
-        }, {"id": "IAA1", "name": "QAZXSWED-IAA1"}, {"id": "POI1", "name": "PLMNJKIU-POI1"}, {
-          "id": "LAG1a",
-          "name": "LARGIZON-LAG1a"
-        }, {"id": "PBL1", "name": "PBLAPBAI-PBL1"}, {"id": "LAG45", "name": "LARGIZON-LAG1a"}, {
-          "id": "MAR1",
-          "name": "MNBVCXZM-MAR1"
-        }, {"id": "HST70", "name": "HSTNTX70-HST70"}, {"id": "DCC1a", "name": "POIUYTGH-DCC1a"}, {
-          "id": "TOL1",
-          "name": "TOLDOH21-TOL1"
-        }, {"id": "LON1", "name": "LONEENCO-LON1"}, {"id": "SJU78", "name": "SDIT1JUB-SJU78"}, {
-          "id": "STN27",
-          "name": "HSTNTX01-STN27"
-        }, {"id": "SSW56", "name": "ss8126GT-SSW56"}, {"id": "SBB78", "name": "SDIT1BBB-SBB78"}, {
-          "id": "DCC3",
-          "name": "POIUYTGH-DCC3"
-        }, {"id": "GNV1", "name": "GNVLSCTL-GNV1"}, {"id": "WAS1", "name": "WASHDCSW-WAS1"}, {
-          "id": "TOY1",
-          "name": "TORYONNZ-TOY1"
-        }, {"id": "STT1", "name": "STTLWA02-STT1"}, {"id": "STG1", "name": "STTGGE62-STG1"}, {
-          "id": "SLL78",
-          "name": "SDCTLLL1-SLL78"
-        }, {"id": "SBU78", "name": "SDIT1BUB-SBU78"}, {"id": "ATL2", "name": "ATLNGANW-ATL2"}, {
-          "id": "BOT1",
-          "name": "BOTHWAKY-BOT1"
-        }, {"id": "SNG1", "name": "SNGPSIAU-SNG1"}, {"id": "NYC1", "name": "NYCMNY54-NYC1"}, {
-          "id": "LAG1b",
-          "name": "LARGIZON-LAG1b"
-        }, {"id": "AMD15", "name": "AMDFAA01-AMD15"}, {"id": "SNA1", "name": "SNANTXCA-SNA1"}, {
-          "id": "PLT1",
-          "name": "PLTNCA60-PLT1"
-        }, {"id": "TLP1", "name": "TLPNXM18-TLP1"}, {"id": "SDD81", "name": "SAIT1DD6-SDD81"}, {
-          "id": "DCC1",
-          "name": "POIUYTGH-DCC1"
-        }, {"id": "DCC2", "name": "POIUYTGH-DCC2"}, {"id": "OKC1", "name": "OKCBOK55-OKC1"}, {
-          "id": "PAR1",
-          "name": "PARSFRCG-PAR1"
-        }, {"id": "TES36", "name": "ABCEETES-TES36"}, {"id": "COM1", "name": "PLMKOPIU-COM1"}, {
-          "id": "ANI1",
-          "name": "ATLNGTRE-ANI1"
-        }, {"id": "SDG78", "name": "SDIT1BDG-SDG78"}, {"id": "mac20", "name": "PKGTESTF-mac20"}, {
-          "id": "DSF45",
-          "name": "DSFBG123-DSF45"
-        }, {"id": "HST25", "name": "HSTNTX01-HST25"}, {"id": "AMD18", "name": "AUDIMA01-AMD18"}, {
-          "id": "SAA80",
-          "name": "SAIT9AA3-SAA80"
-        }, {"id": "SSA56", "name": "SSIT2AA7-SSA56"}, {"id": "SDD82", "name": "SAIT1DD9-SDD82"}, {
-          "id": "JCV1",
-          "name": "JCVLFLBW-JCV1"
-        }, {"id": "SUL2", "name": "WERTYUJK-SUL2"}, {"id": "PUR1", "name": "purelyde-PUR1"}, {
-          "id": "FDE55",
-          "name": "FDERT555-FDE55"
-        }, {"id": "SITE", "name": "LONEENCO-SITE"}, {"id": "ATL1", "name": "ATLNGAMA-ATL1"}, {
-          "id": "JUL1",
-          "name": "ZXCVBNMM-JUL1"
-        }, {"id": "TAT34", "name": "TESAAISB-TAT34"}, {"id": "XCP12", "name": "CHKGH123-XCP12"}, {
-          "id": "RAI1",
-          "name": "poiuytre-RAI1"
-        }, {"id": "HPO1", "name": "ATLNGAUP-HPO1"}, {"id": "KJF12", "name": "KJFDH123-KJF12"}, {
-          "id": "SCC80",
-          "name": "SAIT9CC3-SCC80"
-        }, {"id": "SAA12", "name": "SAIT9AF8-SAA12"}, {"id": "SAA14", "name": "SAIT1AA9-SAA14"}, {
-          "id": "ATL35",
-          "name": "TTESSAAI-ATL35"
-        }, {"id": "CWY1", "name": "CWYMOWBS-CWY1"}, {"id": "ATL76", "name": "TELEPAAI-ATL76"}, {
-          "id": "DSL12",
-          "name": "DSLFK242-DSL12"
-        }, {"id": "ATL53", "name": "AAIATLTE-ATL53"}, {"id": "SAA11", "name": "SAIT9AA2-SAA11"}, {
-          "id": "ATL62",
-          "name": "TESSASCH-ATL62"
-        }, {"id": "AUG1", "name": "ASDFGHJK-AUG1"}, {"id": "POI22", "name": "POIUY123-POI22"}, {
-          "id": "SAA13",
-          "name": "SAIT1AA9-SAA13"
-        }, {"id": "BHY17", "name": "BHYTFRF3-BHY17"}, {"id": "LIS1", "name": "HOSTPROF-LIS1"}, {
-          "id": "SIP1",
-          "name": "ZXCVBNMK-SIP1"
-        }, {"id": "ATL99", "name": "TEESTAAI-ATL43"}, {"id": "ATL64", "name": "FORLOAAJ-ATL64"}, {
-          "id": "TAT33",
-          "name": "TESAAISA-TAT33"
-        }, {"id": "RAD10", "name": "INDIPUNE-RAD10"}, {"id": "RTW5", "name": "BHYTFRY4-RTW5"}, {
-          "id": "JGS1",
-          "name": "KSJKKKKK-JGS1"
-        }, {"id": "ATL98", "name": "TEESTAAI-ATL43"}, {"id": "WAN1", "name": "LEIWANGW-WAN1"}, {
-          "id": "ATL44",
-          "name": "ATLSANAB-ATL44"
-        }, {"id": "RTD2", "name": "BHYTFRk4-RTD2"}, {"id": "NIR1", "name": "ORFLMANA-NIR1"}, {
-          "id": "ATL75",
-          "name": "SANAAIRE-ATL75"
-        }, {"id": "NUM1", "name": "QWERTYUI-NUM1"}, {"id": "hvf32", "name": "MDTWNJ21-hvf32"}, {
-          "id": "RTZ4",
-          "name": "BHYTFRZ6-RTZ4"
-        }, {"id": "ATL56", "name": "ATLSANAC-ATL56"}, {"id": "AMS1", "name": "AMSTNLBW-AMS1"}, {
-          "id": "RCT1",
-          "name": "AMSTERNL-RCT1"
-        }, {"id": "JAN1", "name": "ORFLMATT-JAN1"}, {"id": "ABC14", "name": "TESAAISA-ABC14"}, {
-          "id": "TAT37",
-          "name": "TESAAISD-TAT37"
-        }, {"id": "MIC54", "name": "MICHIGAN-MIC54"}, {"id": "ABC11", "name": "ATLSANAI-ABC11"}, {
-          "id": "AMF11",
-          "name": "AMDOCS01-AMF11"
-        }, {"id": "ATL63", "name": "ATLSANEW-ATL63"}, {"id": "ABC12", "name": "ATLSECIA-ABC12"}, {
-          "id": "hvf20",
-          "name": "MDTWNJ21-hvf20"
-        }, {"id": "ABC15", "name": "AAITESAN-ABC15"}, {"id": "AVT1", "name": "AVTRFLHD-AVT1"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
index 97d562b..eb094ab 100644 (file)
@@ -1760,104 +1760,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-              "name": "AIN Web Tool-15-D-STTest2",
-              "isPermitted": true
-            }, {
-              "id": "1178612d2b394be4834ad77f567c0af2",
-              "name": "AIN Web Tool-15-D-SSPtestcustome",
-              "isPermitted": true
-            }, {
-              "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-              "name": "AIN Web Tool-15-D-UncheckedEcopm",
-              "isPermitted": true
-            }, {
-              "id": "de007636e25249238447264a988a927b",
-              "name": "AIN Web Tool-15-D-dfsdf",
-              "isPermitted": true
-            }, {
-              "id": "62f29b3613634ca6a3065cbe0e020c44",
-              "name": "AIN/SMS-16-D-Multiservices1",
-              "isPermitted": true
-            }, {
-              "id": "649289e30d3244e0b48098114d63c2aa",
-              "name": "AIN Web Tool-15-D-SSPST66",
-              "isPermitted": true
-            }, {
-              "id": "3f21eeea6c2c486bba31dab816c05a32",
-              "name": "AIN Web Tool-15-D-ASSPST47",
-              "isPermitted": true
-            }, {
-              "id": "f60ce21d3ee6427586cff0d22b03b773",
-              "name": "CESAR-100-D-sspjg67246",
-              "isPermitted": true
-            }, {
-              "id": "8774659e425f479895ae091bb5d46560",
-              "name": "CESAR-100-D-sspjg68359",
-              "isPermitted": true
-            }, {
-              "id": "624eb554b0d147c19ff8885341760481",
-              "name": "AINWebTool-15-D-iftach",
-              "isPermitted": true
-            }, {
-              "id": "214f55f5fc414c678059c383b03e4962",
-              "name": "CESAR-100-D-sspjg612401",
-              "isPermitted": true
-            }, {
-              "id": "c90666c291664841bb98e4d981ff1db5",
-              "name": "CESAR-100-D-sspjg621340",
-              "isPermitted": true
-            }, {
-              "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-              "name": "sspjg621351cloned",
-              "isPermitted": true
-            }, {
-              "id": "b386b768a3f24c8e953abbe0b3488c02",
-              "name": "AINWebTool-15-D-eteancomp",
-              "isPermitted": true
-            }, {
-              "id": "dc6c4dbfd225474e9deaadd34968646c",
-              "name": "AINWebTool-15-T-SPFET",
-              "isPermitted": true
-            }, {
-              "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-              "name": "AINWebTool-15-X-eeweww",
-              "isPermitted": true
-            }, {
-              "id": "f2f3830e4c984d45bcd00e1a04158a79",
-              "name": "CESAR-100-D-spjg61909",
-              "isPermitted": true
-            }, {
-              "id": "05b91bd5137f4929878edd965755c06d",
-              "name": "CESAR-100-D-sspjg621512cloned",
-              "isPermitted": true
-            }, {
-              "id": "7002fbe8482d4a989ddf445b1ce336e0",
-              "name": "AINWebTool-15-X-vdr",
-              "isPermitted": true
-            }, {
-              "id": "4008522be43741dcb1f5422022a2aa0b",
-              "name": "AINWebTool-15-D-ssasa",
-              "isPermitted": true
-            }, {
-              "id": "f44e2e96a1b6476abfda2fa407b00169",
-              "name": "AINWebTool-15-D-PFNPT",
-              "isPermitted": true
-            }, {
-              "id": "b69a52bec8a84669a37a1e8b72708be7",
-              "name": "AINWebTool-15-X-vdre",
-              "isPermitted": true
-            }, {
-              "id": "fac7d9fd56154caeb9332202dcf2969f",
-              "name": "AINWebTool-15-X-NONPODECOMP",
-              "isPermitted": true
-            }, {
-              "id": "2d34d8396e194eb49969fd61ffbff961",
-              "name": "DN5242-Nov16-T5",
-              "isPermitted": true
-            }, {
-              "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-              "name": "ro-T11",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -1978,199 +1882,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "name": "UUUAIAAI-YYY1"
-        }, {"id": "BAN1", "name": "VSDKYUTP-BAN1"}, {"id": "DKJ1", "name": "DKJSJDKA-DKJ1"}, {
-          "id": "MCS1",
-          "name": "ASACMAMS-MCS1"
-        }, {"id": "UIO1", "name": "uioclli1-UIO1"}, {"id": "RAJ1", "name": "YGBIJNLQ-RAJ1"}, {
-          "id": "OPA1",
-          "name": "opaclli1-OPA1"
-        }, {"id": "SDE1", "name": "ZXCVBNMA-SDE1"}, {"id": "VEN2", "name": "FGHJUHIL-VEN2"}, {
-          "id": "ORL1",
-          "name": "ORLDFLMA-ORL1"
-        }, {"id": "JAD1", "name": "JADECLLI-JAD1"}, {"id": "ZXL1", "name": "LWLWCANN-ZXL1"}, {
-          "id": "CKL1",
-          "name": "CLKSKCKK-CKL1"
-        }, {"id": "SDF1", "name": "sdfclli1-SDF1"}, {"id": "RAD1", "name": "RADICAL1-RAD1"}, {
-          "id": "KIT1",
-          "name": "BHYJFGLN-KIT1"
-        }, {"id": "REL1", "name": "INGERFGT-REL1"}, {"id": "JNL1", "name": "CJALSDAC-JNL1"}, {
-          "id": "OLK1",
-          "name": "OLKOLKLS-OLK1"
-        }, {"id": "CHI1", "name": "CHILLIWE-CHI1"}, {"id": "UUU4", "name": "UUUAAAUU-UUU4"}, {
-          "id": "TUF1",
-          "name": "TUFCLLI1-TUF1"
-        }, {"id": "KJN1", "name": "CKALDKSA-KJN1"}, {"id": "SAM1", "name": "SNDGCA64-SAN1"}, {
-          "id": "SCK1",
-          "name": "SCKSCKSK-SCK1"
-        }, {"id": "HJH1", "name": "AOEEQQQD-HJH1"}, {"id": "HGD1", "name": "SDFQWHGD-HGD1"}, {
-          "id": "KOR1",
-          "name": "HYFLNBVT-KOR1"
-        }, {"id": "ATL43", "name": "AICLOCID-ATL43"}, {"id": "ATL54", "name": "AICFTAAI-ATL54"}, {
-          "id": "ATL66",
-          "name": "CLLIAAII-ATL66"
-        }, {"id": "VEL1", "name": "BNMLKUIK-VEL1"}, {"id": "ICC1", "name": "SANJITAT-ICC1"}, {
-          "id": "MNT11",
-          "name": "WSXEFBTH-MNT11"
-        }, {"id": "DEF2", "name": "WSBHGTYL-DEF2"}, {"id": "MAD11", "name": "SDFQWGKL-MAD11"}, {
-          "id": "OLG1",
-          "name": "OLHOLHOL-OLG1"
-        }, {"id": "GAR1", "name": "NGFVSJKO-GAR1"}, {"id": "SAN22", "name": "GNVLSCTL-SAN22"}, {
-          "id": "HRG1",
-          "name": "HRGHRGGS-HRG1"
-        }, {"id": "JCS1", "name": "JCSJSCJS-JCS1"}, {"id": "DHA12", "name": "WSXEDECF-DHA12"}, {
-          "id": "HJE1",
-          "name": "AOEEWWWD-HJE1"
-        }, {"id": "NCA1", "name": "NCANCANN-NCA1"}, {"id": "IOP1", "name": "iopclli1-IOP1"}, {
-          "id": "RTY1",
-          "name": "rtyclli1-RTY1"
-        }, {"id": "KAP1", "name": "HIOUYTRQ-KAP1"}, {"id": "ZEN1", "name": "ZENCLLI1-ZEN1"}, {
-          "id": "HKA1",
-          "name": "JAKHLASS-HKA1"
-        }, {"id": "CQK1", "name": "CQKSCAKK-CQK1"}, {"id": "SAI1", "name": "UBEKQLPD-SAI1"}, {
-          "id": "ERT1",
-          "name": "ertclli1-ERT1"
-        }, {"id": "IBB1", "name": "PLMKOIJU-IBB1"}, {"id": "TIR2", "name": "PLKINHYI-TIR2"}, {
-          "id": "HSD1",
-          "name": "CHASKCDS-HSD1"
-        }, {"id": "SLF78", "name": "SDCTLFN1-SLF78"}, {"id": "SEE78", "name": "SDCTEEE4-SEE78"}, {
-          "id": "SAN13",
-          "name": "TOKYJPFA-SAN13"
-        }, {"id": "SAA78", "name": "SDCTAAA1-SAA78"}, {"id": "LUC1", "name": "ATLDFGYC-LUC1"}, {
-          "id": "AMD13",
-          "name": "MEMATLAN-AMD13"
-        }, {"id": "TOR1", "name": "TOROONXN-TOR1"}, {"id": "QWE1", "name": "QWECLLI1-QWE1"}, {
-          "id": "ZOG1",
-          "name": "ZOGASTRO-ZOG1"
-        }, {"id": "CAL33", "name": "CALIFORN-CAL33"}, {"id": "SHH78", "name": "SDIT1HHH-SHH78"}, {
-          "id": "DSA1",
-          "name": "LKJHGFDS-DSA1"
-        }, {"id": "CLG1", "name": "CLGRABAD-CLG1"}, {"id": "BNA1", "name": "BNARAGBK-BNA1"}, {
-          "id": "ATL84",
-          "name": "CANTTCOC-ATL84"
-        }, {"id": "APP1", "name": "WBHGTYUI-APP1"}, {"id": "RJN1", "name": "RJNRBZAW-RJN1"}, {
-          "id": "EHH78",
-          "name": "SDCSHHH5-EHH78"
-        }, {"id": "mac10", "name": "PKGTESTF-mac10"}, {"id": "SXB78", "name": "SDCTGXB1-SXB78"}, {
-          "id": "SAX78",
-          "name": "SDCTAXG1-SAX78"
-        }, {"id": "SYD1", "name": "SYDNAUBV-SYD1"}, {"id": "TOK1", "name": "TOKYJPFA-TOK1"}, {
-          "id": "KGM2",
-          "name": "KGMTNC20-KGM2"
-        }, {"id": "DCC1b", "name": "POIUYTGH-DCC1b"}, {"id": "SKK78", "name": "SDCTKKK1-SKK78"}, {
-          "id": "SGG78",
-          "name": "SDCTGGG1-SGG78"
-        }, {"id": "SJJ78", "name": "SDCTJJJ1-SJJ78"}, {"id": "SBX78", "name": "SDCTBXG1-SBX78"}, {
-          "id": "LAG1",
-          "name": "LARGIZON-LAG1"
-        }, {"id": "IAA1", "name": "QAZXSWED-IAA1"}, {"id": "POI1", "name": "PLMNJKIU-POI1"}, {
-          "id": "LAG1a",
-          "name": "LARGIZON-LAG1a"
-        }, {"id": "PBL1", "name": "PBLAPBAI-PBL1"}, {"id": "LAG45", "name": "LARGIZON-LAG1a"}, {
-          "id": "MAR1",
-          "name": "MNBVCXZM-MAR1"
-        }, {"id": "HST70", "name": "HSTNTX70-HST70"}, {"id": "DCC1a", "name": "POIUYTGH-DCC1a"}, {
-          "id": "TOL1",
-          "name": "TOLDOH21-TOL1"
-        }, {"id": "LON1", "name": "LONEENCO-LON1"}, {"id": "SJU78", "name": "SDIT1JUB-SJU78"}, {
-          "id": "STN27",
-          "name": "HSTNTX01-STN27"
-        }, {"id": "SSW56", "name": "ss8126GT-SSW56"}, {"id": "SBB78", "name": "SDIT1BBB-SBB78"}, {
-          "id": "DCC3",
-          "name": "POIUYTGH-DCC3"
-        }, {"id": "GNV1", "name": "GNVLSCTL-GNV1"}, {"id": "WAS1", "name": "WASHDCSW-WAS1"}, {
-          "id": "TOY1",
-          "name": "TORYONNZ-TOY1"
-        }, {"id": "STT1", "name": "STTLWA02-STT1"}, {"id": "STG1", "name": "STTGGE62-STG1"}, {
-          "id": "SLL78",
-          "name": "SDCTLLL1-SLL78"
-        }, {"id": "SBU78", "name": "SDIT1BUB-SBU78"}, {"id": "ATL2", "name": "ATLNGANW-ATL2"}, {
-          "id": "BOT1",
-          "name": "BOTHWAKY-BOT1"
-        }, {"id": "SNG1", "name": "SNGPSIAU-SNG1"}, {"id": "NYC1", "name": "NYCMNY54-NYC1"}, {
-          "id": "LAG1b",
-          "name": "LARGIZON-LAG1b"
-        }, {"id": "AMD15", "name": "AMDFAA01-AMD15"}, {"id": "SNA1", "name": "SNANTXCA-SNA1"}, {
-          "id": "PLT1",
-          "name": "PLTNCA60-PLT1"
-        }, {"id": "TLP1", "name": "TLPNXM18-TLP1"}, {"id": "SDD81", "name": "SAIT1DD6-SDD81"}, {
-          "id": "DCC1",
-          "name": "POIUYTGH-DCC1"
-        }, {"id": "DCC2", "name": "POIUYTGH-DCC2"}, {"id": "OKC1", "name": "OKCBOK55-OKC1"}, {
-          "id": "PAR1",
-          "name": "PARSFRCG-PAR1"
-        }, {"id": "TES36", "name": "ABCEETES-TES36"}, {"id": "COM1", "name": "PLMKOPIU-COM1"}, {
-          "id": "ANI1",
-          "name": "ATLNGTRE-ANI1"
-        }, {"id": "SDG78", "name": "SDIT1BDG-SDG78"}, {"id": "mac20", "name": "PKGTESTF-mac20"}, {
-          "id": "DSF45",
-          "name": "DSFBG123-DSF45"
-        }, {"id": "HST25", "name": "HSTNTX01-HST25"}, {"id": "AMD18", "name": "AUDIMA01-AMD18"}, {
-          "id": "SAA80",
-          "name": "SAIT9AA3-SAA80"
-        }, {"id": "SSA56", "name": "SSIT2AA7-SSA56"}, {"id": "SDD82", "name": "SAIT1DD9-SDD82"}, {
-          "id": "JCV1",
-          "name": "JCVLFLBW-JCV1"
-        }, {"id": "SUL2", "name": "WERTYUJK-SUL2"}, {"id": "PUR1", "name": "purelyde-PUR1"}, {
-          "id": "FDE55",
-          "name": "FDERT555-FDE55"
-        }, {"id": "SITE", "name": "LONEENCO-SITE"}, {"id": "ATL1", "name": "ATLNGAMA-ATL1"}, {
-          "id": "JUL1",
-          "name": "ZXCVBNMM-JUL1"
-        }, {"id": "TAT34", "name": "TESAAISB-TAT34"}, {"id": "XCP12", "name": "CHKGH123-XCP12"}, {
-          "id": "RAI1",
-          "name": "poiuytre-RAI1"
-        }, {"id": "HPO1", "name": "ATLNGAUP-HPO1"}, {"id": "KJF12", "name": "KJFDH123-KJF12"}, {
-          "id": "SCC80",
-          "name": "SAIT9CC3-SCC80"
-        }, {"id": "SAA12", "name": "SAIT9AF8-SAA12"}, {"id": "SAA14", "name": "SAIT1AA9-SAA14"}, {
-          "id": "ATL35",
-          "name": "TTESSAAI-ATL35"
-        }, {"id": "CWY1", "name": "CWYMOWBS-CWY1"}, {"id": "ATL76", "name": "TELEPAAI-ATL76"}, {
-          "id": "DSL12",
-          "name": "DSLFK242-DSL12"
-        }, {"id": "ATL53", "name": "AAIATLTE-ATL53"}, {"id": "SAA11", "name": "SAIT9AA2-SAA11"}, {
-          "id": "ATL62",
-          "name": "TESSASCH-ATL62"
-        }, {"id": "AUG1", "name": "ASDFGHJK-AUG1"}, {"id": "POI22", "name": "POIUY123-POI22"}, {
-          "id": "SAA13",
-          "name": "SAIT1AA9-SAA13"
-        }, {"id": "BHY17", "name": "BHYTFRF3-BHY17"}, {"id": "LIS1", "name": "HOSTPROF-LIS1"}, {
-          "id": "SIP1",
-          "name": "ZXCVBNMK-SIP1"
-        }, {"id": "ATL99", "name": "TEESTAAI-ATL43"}, {"id": "ATL64", "name": "FORLOAAJ-ATL64"}, {
-          "id": "TAT33",
-          "name": "TESAAISA-TAT33"
-        }, {"id": "RAD10", "name": "INDIPUNE-RAD10"}, {"id": "RTW5", "name": "BHYTFRY4-RTW5"}, {
-          "id": "JGS1",
-          "name": "KSJKKKKK-JGS1"
-        }, {"id": "ATL98", "name": "TEESTAAI-ATL43"}, {"id": "WAN1", "name": "LEIWANGW-WAN1"}, {
-          "id": "ATL44",
-          "name": "ATLSANAB-ATL44"
-        }, {"id": "RTD2", "name": "BHYTFRk4-RTD2"}, {"id": "NIR1", "name": "ORFLMANA-NIR1"}, {
-          "id": "ATL75",
-          "name": "SANAAIRE-ATL75"
-        }, {"id": "NUM1", "name": "QWERTYUI-NUM1"}, {"id": "hvf32", "name": "MDTWNJ21-hvf32"}, {
-          "id": "RTZ4",
-          "name": "BHYTFRZ6-RTZ4"
-        }, {"id": "ATL56", "name": "ATLSANAC-ATL56"}, {"id": "AMS1", "name": "AMSTNLBW-AMS1"}, {
-          "id": "RCT1",
-          "name": "AMSTERNL-RCT1"
-        }, {"id": "JAN1", "name": "ORFLMATT-JAN1"}, {"id": "ABC14", "name": "TESAAISA-ABC14"}, {
-          "id": "TAT37",
-          "name": "TESAAISD-TAT37"
-        }, {"id": "MIC54", "name": "MICHIGAN-MIC54"}, {"id": "ABC11", "name": "ATLSANAI-ABC11"}, {
-          "id": "AMF11",
-          "name": "AMDOCS01-AMF11"
-        }, {"id": "ATL63", "name": "ATLSANEW-ATL63"}, {"id": "ABC12", "name": "ATLSECIA-ABC12"}, {
-          "id": "hvf20",
-          "name": "MDTWNJ21-hvf20"
-        }, {"id": "ABC15", "name": "AAITESAN-ABC15"}, {"id": "AVT1", "name": "AVTRFLHD-AVT1"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
index 3ca3c05..5b5acd3 100644 (file)
@@ -1827,104 +1827,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-              "name": "AIN Web Tool-15-D-STTest2",
-              "isPermitted": true
-            }, {
-              "id": "1178612d2b394be4834ad77f567c0af2",
-              "name": "AIN Web Tool-15-D-SSPtestcustome",
-              "isPermitted": true
-            }, {
-              "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-              "name": "AIN Web Tool-15-D-UncheckedEcopm",
-              "isPermitted": true
-            }, {
-              "id": "de007636e25249238447264a988a927b",
-              "name": "AIN Web Tool-15-D-dfsdf",
-              "isPermitted": true
-            }, {
-              "id": "62f29b3613634ca6a3065cbe0e020c44",
-              "name": "AIN/SMS-16-D-Multiservices1",
-              "isPermitted": true
-            }, {
-              "id": "649289e30d3244e0b48098114d63c2aa",
-              "name": "AIN Web Tool-15-D-SSPST66",
-              "isPermitted": true
-            }, {
-              "id": "3f21eeea6c2c486bba31dab816c05a32",
-              "name": "AIN Web Tool-15-D-ASSPST47",
-              "isPermitted": true
-            }, {
-              "id": "f60ce21d3ee6427586cff0d22b03b773",
-              "name": "CESAR-100-D-sspjg67246",
-              "isPermitted": true
-            }, {
-              "id": "8774659e425f479895ae091bb5d46560",
-              "name": "CESAR-100-D-sspjg68359",
-              "isPermitted": true
-            }, {
-              "id": "624eb554b0d147c19ff8885341760481",
-              "name": "AINWebTool-15-D-iftach",
-              "isPermitted": true
-            }, {
-              "id": "214f55f5fc414c678059c383b03e4962",
-              "name": "CESAR-100-D-sspjg612401",
-              "isPermitted": true
-            }, {
-              "id": "c90666c291664841bb98e4d981ff1db5",
-              "name": "CESAR-100-D-sspjg621340",
-              "isPermitted": true
-            }, {
-              "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-              "name": "sspjg621351cloned",
-              "isPermitted": true
-            }, {
-              "id": "b386b768a3f24c8e953abbe0b3488c02",
-              "name": "AINWebTool-15-D-eteancomp",
-              "isPermitted": true
-            }, {
-              "id": "dc6c4dbfd225474e9deaadd34968646c",
-              "name": "AINWebTool-15-T-SPFET",
-              "isPermitted": true
-            }, {
-              "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-              "name": "AINWebTool-15-X-eeweww",
-              "isPermitted": true
-            }, {
-              "id": "f2f3830e4c984d45bcd00e1a04158a79",
-              "name": "CESAR-100-D-spjg61909",
-              "isPermitted": true
-            }, {
-              "id": "05b91bd5137f4929878edd965755c06d",
-              "name": "CESAR-100-D-sspjg621512cloned",
-              "isPermitted": true
-            }, {
-              "id": "7002fbe8482d4a989ddf445b1ce336e0",
-              "name": "AINWebTool-15-X-vdr",
-              "isPermitted": true
-            }, {
-              "id": "4008522be43741dcb1f5422022a2aa0b",
-              "name": "AINWebTool-15-D-ssasa",
-              "isPermitted": true
-            }, {
-              "id": "f44e2e96a1b6476abfda2fa407b00169",
-              "name": "AINWebTool-15-D-PFNPT",
-              "isPermitted": true
-            }, {
-              "id": "b69a52bec8a84669a37a1e8b72708be7",
-              "name": "AINWebTool-15-X-vdre",
-              "isPermitted": true
-            }, {
-              "id": "fac7d9fd56154caeb9332202dcf2969f",
-              "name": "AINWebTool-15-X-NONPODECOMP",
-              "isPermitted": true
-            }, {
-              "id": "2d34d8396e194eb49969fd61ffbff961",
-              "name": "DN5242-Nov16-T5",
-              "isPermitted": true
-            }, {
-              "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-              "name": "ro-T11",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -2045,199 +1949,28 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
-          "id": "YYY1",
-          "name": "UUUAIAAI-YYY1"
-        }, {"id": "BAN1", "name": "VSDKYUTP-BAN1"}, {"id": "DKJ1", "name": "DKJSJDKA-DKJ1"}, {
-          "id": "MCS1",
-          "name": "ASACMAMS-MCS1"
-        }, {"id": "UIO1", "name": "uioclli1-UIO1"}, {"id": "RAJ1", "name": "YGBIJNLQ-RAJ1"}, {
-          "id": "OPA1",
-          "name": "opaclli1-OPA1"
-        }, {"id": "SDE1", "name": "ZXCVBNMA-SDE1"}, {"id": "VEN2", "name": "FGHJUHIL-VEN2"}, {
-          "id": "ORL1",
-          "name": "ORLDFLMA-ORL1"
-        }, {"id": "JAD1", "name": "JADECLLI-JAD1"}, {"id": "ZXL1", "name": "LWLWCANN-ZXL1"}, {
-          "id": "CKL1",
-          "name": "CLKSKCKK-CKL1"
-        }, {"id": "SDF1", "name": "sdfclli1-SDF1"}, {"id": "RAD1", "name": "RADICAL1-RAD1"}, {
-          "id": "KIT1",
-          "name": "BHYJFGLN-KIT1"
-        }, {"id": "REL1", "name": "INGERFGT-REL1"}, {"id": "JNL1", "name": "CJALSDAC-JNL1"}, {
-          "id": "OLK1",
-          "name": "OLKOLKLS-OLK1"
-        }, {"id": "CHI1", "name": "CHILLIWE-CHI1"}, {"id": "UUU4", "name": "UUUAAAUU-UUU4"}, {
-          "id": "TUF1",
-          "name": "TUFCLLI1-TUF1"
-        }, {"id": "KJN1", "name": "CKALDKSA-KJN1"}, {"id": "SAM1", "name": "SNDGCA64-SAN1"}, {
-          "id": "SCK1",
-          "name": "SCKSCKSK-SCK1"
-        }, {"id": "HJH1", "name": "AOEEQQQD-HJH1"}, {"id": "HGD1", "name": "SDFQWHGD-HGD1"}, {
-          "id": "KOR1",
-          "name": "HYFLNBVT-KOR1"
-        }, {"id": "ATL43", "name": "AICLOCID-ATL43"}, {"id": "ATL54", "name": "AICFTAAI-ATL54"}, {
-          "id": "ATL66",
-          "name": "CLLIAAII-ATL66"
-        }, {"id": "VEL1", "name": "BNMLKUIK-VEL1"}, {"id": "ICC1", "name": "SANJITAT-ICC1"}, {
-          "id": "MNT11",
-          "name": "WSXEFBTH-MNT11"
-        }, {"id": "DEF2", "name": "WSBHGTYL-DEF2"}, {"id": "MAD11", "name": "SDFQWGKL-MAD11"}, {
-          "id": "OLG1",
-          "name": "OLHOLHOL-OLG1"
-        }, {"id": "GAR1", "name": "NGFVSJKO-GAR1"}, {"id": "SAN22", "name": "GNVLSCTL-SAN22"}, {
-          "id": "HRG1",
-          "name": "HRGHRGGS-HRG1"
-        }, {"id": "JCS1", "name": "JCSJSCJS-JCS1"}, {"id": "DHA12", "name": "WSXEDECF-DHA12"}, {
-          "id": "HJE1",
-          "name": "AOEEWWWD-HJE1"
-        }, {"id": "NCA1", "name": "NCANCANN-NCA1"}, {"id": "IOP1", "name": "iopclli1-IOP1"}, {
-          "id": "RTY1",
-          "name": "rtyclli1-RTY1"
-        }, {"id": "KAP1", "name": "HIOUYTRQ-KAP1"}, {"id": "ZEN1", "name": "ZENCLLI1-ZEN1"}, {
-          "id": "HKA1",
-          "name": "JAKHLASS-HKA1"
-        }, {"id": "CQK1", "name": "CQKSCAKK-CQK1"}, {"id": "SAI1", "name": "UBEKQLPD-SAI1"}, {
-          "id": "ERT1",
-          "name": "ertclli1-ERT1"
-        }, {"id": "IBB1", "name": "PLMKOIJU-IBB1"}, {"id": "TIR2", "name": "PLKINHYI-TIR2"}, {
-          "id": "HSD1",
-          "name": "CHASKCDS-HSD1"
-        }, {"id": "SLF78", "name": "SDCTLFN1-SLF78"}, {"id": "SEE78", "name": "SDCTEEE4-SEE78"}, {
-          "id": "SAN13",
-          "name": "TOKYJPFA-SAN13"
-        }, {"id": "SAA78", "name": "SDCTAAA1-SAA78"}, {"id": "LUC1", "name": "ATLDFGYC-LUC1"}, {
-          "id": "AMD13",
-          "name": "MEMATLAN-AMD13"
-        }, {"id": "TOR1", "name": "TOROONXN-TOR1"}, {"id": "QWE1", "name": "QWECLLI1-QWE1"}, {
-          "id": "ZOG1",
-          "name": "ZOGASTRO-ZOG1"
-        }, {"id": "CAL33", "name": "CALIFORN-CAL33"}, {"id": "SHH78", "name": "SDIT1HHH-SHH78"}, {
-          "id": "DSA1",
-          "name": "LKJHGFDS-DSA1"
-        }, {"id": "CLG1", "name": "CLGRABAD-CLG1"}, {"id": "BNA1", "name": "BNARAGBK-BNA1"}, {
-          "id": "ATL84",
-          "name": "CANTTCOC-ATL84"
-        }, {"id": "APP1", "name": "WBHGTYUI-APP1"}, {"id": "RJN1", "name": "RJNRBZAW-RJN1"}, {
-          "id": "EHH78",
-          "name": "SDCSHHH5-EHH78"
-        }, {"id": "mac10", "name": "PKGTESTF-mac10"}, {"id": "SXB78", "name": "SDCTGXB1-SXB78"}, {
-          "id": "SAX78",
-          "name": "SDCTAXG1-SAX78"
-        }, {"id": "SYD1", "name": "SYDNAUBV-SYD1"}, {"id": "TOK1", "name": "TOKYJPFA-TOK1"}, {
-          "id": "KGM2",
-          "name": "KGMTNC20-KGM2"
-        }, {"id": "DCC1b", "name": "POIUYTGH-DCC1b"}, {"id": "SKK78", "name": "SDCTKKK1-SKK78"}, {
-          "id": "SGG78",
-          "name": "SDCTGGG1-SGG78"
-        }, {"id": "SJJ78", "name": "SDCTJJJ1-SJJ78"}, {"id": "SBX78", "name": "SDCTBXG1-SBX78"}, {
-          "id": "LAG1",
-          "name": "LARGIZON-LAG1"
-        }, {"id": "IAA1", "name": "QAZXSWED-IAA1"}, {"id": "POI1", "name": "PLMNJKIU-POI1"}, {
-          "id": "LAG1a",
-          "name": "LARGIZON-LAG1a"
-        }, {"id": "PBL1", "name": "PBLAPBAI-PBL1"}, {"id": "LAG45", "name": "LARGIZON-LAG1a"}, {
-          "id": "MAR1",
-          "name": "MNBVCXZM-MAR1"
-        }, {"id": "HST70", "name": "HSTNTX70-HST70"}, {"id": "DCC1a", "name": "POIUYTGH-DCC1a"}, {
-          "id": "TOL1",
-          "name": "TOLDOH21-TOL1"
-        }, {"id": "LON1", "name": "LONEENCO-LON1"}, {"id": "SJU78", "name": "SDIT1JUB-SJU78"}, {
-          "id": "STN27",
-          "name": "HSTNTX01-STN27"
-        }, {"id": "SSW56", "name": "ss8126GT-SSW56"}, {"id": "SBB78", "name": "SDIT1BBB-SBB78"}, {
-          "id": "DCC3",
-          "name": "POIUYTGH-DCC3"
-        }, {"id": "GNV1", "name": "GNVLSCTL-GNV1"}, {"id": "WAS1", "name": "WASHDCSW-WAS1"}, {
-          "id": "TOY1",
-          "name": "TORYONNZ-TOY1"
-        }, {"id": "STT1", "name": "STTLWA02-STT1"}, {"id": "STG1", "name": "STTGGE62-STG1"}, {
-          "id": "SLL78",
-          "name": "SDCTLLL1-SLL78"
-        }, {"id": "SBU78", "name": "SDIT1BUB-SBU78"}, {"id": "ATL2", "name": "ATLNGANW-ATL2"}, {
-          "id": "BOT1",
-          "name": "BOTHWAKY-BOT1"
-        }, {"id": "SNG1", "name": "SNGPSIAU-SNG1"}, {"id": "NYC1", "name": "NYCMNY54-NYC1"}, {
-          "id": "LAG1b",
-          "name": "LARGIZON-LAG1b"
-        }, {"id": "AMD15", "name": "AMDFAA01-AMD15"}, {"id": "SNA1", "name": "SNANTXCA-SNA1"}, {
-          "id": "PLT1",
-          "name": "PLTNCA60-PLT1"
-        }, {"id": "TLP1", "name": "TLPNXM18-TLP1"}, {"id": "SDD81", "name": "SAIT1DD6-SDD81"}, {
-          "id": "DCC1",
-          "name": "POIUYTGH-DCC1"
-        }, {"id": "DCC2", "name": "POIUYTGH-DCC2"}, {"id": "OKC1", "name": "OKCBOK55-OKC1"}, {
-          "id": "PAR1",
-          "name": "PARSFRCG-PAR1"
-        }, {"id": "TES36", "name": "ABCEETES-TES36"}, {"id": "COM1", "name": "PLMKOPIU-COM1"}, {
-          "id": "ANI1",
-          "name": "ATLNGTRE-ANI1"
-        }, {"id": "SDG78", "name": "SDIT1BDG-SDG78"}, {"id": "mac20", "name": "PKGTESTF-mac20"}, {
-          "id": "DSF45",
-          "name": "DSFBG123-DSF45"
-        }, {"id": "HST25", "name": "HSTNTX01-HST25"}, {"id": "AMD18", "name": "AUDIMA01-AMD18"}, {
-          "id": "SAA80",
-          "name": "SAIT9AA3-SAA80"
-        }, {"id": "SSA56", "name": "SSIT2AA7-SSA56"}, {"id": "SDD82", "name": "SAIT1DD9-SDD82"}, {
-          "id": "JCV1",
-          "name": "JCVLFLBW-JCV1"
-        }, {"id": "SUL2", "name": "WERTYUJK-SUL2"}, {"id": "PUR1", "name": "purelyde-PUR1"}, {
-          "id": "FDE55",
-          "name": "FDERT555-FDE55"
-        }, {"id": "SITE", "name": "LONEENCO-SITE"}, {"id": "ATL1", "name": "ATLNGAMA-ATL1"}, {
-          "id": "JUL1",
-          "name": "ZXCVBNMM-JUL1"
-        }, {"id": "TAT34", "name": "TESAAISB-TAT34"}, {"id": "XCP12", "name": "CHKGH123-XCP12"}, {
-          "id": "RAI1",
-          "name": "poiuytre-RAI1"
-        }, {"id": "HPO1", "name": "ATLNGAUP-HPO1"}, {"id": "KJF12", "name": "KJFDH123-KJF12"}, {
-          "id": "SCC80",
-          "name": "SAIT9CC3-SCC80"
-        }, {"id": "SAA12", "name": "SAIT9AF8-SAA12"}, {"id": "SAA14", "name": "SAIT1AA9-SAA14"}, {
-          "id": "ATL35",
-          "name": "TTESSAAI-ATL35"
-        }, {"id": "CWY1", "name": "CWYMOWBS-CWY1"}, {"id": "ATL76", "name": "TELEPAAI-ATL76"}, {
-          "id": "DSL12",
-          "name": "DSLFK242-DSL12"
-        }, {"id": "ATL53", "name": "AAIATLTE-ATL53"}, {"id": "SAA11", "name": "SAIT9AA2-SAA11"}, {
-          "id": "ATL62",
-          "name": "TESSASCH-ATL62"
-        }, {"id": "AUG1", "name": "ASDFGHJK-AUG1"}, {"id": "POI22", "name": "POIUY123-POI22"}, {
-          "id": "SAA13",
-          "name": "SAIT1AA9-SAA13"
-        }, {"id": "BHY17", "name": "BHYTFRF3-BHY17"}, {"id": "LIS1", "name": "HOSTPROF-LIS1"}, {
-          "id": "SIP1",
-          "name": "ZXCVBNMK-SIP1"
-        }, {"id": "ATL99", "name": "TEESTAAI-ATL43"}, {"id": "ATL64", "name": "FORLOAAJ-ATL64"}, {
-          "id": "TAT33",
-          "name": "TESAAISA-TAT33"
-        }, {"id": "RAD10", "name": "INDIPUNE-RAD10"}, {"id": "RTW5", "name": "BHYTFRY4-RTW5"}, {
-          "id": "JGS1",
-          "name": "KSJKKKKK-JGS1"
-        }, {"id": "ATL98", "name": "TEESTAAI-ATL43"}, {"id": "WAN1", "name": "LEIWANGW-WAN1"}, {
-          "id": "ATL44",
-          "name": "ATLSANAB-ATL44"
-        }, {"id": "RTD2", "name": "BHYTFRk4-RTD2"}, {"id": "NIR1", "name": "ORFLMANA-NIR1"}, {
-          "id": "ATL75",
-          "name": "SANAAIRE-ATL75"
-        }, {"id": "NUM1", "name": "QWERTYUI-NUM1"}, {"id": "hvf32", "name": "MDTWNJ21-hvf32"}, {
-          "id": "RTZ4",
-          "name": "BHYTFRZ6-RTZ4"
-        }, {"id": "ATL56", "name": "ATLSANAC-ATL56"}, {"id": "AMS1", "name": "AMSTNLBW-AMS1"}, {
-          "id": "RCT1",
-          "name": "AMSTERNL-RCT1"
-        }, {"id": "JAN1", "name": "ORFLMATT-JAN1"}, {"id": "ABC14", "name": "TESAAISA-ABC14"}, {
-          "id": "TAT37",
-          "name": "TESAAISD-TAT37"
-        }, {"id": "MIC54", "name": "MICHIGAN-MIC54"}, {"id": "ABC11", "name": "ATLSANAI-ABC11"}, {
-          "id": "AMF11",
-          "name": "AMDOCS01-AMF11"
-        }, {"id": "ATL63", "name": "ATLSANEW-ATL63"}, {"id": "ABC12", "name": "ATLSECIA-ABC12"}, {
-          "id": "hvf20",
-          "name": "MDTWNJ21-hvf20"
-        }, {"id": "ABC15", "name": "AAITESAN-ABC15"}, {"id": "AVT1", "name": "AVTRFLHD-AVT1"}, {
-          "id": "ATL34",
-          "name": "ATLSANAI-ATL34"
-        }],
+        "aicZones": [
+          {
+            "id": "NFT1",
+            "name": "NFTJSSSS-NFT1"
+          },
+          {
+            "id": "JAG1",
+            "name": "YUDFJULP-JAG1"
+          },
+          {
+            "id": "YYY1",
+            "name": "UUUAIAAI-YYY1"
+          },
+          {
+            "id": "AVT1",
+            "name": "AVTRFLHD-AVT1"
+          },
+          {
+            "id": "ATL34",
+            "name": "ATLSANAI-ATL34"
+          }
+        ],
         "categoryParameters": {
           "owningEntityList": [{
             "id": "aaa1",
index 24bbac5..5b27b6e 100644 (file)
@@ -1762,104 +1762,8 @@ class MockReduxStore<T> {
               "name": "AIN Web Tool-15-D-testalexandria",
               "isPermitted": true
             }, {
-              "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-              "name": "AIN Web Tool-15-D-STTest2",
-              "isPermitted": true
-            }, {
-              "id": "1178612d2b394be4834ad77f567c0af2",
-              "name": "AIN Web Tool-15-D-SSPtestcustome",
-              "isPermitted": true
-            }, {
-              "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-              "name": "AIN Web Tool-15-D-UncheckedEcopm",
-              "isPermitted": true
-            }, {
-              "id": "de007636e25249238447264a988a927b",
-              "name": "AIN Web Tool-15-D-dfsdf",
-              "isPermitted": true
-            }, {
-              "id": "62f29b3613634ca6a3065cbe0e020c44",
-              "name": "AIN/SMS-16-D-Multiservices1",
-              "isPermitted": true
-            }, {
-              "id": "649289e30d3244e0b48098114d63c2aa",
-              "name": "AIN Web Tool-15-D-SSPST66",
-              "isPermitted": true
-            }, {
-              "id": "3f21eeea6c2c486bba31dab816c05a32",
-              "name": "AIN Web Tool-15-D-ASSPST47",
-              "isPermitted": true
-            }, {
-              "id": "f60ce21d3ee6427586cff0d22b03b773",
-              "name": "CESAR-100-D-sspjg67246",
-              "isPermitted": true
-            }, {
-              "id": "8774659e425f479895ae091bb5d46560",
-              "name": "CESAR-100-D-sspjg68359",
-              "isPermitted": true
-            }, {
-              "id": "624eb554b0d147c19ff8885341760481",
-              "name": "AINWebTool-15-D-iftach",
-              "isPermitted": true
-            }, {
-              "id": "214f55f5fc414c678059c383b03e4962",
-              "name": "CESAR-100-D-sspjg612401",
-              "isPermitted": true
-            }, {
-              "id": "c90666c291664841bb98e4d981ff1db5",
-              "name": "CESAR-100-D-sspjg621340",
-              "isPermitted": true
-            }, {
-              "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-              "name": "sspjg621351cloned",
-              "isPermitted": true
-            }, {
-              "id": "b386b768a3f24c8e953abbe0b3488c02",
-              "name": "AINWebTool-15-D-eteancomp",
-              "isPermitted": true
-            }, {
-              "id": "dc6c4dbfd225474e9deaadd34968646c",
-              "name": "AINWebTool-15-T-SPFET",
-              "isPermitted": true
-            }, {
-              "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-              "name": "AINWebTool-15-X-eeweww",
-              "isPermitted": true
-            }, {
-              "id": "f2f3830e4c984d45bcd00e1a04158a79",
-              "name": "CESAR-100-D-spjg61909",
-              "isPermitted": true
-            }, {
-              "id": "05b91bd5137f4929878edd965755c06d",
-              "name": "CESAR-100-D-sspjg621512cloned",
-              "isPermitted": true
-            }, {
-              "id": "7002fbe8482d4a989ddf445b1ce336e0",
-              "name": "AINWebTool-15-X-vdr",
-              "isPermitted": true
-            }, {
-              "id": "4008522be43741dcb1f5422022a2aa0b",
-              "name": "AINWebTool-15-D-ssasa",
-              "isPermitted": true
-            }, {
-              "id": "f44e2e96a1b6476abfda2fa407b00169",
-              "name": "AINWebTool-15-D-PFNPT",
-              "isPermitted": true
-            }, {
-              "id": "b69a52bec8a84669a37a1e8b72708be7",
-              "name": "AINWebTool-15-X-vdre",
-              "isPermitted": true
-            }, {
-              "id": "fac7d9fd56154caeb9332202dcf2969f",
-              "name": "AINWebTool-15-X-NONPODECOMP",
-              "isPermitted": true
-            }, {
-              "id": "2d34d8396e194eb49969fd61ffbff961",
-              "name": "DN5242-Nov16-T5",
-              "isPermitted": true
-            }, {
-              "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-              "name": "ro-T11",
+              "id": "d0a3e3f2964542259d155a81c41aadc3",
+              "name": "test-hvf6-09",
               "isPermitted": true
             }, {
               "id": "fa45ca53c80b492fa8be5477cd84fc2b",
@@ -1980,196 +1884,19 @@ class MockReduxStore<T> {
             "isPermitted": false
           }]
         },
-        "aicZones": [{"id": "NFT1", "name": "NFTJSSSS-NFT1"}, {"id": "JAG1", "name": "YUDFJULP-JAG1"}, {
+        "aicZones": [{
+          "id": "NFT1",
+          "name": "NFTJSSSS-NFT1"
+        }, {
+          "id": "JAG1",
+          "name": "YUDFJULP-JAG1"
+        }, {
           "id": "YYY1",
           "name": "UUUAIAAI-YYY1"
-        }, {"id": "BAN1", "name": "VSDKYUTP-BAN1"}, {"id": "DKJ1", "name": "DKJSJDKA-DKJ1"}, {
-          "id": "MCS1",
-          "name": "ASACMAMS-MCS1"
-        }, {"id": "UIO1", "name": "uioclli1-UIO1"}, {"id": "RAJ1", "name": "YGBIJNLQ-RAJ1"}, {
-          "id": "OPA1",
-          "name": "opaclli1-OPA1"
-        }, {"id": "SDE1", "name": "ZXCVBNMA-SDE1"}, {"id": "VEN2", "name": "FGHJUHIL-VEN2"}, {
-          "id": "ORL1",
-          "name": "ORLDFLMA-ORL1"
-        }, {"id": "JAD1", "name": "JADECLLI-JAD1"}, {"id": "ZXL1", "name": "LWLWCANN-ZXL1"}, {
-          "id": "CKL1",
-          "name": "CLKSKCKK-CKL1"
-        }, {"id": "SDF1", "name": "sdfclli1-SDF1"}, {"id": "RAD1", "name": "RADICAL1-RAD1"}, {
-          "id": "KIT1",
-          "name": "BHYJFGLN-KIT1"
-        }, {"id": "REL1", "name": "INGERFGT-REL1"}, {"id": "JNL1", "name": "CJALSDAC-JNL1"}, {
-          "id": "OLK1",
-          "name": "OLKOLKLS-OLK1"
-        }, {"id": "CHI1", "name": "CHILLIWE-CHI1"}, {"id": "UUU4", "name": "UUUAAAUU-UUU4"}, {
-          "id": "TUF1",
-          "name": "TUFCLLI1-TUF1"
-        }, {"id": "KJN1", "name": "CKALDKSA-KJN1"}, {"id": "SAM1", "name": "SNDGCA64-SAN1"}, {
-          "id": "SCK1",
-          "name": "SCKSCKSK-SCK1"
-        }, {"id": "HJH1", "name": "AOEEQQQD-HJH1"}, {"id": "HGD1", "name": "SDFQWHGD-HGD1"}, {
-          "id": "KOR1",
-          "name": "HYFLNBVT-KOR1"
-        }, {"id": "ATL43", "name": "AICLOCID-ATL43"}, {"id": "ATL54", "name": "AICFTAAI-ATL54"}, {
-          "id": "ATL66",
-          "name": "CLLIAAII-ATL66"
-        }, {"id": "VEL1", "name": "BNMLKUIK-VEL1"}, {"id": "ICC1", "name": "SANJITAT-ICC1"}, {
-          "id": "MNT11",
-          "name": "WSXEFBTH-MNT11"
-        }, {"id": "DEF2", "name": "WSBHGTYL-DEF2"}, {"id": "MAD11", "name": "SDFQWGKL-MAD11"}, {
-          "id": "OLG1",
-          "name": "OLHOLHOL-OLG1"
-        }, {"id": "GAR1", "name": "NGFVSJKO-GAR1"}, {"id": "SAN22", "name": "GNVLSCTL-SAN22"}, {
-          "id": "HRG1",
-          "name": "HRGHRGGS-HRG1"
-        }, {"id": "JCS1", "name": "JCSJSCJS-JCS1"}, {"id": "DHA12", "name": "WSXEDECF-DHA12"}, {
-          "id": "HJE1",
-          "name": "AOEEWWWD-HJE1"
-        }, {"id": "NCA1", "name": "NCANCANN-NCA1"}, {"id": "IOP1", "name": "iopclli1-IOP1"}, {
-          "id": "RTY1",
-          "name": "rtyclli1-RTY1"
-        }, {"id": "KAP1", "name": "HIOUYTRQ-KAP1"}, {"id": "ZEN1", "name": "ZENCLLI1-ZEN1"}, {
-          "id": "HKA1",
-          "name": "JAKHLASS-HKA1"
-        }, {"id": "CQK1", "name": "CQKSCAKK-CQK1"}, {"id": "SAI1", "name": "UBEKQLPD-SAI1"}, {
-          "id": "ERT1",
-          "name": "ertclli1-ERT1"
-        }, {"id": "IBB1", "name": "PLMKOIJU-IBB1"}, {"id": "TIR2", "name": "PLKINHYI-TIR2"}, {
-          "id": "HSD1",
-          "name": "CHASKCDS-HSD1"
-        }, {"id": "SLF78", "name": "SDCTLFN1-SLF78"}, {"id": "SEE78", "name": "SDCTEEE4-SEE78"}, {
-          "id": "SAN13",
-          "name": "TOKYJPFA-SAN13"
-        }, {"id": "SAA78", "name": "SDCTAAA1-SAA78"}, {"id": "LUC1", "name": "ATLDFGYC-LUC1"}, {
-          "id": "AMD13",
-          "name": "MEMATLAN-AMD13"
-        }, {"id": "TOR1", "name": "TOROONXN-TOR1"}, {"id": "QWE1", "name": "QWECLLI1-QWE1"}, {
-          "id": "ZOG1",
-          "name": "ZOGASTRO-ZOG1"
-        }, {"id": "CAL33", "name": "CALIFORN-CAL33"}, {"id": "SHH78", "name": "SDIT1HHH-SHH78"}, {
-          "id": "DSA1",
-          "name": "LKJHGFDS-DSA1"
-        }, {"id": "CLG1", "name": "CLGRABAD-CLG1"}, {"id": "BNA1", "name": "BNARAGBK-BNA1"}, {
-          "id": "ATL84",
-          "name": "CANTTCOC-ATL84"
-        }, {"id": "APP1", "name": "WBHGTYUI-APP1"}, {"id": "RJN1", "name": "RJNRBZAW-RJN1"}, {
-          "id": "EHH78",
-          "name": "SDCSHHH5-EHH78"
-        }, {"id": "mac10", "name": "PKGTESTF-mac10"}, {"id": "SXB78", "name": "SDCTGXB1-SXB78"}, {
-          "id": "SAX78",
-          "name": "SDCTAXG1-SAX78"
-        }, {"id": "SYD1", "name": "SYDNAUBV-SYD1"}, {"id": "TOK1", "name": "TOKYJPFA-TOK1"}, {
-          "id": "KGM2",
-          "name": "KGMTNC20-KGM2"
-        }, {"id": "DCC1b", "name": "POIUYTGH-DCC1b"}, {"id": "SKK78", "name": "SDCTKKK1-SKK78"}, {
-          "id": "SGG78",
-          "name": "SDCTGGG1-SGG78"
-        }, {"id": "SJJ78", "name": "SDCTJJJ1-SJJ78"}, {"id": "SBX78", "name": "SDCTBXG1-SBX78"}, {
-          "id": "LAG1",
-          "name": "LARGIZON-LAG1"
-        }, {"id": "IAA1", "name": "QAZXSWED-IAA1"}, {"id": "POI1", "name": "PLMNJKIU-POI1"}, {
-          "id": "LAG1a",
-          "name": "LARGIZON-LAG1a"
-        }, {"id": "PBL1", "name": "PBLAPBAI-PBL1"}, {"id": "LAG45", "name": "LARGIZON-LAG1a"}, {
-          "id": "MAR1",
-          "name": "MNBVCXZM-MAR1"
-        }, {"id": "HST70", "name": "HSTNTX70-HST70"}, {"id": "DCC1a", "name": "POIUYTGH-DCC1a"}, {
-          "id": "TOL1",
-          "name": "TOLDOH21-TOL1"
-        }, {"id": "LON1", "name": "LONEENCO-LON1"}, {"id": "SJU78", "name": "SDIT1JUB-SJU78"}, {
-          "id": "STN27",
-          "name": "HSTNTX01-STN27"
-        }, {"id": "SSW56", "name": "ss8126GT-SSW56"}, {"id": "SBB78", "name": "SDIT1BBB-SBB78"}, {
-          "id": "DCC3",
-          "name": "POIUYTGH-DCC3"
-        }, {"id": "GNV1", "name": "GNVLSCTL-GNV1"}, {"id": "WAS1", "name": "WASHDCSW-WAS1"}, {
-          "id": "TOY1",
-          "name": "TORYONNZ-TOY1"
-        }, {"id": "STT1", "name": "STTLWA02-STT1"}, {"id": "STG1", "name": "STTGGE62-STG1"}, {
-          "id": "SLL78",
-          "name": "SDCTLLL1-SLL78"
-        }, {"id": "SBU78", "name": "SDIT1BUB-SBU78"}, {"id": "ATL2", "name": "ATLNGANW-ATL2"}, {
-          "id": "BOT1",
-          "name": "BOTHWAKY-BOT1"
-        }, {"id": "SNG1", "name": "SNGPSIAU-SNG1"}, {"id": "NYC1", "name": "NYCMNY54-NYC1"}, {
-          "id": "LAG1b",
-          "name": "LARGIZON-LAG1b"
-        }, {"id": "AMD15", "name": "AMDFAA01-AMD15"}, {"id": "SNA1", "name": "SNANTXCA-SNA1"}, {
-          "id": "PLT1",
-          "name": "PLTNCA60-PLT1"
-        }, {"id": "TLP1", "name": "TLPNXM18-TLP1"}, {"id": "SDD81", "name": "SAIT1DD6-SDD81"}, {
-          "id": "DCC1",
-          "name": "POIUYTGH-DCC1"
-        }, {"id": "DCC2", "name": "POIUYTGH-DCC2"}, {"id": "OKC1", "name": "OKCBOK55-OKC1"}, {
-          "id": "PAR1",
-          "name": "PARSFRCG-PAR1"
-        }, {"id": "TES36", "name": "ABCEETES-TES36"}, {"id": "COM1", "name": "PLMKOPIU-COM1"}, {
-          "id": "ANI1",
-          "name": "ATLNGTRE-ANI1"
-        }, {"id": "SDG78", "name": "SDIT1BDG-SDG78"}, {"id": "mac20", "name": "PKGTESTF-mac20"}, {
-          "id": "DSF45",
-          "name": "DSFBG123-DSF45"
-        }, {"id": "HST25", "name": "HSTNTX01-HST25"}, {"id": "AMD18", "name": "AUDIMA01-AMD18"}, {
-          "id": "SAA80",
-          "name": "SAIT9AA3-SAA80"
-        }, {"id": "SSA56", "name": "SSIT2AA7-SSA56"}, {"id": "SDD82", "name": "SAIT1DD9-SDD82"}, {
-          "id": "JCV1",
-          "name": "JCVLFLBW-JCV1"
-        }, {"id": "SUL2", "name": "WERTYUJK-SUL2"}, {"id": "PUR1", "name": "purelyde-PUR1"}, {
-          "id": "FDE55",
-          "name": "FDERT555-FDE55"
-        }, {"id": "SITE", "name": "LONEENCO-SITE"}, {"id": "ATL1", "name": "ATLNGAMA-ATL1"}, {
-          "id": "JUL1",
-          "name": "ZXCVBNMM-JUL1"
-        }, {"id": "TAT34", "name": "TESAAISB-TAT34"}, {"id": "XCP12", "name": "CHKGH123-XCP12"}, {
-          "id": "RAI1",
-          "name": "poiuytre-RAI1"
-        }, {"id": "HPO1", "name": "ATLNGAUP-HPO1"}, {"id": "KJF12", "name": "KJFDH123-KJF12"}, {
-          "id": "SCC80",
-          "name": "SAIT9CC3-SCC80"
-        }, {"id": "SAA12", "name": "SAIT9AF8-SAA12"}, {"id": "SAA14", "name": "SAIT1AA9-SAA14"}, {
-          "id": "ATL35",
-          "name": "TTESSAAI-ATL35"
-        }, {"id": "CWY1", "name": "CWYMOWBS-CWY1"}, {"id": "ATL76", "name": "TELEPAAI-ATL76"}, {
-          "id": "DSL12",
-          "name": "DSLFK242-DSL12"
-        }, {"id": "ATL53", "name": "AAIATLTE-ATL53"}, {"id": "SAA11", "name": "SAIT9AA2-SAA11"}, {
-          "id": "ATL62",
-          "name": "TESSASCH-ATL62"
-        }, {"id": "AUG1", "name": "ASDFGHJK-AUG1"}, {"id": "POI22", "name": "POIUY123-POI22"}, {
-          "id": "SAA13",
-          "name": "SAIT1AA9-SAA13"
-        }, {"id": "BHY17", "name": "BHYTFRF3-BHY17"}, {"id": "LIS1", "name": "HOSTPROF-LIS1"}, {
-          "id": "SIP1",
-          "name": "ZXCVBNMK-SIP1"
-        }, {"id": "ATL99", "name": "TEESTAAI-ATL43"}, {"id": "ATL64", "name": "FORLOAAJ-ATL64"}, {
-          "id": "TAT33",
-          "name": "TESAAISA-TAT33"
-        }, {"id": "RAD10", "name": "INDIPUNE-RAD10"}, {"id": "RTW5", "name": "BHYTFRY4-RTW5"}, {
-          "id": "JGS1",
-          "name": "KSJKKKKK-JGS1"
-        }, {"id": "ATL98", "name": "TEESTAAI-ATL43"}, {"id": "WAN1", "name": "LEIWANGW-WAN1"}, {
-          "id": "ATL44",
-          "name": "ATLSANAB-ATL44"
-        }, {"id": "RTD2", "name": "BHYTFRk4-RTD2"}, {"id": "NIR1", "name": "ORFLMANA-NIR1"}, {
-          "id": "ATL75",
-          "name": "SANAAIRE-ATL75"
-        }, {"id": "NUM1", "name": "QWERTYUI-NUM1"}, {"id": "hvf32", "name": "MDTWNJ21-hvf32"}, {
-          "id": "RTZ4",
-          "name": "BHYTFRZ6-RTZ4"
-        }, {"id": "ATL56", "name": "ATLSANAC-ATL56"}, {"id": "AMS1", "name": "AMSTNLBW-AMS1"}, {
-          "id": "RCT1",
-          "name": "AMSTERNL-RCT1"
-        }, {"id": "JAN1", "name": "ORFLMATT-JAN1"}, {"id": "ABC14", "name": "TESAAISA-ABC14"}, {
-          "id": "TAT37",
-          "name": "TESAAISD-TAT37"
-        }, {"id": "MIC54", "name": "MICHIGAN-MIC54"}, {"id": "ABC11", "name": "ATLSANAI-ABC11"}, {
-          "id": "AMF11",
-          "name": "AMDOCS01-AMF11"
-        }, {"id": "ATL63", "name": "ATLSANEW-ATL63"}, {"id": "ABC12", "name": "ATLSECIA-ABC12"}, {
-          "id": "hvf20",
-          "name": "MDTWNJ21-hvf20"
-        }, {"id": "ABC15", "name": "AAITESAN-ABC15"}, {"id": "AVT1", "name": "AVTRFLHD-AVT1"}, {
+        }, {
+          "id": "AVT1",
+          "name": "AVTRFLHD-AVT1"
+        }, {
           "id": "ATL34",
           "name": "ATLSANAI-ATL34"
         }],
index de7aa4e..6458e4f 100644 (file)
@@ -1844,128 +1844,8 @@ class MockReduxStore<T> {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -2215,754 +2095,6 @@ class MockReduxStore<T> {
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index 00f9790..5397a72 100644 (file)
@@ -1842,128 +1842,8 @@ class MockReduxStore<T> {
                 "isPermitted": true
               },
               {
-                "id": "229bcdc6eaeb4ca59d55221141d01f8e",
-                "name": "AIN Web Tool-15-D-STTest2",
-                "isPermitted": true
-              },
-              {
-                "id": "1178612d2b394be4834ad77f567c0af2",
-                "name": "AIN Web Tool-15-D-SSPtestcustome",
-                "isPermitted": true
-              },
-              {
-                "id": "19c5ade915eb461e8af52fb2fd8cd1f2",
-                "name": "AIN Web Tool-15-D-UncheckedEcopm",
-                "isPermitted": true
-              },
-              {
-                "id": "de007636e25249238447264a988a927b",
-                "name": "AIN Web Tool-15-D-dfsdf",
-                "isPermitted": true
-              },
-              {
-                "id": "62f29b3613634ca6a3065cbe0e020c44",
-                "name": "AIN/SMS-16-D-Multiservices1",
-                "isPermitted": true
-              },
-              {
-                "id": "649289e30d3244e0b48098114d63c2aa",
-                "name": "AIN Web Tool-15-D-SSPST66",
-                "isPermitted": true
-              },
-              {
-                "id": "3f21eeea6c2c486bba31dab816c05a32",
-                "name": "AIN Web Tool-15-D-ASSPST47",
-                "isPermitted": true
-              },
-              {
-                "id": "f60ce21d3ee6427586cff0d22b03b773",
-                "name": "CESAR-100-D-sspjg67246",
-                "isPermitted": true
-              },
-              {
-                "id": "8774659e425f479895ae091bb5d46560",
-                "name": "CESAR-100-D-sspjg68359",
-                "isPermitted": true
-              },
-              {
-                "id": "624eb554b0d147c19ff8885341760481",
-                "name": "AINWebTool-15-D-iftach",
-                "isPermitted": true
-              },
-              {
-                "id": "214f55f5fc414c678059c383b03e4962",
-                "name": "CESAR-100-D-sspjg612401",
-                "isPermitted": true
-              },
-              {
-                "id": "c90666c291664841bb98e4d981ff1db5",
-                "name": "CESAR-100-D-sspjg621340",
-                "isPermitted": true
-              },
-              {
-                "id": "ce5b6bc5c7b348e1bf4b91ac9a174278",
-                "name": "sspjg621351cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "b386b768a3f24c8e953abbe0b3488c02",
-                "name": "AINWebTool-15-D-eteancomp",
-                "isPermitted": true
-              },
-              {
-                "id": "dc6c4dbfd225474e9deaadd34968646c",
-                "name": "AINWebTool-15-T-SPFET",
-                "isPermitted": true
-              },
-              {
-                "id": "02cb5030e9914aa4be120bd9ed1e19eb",
-                "name": "AINWebTool-15-X-eeweww",
-                "isPermitted": true
-              },
-              {
-                "id": "f2f3830e4c984d45bcd00e1a04158a79",
-                "name": "CESAR-100-D-spjg61909",
-                "isPermitted": true
-              },
-              {
-                "id": "05b91bd5137f4929878edd965755c06d",
-                "name": "CESAR-100-D-sspjg621512cloned",
-                "isPermitted": true
-              },
-              {
-                "id": "7002fbe8482d4a989ddf445b1ce336e0",
-                "name": "AINWebTool-15-X-vdr",
-                "isPermitted": true
-              },
-              {
-                "id": "4008522be43741dcb1f5422022a2aa0b",
-                "name": "AINWebTool-15-D-ssasa",
-                "isPermitted": true
-              },
-              {
-                "id": "f44e2e96a1b6476abfda2fa407b00169",
-                "name": "AINWebTool-15-D-PFNPT",
-                "isPermitted": true
-              },
-              {
-                "id": "b69a52bec8a84669a37a1e8b72708be7",
-                "name": "AINWebTool-15-X-vdre",
-                "isPermitted": true
-              },
-              {
-                "id": "fac7d9fd56154caeb9332202dcf2969f",
-                "name": "AINWebTool-15-X-NONPODECOMP",
-                "isPermitted": true
-              },
-              {
-                "id": "2d34d8396e194eb49969fd61ffbff961",
-                "name": "DN5242-Nov16-T5",
-                "isPermitted": true
-              },
-              {
-                "id": "cb42a77ff45b48a8b8deb83bb64acc74",
-                "name": "ro-T11",
+                "id": "d0a3e3f2964542259d155a81c41aadc3",
+                "name": "test-hvf6-09",
                 "isPermitted": true
               },
               {
@@ -2213,754 +2093,6 @@ class MockReduxStore<T> {
             "id": "YYY1",
             "name": "UUUAIAAI-YYY1"
           },
-          {
-            "id": "BAN1",
-            "name": "VSDKYUTP-BAN1"
-          },
-          {
-            "id": "DKJ1",
-            "name": "DKJSJDKA-DKJ1"
-          },
-          {
-            "id": "MCS1",
-            "name": "ASACMAMS-MCS1"
-          },
-          {
-            "id": "UIO1",
-            "name": "uioclli1-UIO1"
-          },
-          {
-            "id": "RAJ1",
-            "name": "YGBIJNLQ-RAJ1"
-          },
-          {
-            "id": "OPA1",
-            "name": "opaclli1-OPA1"
-          },
-          {
-            "id": "SDE1",
-            "name": "ZXCVBNMA-SDE1"
-          },
-          {
-            "id": "VEN2",
-            "name": "FGHJUHIL-VEN2"
-          },
-          {
-            "id": "ORL1",
-            "name": "ORLDFLMA-ORL1"
-          },
-          {
-            "id": "JAD1",
-            "name": "JADECLLI-JAD1"
-          },
-          {
-            "id": "ZXL1",
-            "name": "LWLWCANN-ZXL1"
-          },
-          {
-            "id": "CKL1",
-            "name": "CLKSKCKK-CKL1"
-          },
-          {
-            "id": "SDF1",
-            "name": "sdfclli1-SDF1"
-          },
-          {
-            "id": "RAD1",
-            "name": "RADICAL1-RAD1"
-          },
-          {
-            "id": "KIT1",
-            "name": "BHYJFGLN-KIT1"
-          },
-          {
-            "id": "REL1",
-            "name": "INGERFGT-REL1"
-          },
-          {
-            "id": "JNL1",
-            "name": "CJALSDAC-JNL1"
-          },
-          {
-            "id": "OLK1",
-            "name": "OLKOLKLS-OLK1"
-          },
-          {
-            "id": "CHI1",
-            "name": "CHILLIWE-CHI1"
-          },
-          {
-            "id": "UUU4",
-            "name": "UUUAAAUU-UUU4"
-          },
-          {
-            "id": "TUF1",
-            "name": "TUFCLLI1-TUF1"
-          },
-          {
-            "id": "KJN1",
-            "name": "CKALDKSA-KJN1"
-          },
-          {
-            "id": "SAM1",
-            "name": "SNDGCA64-SAN1"
-          },
-          {
-            "id": "SCK1",
-            "name": "SCKSCKSK-SCK1"
-          },
-          {
-            "id": "HJH1",
-            "name": "AOEEQQQD-HJH1"
-          },
-          {
-            "id": "HGD1",
-            "name": "SDFQWHGD-HGD1"
-          },
-          {
-            "id": "KOR1",
-            "name": "HYFLNBVT-KOR1"
-          },
-          {
-            "id": "ATL43",
-            "name": "AICLOCID-ATL43"
-          },
-          {
-            "id": "ATL54",
-            "name": "AICFTAAI-ATL54"
-          },
-          {
-            "id": "ATL66",
-            "name": "CLLIAAII-ATL66"
-          },
-          {
-            "id": "VEL1",
-            "name": "BNMLKUIK-VEL1"
-          },
-          {
-            "id": "ICC1",
-            "name": "SANJITAT-ICC1"
-          },
-          {
-            "id": "MNT11",
-            "name": "WSXEFBTH-MNT11"
-          },
-          {
-            "id": "DEF2",
-            "name": "WSBHGTYL-DEF2"
-          },
-          {
-            "id": "MAD11",
-            "name": "SDFQWGKL-MAD11"
-          },
-          {
-            "id": "OLG1",
-            "name": "OLHOLHOL-OLG1"
-          },
-          {
-            "id": "GAR1",
-            "name": "NGFVSJKO-GAR1"
-          },
-          {
-            "id": "SAN22",
-            "name": "GNVLSCTL-SAN22"
-          },
-          {
-            "id": "HRG1",
-            "name": "HRGHRGGS-HRG1"
-          },
-          {
-            "id": "JCS1",
-            "name": "JCSJSCJS-JCS1"
-          },
-          {
-            "id": "DHA12",
-            "name": "WSXEDECF-DHA12"
-          },
-          {
-            "id": "HJE1",
-            "name": "AOEEWWWD-HJE1"
-          },
-          {
-            "id": "NCA1",
-            "name": "NCANCANN-NCA1"
-          },
-          {
-            "id": "IOP1",
-            "name": "iopclli1-IOP1"
-          },
-          {
-            "id": "RTY1",
-            "name": "rtyclli1-RTY1"
-          },
-          {
-            "id": "KAP1",
-            "name": "HIOUYTRQ-KAP1"
-          },
-          {
-            "id": "ZEN1",
-            "name": "ZENCLLI1-ZEN1"
-          },
-          {
-            "id": "HKA1",
-            "name": "JAKHLASS-HKA1"
-          },
-          {
-            "id": "CQK1",
-            "name": "CQKSCAKK-CQK1"
-          },
-          {
-            "id": "SAI1",
-            "name": "UBEKQLPD-SAI1"
-          },
-          {
-            "id": "ERT1",
-            "name": "ertclli1-ERT1"
-          },
-          {
-            "id": "IBB1",
-            "name": "PLMKOIJU-IBB1"
-          },
-          {
-            "id": "TIR2",
-            "name": "PLKINHYI-TIR2"
-          },
-          {
-            "id": "HSD1",
-            "name": "CHASKCDS-HSD1"
-          },
-          {
-            "id": "SLF78",
-            "name": "SDCTLFN1-SLF78"
-          },
-          {
-            "id": "SEE78",
-            "name": "SDCTEEE4-SEE78"
-          },
-          {
-            "id": "SAN13",
-            "name": "TOKYJPFA-SAN13"
-          },
-          {
-            "id": "SAA78",
-            "name": "SDCTAAA1-SAA78"
-          },
-          {
-            "id": "LUC1",
-            "name": "ATLDFGYC-LUC1"
-          },
-          {
-            "id": "AMD13",
-            "name": "MEMATLAN-AMD13"
-          },
-          {
-            "id": "TOR1",
-            "name": "TOROONXN-TOR1"
-          },
-          {
-            "id": "QWE1",
-            "name": "QWECLLI1-QWE1"
-          },
-          {
-            "id": "ZOG1",
-            "name": "ZOGASTRO-ZOG1"
-          },
-          {
-            "id": "CAL33",
-            "name": "CALIFORN-CAL33"
-          },
-          {
-            "id": "SHH78",
-            "name": "SDIT1HHH-SHH78"
-          },
-          {
-            "id": "DSA1",
-            "name": "LKJHGFDS-DSA1"
-          },
-          {
-            "id": "CLG1",
-            "name": "CLGRABAD-CLG1"
-          },
-          {
-            "id": "BNA1",
-            "name": "BNARAGBK-BNA1"
-          },
-          {
-            "id": "ATL84",
-            "name": "CANTTCOC-ATL84"
-          },
-          {
-            "id": "APP1",
-            "name": "WBHGTYUI-APP1"
-          },
-          {
-            "id": "RJN1",
-            "name": "RJNRBZAW-RJN1"
-          },
-          {
-            "id": "EHH78",
-            "name": "SDCSHHH5-EHH78"
-          },
-          {
-            "id": "mac10",
-            "name": "PKGTESTF-mac10"
-          },
-          {
-            "id": "SXB78",
-            "name": "SDCTGXB1-SXB78"
-          },
-          {
-            "id": "SAX78",
-            "name": "SDCTAXG1-SAX78"
-          },
-          {
-            "id": "SYD1",
-            "name": "SYDNAUBV-SYD1"
-          },
-          {
-            "id": "TOK1",
-            "name": "TOKYJPFA-TOK1"
-          },
-          {
-            "id": "KGM2",
-            "name": "KGMTNC20-KGM2"
-          },
-          {
-            "id": "DCC1b",
-            "name": "POIUYTGH-DCC1b"
-          },
-          {
-            "id": "SKK78",
-            "name": "SDCTKKK1-SKK78"
-          },
-          {
-            "id": "SGG78",
-            "name": "SDCTGGG1-SGG78"
-          },
-          {
-            "id": "SJJ78",
-            "name": "SDCTJJJ1-SJJ78"
-          },
-          {
-            "id": "SBX78",
-            "name": "SDCTBXG1-SBX78"
-          },
-          {
-            "id": "LAG1",
-            "name": "LARGIZON-LAG1"
-          },
-          {
-            "id": "IAA1",
-            "name": "QAZXSWED-IAA1"
-          },
-          {
-            "id": "POI1",
-            "name": "PLMNJKIU-POI1"
-          },
-          {
-            "id": "LAG1a",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "PBL1",
-            "name": "PBLAPBAI-PBL1"
-          },
-          {
-            "id": "LAG45",
-            "name": "LARGIZON-LAG1a"
-          },
-          {
-            "id": "MAR1",
-            "name": "MNBVCXZM-MAR1"
-          },
-          {
-            "id": "HST70",
-            "name": "HSTNTX70-HST70"
-          },
-          {
-            "id": "DCC1a",
-            "name": "POIUYTGH-DCC1a"
-          },
-          {
-            "id": "TOL1",
-            "name": "TOLDOH21-TOL1"
-          },
-          {
-            "id": "LON1",
-            "name": "LONEENCO-LON1"
-          },
-          {
-            "id": "SJU78",
-            "name": "SDIT1JUB-SJU78"
-          },
-          {
-            "id": "STN27",
-            "name": "HSTNTX01-STN27"
-          },
-          {
-            "id": "SSW56",
-            "name": "ss8126GT-SSW56"
-          },
-          {
-            "id": "SBB78",
-            "name": "SDIT1BBB-SBB78"
-          },
-          {
-            "id": "DCC3",
-            "name": "POIUYTGH-DCC3"
-          },
-          {
-            "id": "GNV1",
-            "name": "GNVLSCTL-GNV1"
-          },
-          {
-            "id": "WAS1",
-            "name": "WASHDCSW-WAS1"
-          },
-          {
-            "id": "TOY1",
-            "name": "TORYONNZ-TOY1"
-          },
-          {
-            "id": "STT1",
-            "name": "STTLWA02-STT1"
-          },
-          {
-            "id": "STG1",
-            "name": "STTGGE62-STG1"
-          },
-          {
-            "id": "SLL78",
-            "name": "SDCTLLL1-SLL78"
-          },
-          {
-            "id": "SBU78",
-            "name": "SDIT1BUB-SBU78"
-          },
-          {
-            "id": "ATL2",
-            "name": "ATLNGANW-ATL2"
-          },
-          {
-            "id": "BOT1",
-            "name": "BOTHWAKY-BOT1"
-          },
-          {
-            "id": "SNG1",
-            "name": "SNGPSIAU-SNG1"
-          },
-          {
-            "id": "NYC1",
-            "name": "NYCMNY54-NYC1"
-          },
-          {
-            "id": "LAG1b",
-            "name": "LARGIZON-LAG1b"
-          },
-          {
-            "id": "AMD15",
-            "name": "AMDFAA01-AMD15"
-          },
-          {
-            "id": "SNA1",
-            "name": "SNANTXCA-SNA1"
-          },
-          {
-            "id": "PLT1",
-            "name": "PLTNCA60-PLT1"
-          },
-          {
-            "id": "TLP1",
-            "name": "TLPNXM18-TLP1"
-          },
-          {
-            "id": "SDD81",
-            "name": "SAIT1DD6-SDD81"
-          },
-          {
-            "id": "DCC1",
-            "name": "POIUYTGH-DCC1"
-          },
-          {
-            "id": "DCC2",
-            "name": "POIUYTGH-DCC2"
-          },
-          {
-            "id": "OKC1",
-            "name": "OKCBOK55-OKC1"
-          },
-          {
-            "id": "PAR1",
-            "name": "PARSFRCG-PAR1"
-          },
-          {
-            "id": "TES36",
-            "name": "ABCEETES-TES36"
-          },
-          {
-            "id": "COM1",
-            "name": "PLMKOPIU-COM1"
-          },
-          {
-            "id": "ANI1",
-            "name": "ATLNGTRE-ANI1"
-          },
-          {
-            "id": "SDG78",
-            "name": "SDIT1BDG-SDG78"
-          },
-          {
-            "id": "mac20",
-            "name": "PKGTESTF-mac20"
-          },
-          {
-            "id": "DSF45",
-            "name": "DSFBG123-DSF45"
-          },
-          {
-            "id": "HST25",
-            "name": "HSTNTX01-HST25"
-          },
-          {
-            "id": "AMD18",
-            "name": "AUDIMA01-AMD18"
-          },
-          {
-            "id": "SAA80",
-            "name": "SAIT9AA3-SAA80"
-          },
-          {
-            "id": "SSA56",
-            "name": "SSIT2AA7-SSA56"
-          },
-          {
-            "id": "SDD82",
-            "name": "SAIT1DD9-SDD82"
-          },
-          {
-            "id": "JCV1",
-            "name": "JCVLFLBW-JCV1"
-          },
-          {
-            "id": "SUL2",
-            "name": "WERTYUJK-SUL2"
-          },
-          {
-            "id": "PUR1",
-            "name": "purelyde-PUR1"
-          },
-          {
-            "id": "FDE55",
-            "name": "FDERT555-FDE55"
-          },
-          {
-            "id": "SITE",
-            "name": "LONEENCO-SITE"
-          },
-          {
-            "id": "ATL1",
-            "name": "ATLNGAMA-ATL1"
-          },
-          {
-            "id": "JUL1",
-            "name": "ZXCVBNMM-JUL1"
-          },
-          {
-            "id": "TAT34",
-            "name": "TESAAISB-TAT34"
-          },
-          {
-            "id": "XCP12",
-            "name": "CHKGH123-XCP12"
-          },
-          {
-            "id": "RAI1",
-            "name": "poiuytre-RAI1"
-          },
-          {
-            "id": "HPO1",
-            "name": "ATLNGAUP-HPO1"
-          },
-          {
-            "id": "KJF12",
-            "name": "KJFDH123-KJF12"
-          },
-          {
-            "id": "SCC80",
-            "name": "SAIT9CC3-SCC80"
-          },
-          {
-            "id": "SAA12",
-            "name": "SAIT9AF8-SAA12"
-          },
-          {
-            "id": "SAA14",
-            "name": "SAIT1AA9-SAA14"
-          },
-          {
-            "id": "ATL35",
-            "name": "TTESSAAI-ATL35"
-          },
-          {
-            "id": "CWY1",
-            "name": "CWYMOWBS-CWY1"
-          },
-          {
-            "id": "ATL76",
-            "name": "TELEPAAI-ATL76"
-          },
-          {
-            "id": "DSL12",
-            "name": "DSLFK242-DSL12"
-          },
-          {
-            "id": "ATL53",
-            "name": "AAIATLTE-ATL53"
-          },
-          {
-            "id": "SAA11",
-            "name": "SAIT9AA2-SAA11"
-          },
-          {
-            "id": "ATL62",
-            "name": "TESSASCH-ATL62"
-          },
-          {
-            "id": "AUG1",
-            "name": "ASDFGHJK-AUG1"
-          },
-          {
-            "id": "POI22",
-            "name": "POIUY123-POI22"
-          },
-          {
-            "id": "SAA13",
-            "name": "SAIT1AA9-SAA13"
-          },
-          {
-            "id": "BHY17",
-            "name": "BHYTFRF3-BHY17"
-          },
-          {
-            "id": "LIS1",
-            "name": "HOSTPROF-LIS1"
-          },
-          {
-            "id": "SIP1",
-            "name": "ZXCVBNMK-SIP1"
-          },
-          {
-            "id": "ATL99",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "ATL64",
-            "name": "FORLOAAJ-ATL64"
-          },
-          {
-            "id": "TAT33",
-            "name": "TESAAISA-TAT33"
-          },
-          {
-            "id": "RAD10",
-            "name": "INDIPUNE-RAD10"
-          },
-          {
-            "id": "RTW5",
-            "name": "BHYTFRY4-RTW5"
-          },
-          {
-            "id": "JGS1",
-            "name": "KSJKKKKK-JGS1"
-          },
-          {
-            "id": "ATL98",
-            "name": "TEESTAAI-ATL43"
-          },
-          {
-            "id": "WAN1",
-            "name": "LEIWANGW-WAN1"
-          },
-          {
-            "id": "ATL44",
-            "name": "ATLSANAB-ATL44"
-          },
-          {
-            "id": "RTD2",
-            "name": "BHYTFRk4-RTD2"
-          },
-          {
-            "id": "NIR1",
-            "name": "ORFLMANA-NIR1"
-          },
-          {
-            "id": "ATL75",
-            "name": "SANAAIRE-ATL75"
-          },
-          {
-            "id": "NUM1",
-            "name": "QWERTYUI-NUM1"
-          },
-          {
-            "id": "hvf32",
-            "name": "MDTWNJ21-hvf32"
-          },
-          {
-            "id": "RTZ4",
-            "name": "BHYTFRZ6-RTZ4"
-          },
-          {
-            "id": "ATL56",
-            "name": "ATLSANAC-ATL56"
-          },
-          {
-            "id": "AMS1",
-            "name": "AMSTNLBW-AMS1"
-          },
-          {
-            "id": "RCT1",
-            "name": "AMSTERNL-RCT1"
-          },
-          {
-            "id": "JAN1",
-            "name": "ORFLMATT-JAN1"
-          },
-          {
-            "id": "ABC14",
-            "name": "TESAAISA-ABC14"
-          },
-          {
-            "id": "TAT37",
-            "name": "TESAAISD-TAT37"
-          },
-          {
-            "id": "MIC54",
-            "name": "MICHIGAN-MIC54"
-          },
-          {
-            "id": "ABC11",
-            "name": "ATLSANAI-ABC11"
-          },
-          {
-            "id": "AMF11",
-            "name": "AMDOCS01-AMF11"
-          },
-          {
-            "id": "ATL63",
-            "name": "ATLSANEW-ATL63"
-          },
-          {
-            "id": "ABC12",
-            "name": "ATLSECIA-ABC12"
-          },
-          {
-            "id": "hvf20",
-            "name": "MDTWNJ21-hvf20"
-          },
-          {
-            "id": "ABC15",
-            "name": "AAITESAN-ABC15"
-          },
           {
             "id": "AVT1",
             "name": "AVTRFLHD-AVT1"
index d9167be..cae69a6 100644 (file)
@@ -19,6 +19,7 @@ export class ServiceInstance extends NodeInstance{
   projectName: string;
   owningEntityId: string;
   owningEntityName: string;
+  latestAvailableVersion: Number;
   pause: boolean;
   bulkSize: number;
   vnfs: { [vnf_module_model_name: string]: VnfInstance; };
@@ -26,6 +27,7 @@ export class ServiceInstance extends NodeInstance{
   vnfGroups : {[vnf_module_model_name: string]: VnfGroupInstance; };
   networks: { [vnf_module_model_name: string]: NetworkInstance; };
   isDirty : boolean;
+  isUpgraded : boolean;
   instanceParams: {[key: string]: string}[];
   rollbackOnFailure: boolean;
   subscriberName: string;
@@ -39,6 +41,7 @@ export class ServiceInstance extends NodeInstance{
   optionalGroupMembersMap?: { [path: string]: VnfMember[]; };
   statusMessage: string;
   vidNotions?: VidNotions;
+  upgradedVFMSonsCounter: number;
 
   constructor() {
     super();
@@ -56,6 +59,7 @@ export class ServiceInstance extends NodeInstance{
     this.networks = {};
     this.vnfGroups = {};
     this.bulkSize = 1;
+    this.isUpgraded = false;
+    this.upgradedVFMSonsCounter = 0;
   }
-
 }
index cda2d0e..0c8756d 100644 (file)
@@ -1,11 +1,14 @@
 export enum ServiceInstanceActions{
   Delete = "Delete",
+  Replace = "Replace",
+  Upgrade = "Upgrade",
   Update="Update",
   Create="Create",
   None="None",
   Resume = "Resume",
   Update_Delete = 'Update_Delete',
-  None_Delete = 'None_Delete'
+  None_Delete = 'None_Delete',
+  None_Upgrade = 'None_Upgrade'
 }
 export enum ServiceAction {
   INSTANTIATE = 'INSTANTIATE',
index 6082de6..60f5c48 100644 (file)
@@ -8,10 +8,12 @@ export class VnfInstance extends Level1Instance {
   vnfStoreKey : string;
   position: number;
   statusMessage?: string;
+  upgradedVFMSonsCounter: number;
 
   constructor() {
     super();
     this.vfModules = {};
     this.vnfStoreKey = null;
+    this.upgradedVFMSonsCounter = 0;
   }
 }
index 404f390..d2f76e4 100644 (file)
@@ -1,11 +1,14 @@
 import {ActivatedRouteSnapshot, Resolve} from "@angular/router";
 import {Injectable} from "@angular/core";
-import {Observable} from "rxjs";
+import {from, Observable} from "rxjs";
 import {AaiService} from "../../services/aaiService/aai.service";
 import {forkJoin} from "rxjs/observable/forkJoin";
 import {AppState} from "../../store/reducers";
 import {NgRedux} from "@angular-redux/store";
 import {createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+import {ServiceInstance} from "../../models/serviceInstance";
+import * as _ from "lodash";
+import {ModelInfo} from "../../models/modelInfo";
 
 @Injectable()
 export class ViewEditResolver implements Resolve<Observable<boolean>> {
@@ -14,26 +17,51 @@ export class ViewEditResolver implements Resolve<Observable<boolean>> {
   }
 
   resolve(route: ActivatedRouteSnapshot): Observable<boolean> {
-    const serviceModeId: string = route.queryParamMap.get("serviceModelId");
+    const serviceModelId: string = route.queryParamMap.get("serviceModelId");
     const serviceInstanceId: string = route.queryParamMap.get("serviceInstanceId");
     const subscriberId: string = route.queryParamMap.get("subscriberId");
     const serviceType: string = route.queryParamMap.get("serviceType");
-      let serviceModelApi = this._aaiService.getServiceModelById(serviceModeId);
-      let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModeId);
-      return forkJoin([serviceModelApi, serviceInstanceApi]).map(([serviceModel, serviceInstance ]) => {
-        this.setIsALaCarte(serviceInstance,serviceModel.service.vidNotions.instantiationType );
-        this.setTestApi(serviceInstance);
-        this._store.dispatch(createServiceInstance( serviceInstance, serviceModeId));
-          return true;
-        });
+    let serviceModelApi = this._aaiService.getServiceModelById(serviceModelId);
+    let serviceInstanceApi = this._aaiService.retrieveAndStoreServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType, serviceModelId);
+    let streams: Observable<any>[] = [serviceModelApi, serviceInstanceApi];
+    streams = streams.filter( stream => stream !== undefined);
+    return forkJoin(streams).switchMap(([serviceModel, serviceInstance]) => {
+      return from(this.retrieveLatestVersionAndSetServiceInstance(serviceInstance.modelInfo.modelInvariantId).then((response)=>{
+        this.setServiceLatestAvailableVersion(serviceInstance, response);
+        this.applyRequestsResponsesToStateAndInitServiceInstance(serviceModelId, serviceInstance, serviceModel);
+        return true;
+      }));
+
+    });
+  }
+
+  private retrieveLatestVersionAndSetServiceInstance(modelInvariantId: string) :Promise<ModelInfo>{
+    return this._aaiService.retrieveServiceLatestUpdateableVersion(modelInvariantId).toPromise();
+  }
+
+  applyRequestsResponsesToStateAndInitServiceInstance(serviceModelId: string,
+                                                      serviceInstance, serviceModel) {
+    this.setIsALaCarte(serviceInstance, serviceModel.service.vidNotions.instantiationType);
+    this.setTestApi(serviceInstance);
+    this._store.dispatch(createServiceInstance(serviceInstance, serviceModelId));
   }
 
-  setTestApi = (service: any) => {
+  setServiceLatestAvailableVersion(serviceInstance :ServiceInstance, modelInfoObject: ModelInfo) :void{
+    if(!_.isNil(modelInfoObject) && !_.isNil(modelInfoObject.modelVersion)){
+      serviceInstance.latestAvailableVersion = Number(modelInfoObject.modelVersion);
+    }
+    else {
+      serviceInstance.latestAvailableVersion = 0;
+    }
+  }
+
+  setTestApi(service: any) :void{
     if (this._store.getState().global.flags['FLAG_ADD_MSO_TESTAPI_FIELD'] && service.isALaCarte) {
       service.testApi = sessionStorage.getItem("msoRequestParametersTestApiValue");
     }
   };
-  setIsALaCarte = (service: any, instantiationType) => {
+
+  setIsALaCarte(service: any, instantiationType) :void{
     service.isALaCarte = instantiationType === 'ALaCarte';
   };
 
index 5cff00b..f563cbc 100644 (file)
@@ -566,6 +566,7 @@ var expectedResult =
   {
     'vnfs': {
       'DROR_vsp': {
+        'upgradedVFMSonsCounter': 0,
         'rollbackOnFailure': 'true',
         'vfModules': {},
         'isMissingData': false,
index 4e7e4da..d421fe8 100644 (file)
@@ -37,12 +37,16 @@ import {
   updateSubscribers,
   updateUserId
 } from "../../storeUtil/utils/general/general.actions";
-import {updateModel, createServiceInstance} from "../../storeUtil/utils/service/service.actions";
+import {
+  updateModel,
+  createServiceInstance,
+} from "../../storeUtil/utils/service/service.actions";
 import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service";
 import {VnfMember} from "../../models/VnfMember";
 import {setOptionalMembersVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions";
 import {Observable} from "rxjs";import {NetworkModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/networkStep/network.step.model";
 import {VPNModalRow} from "../../../drawingBoard/service-planning/objectsToTree/models/vrf/vrfModal/vpnStep/vpn.step.model";
+import {ModelInfo} from "../../models/modelInfo";
 
 @Injectable()
 export class AaiService {
@@ -61,6 +65,14 @@ export class AaiService {
       });
   };
 
+  retrieveServiceLatestUpdateableVersion = (modelInvariantId: string): Observable<ModelInfo> => {
+    if (this.featureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE)){
+      let pathQuery: string = Constants.Path.SERVICE_LATEST_VERSION + modelInvariantId;
+      return this.http.get<ModelInfo>(pathQuery)
+    }
+    return;
+  };
+
   getUserId = (): Observable<any> => {
     return this.http.get("../../getuserID", {responseType: 'text'}).do((res) => this.store.dispatch(updateUserId(res)));
   };
@@ -213,7 +225,7 @@ export class AaiService {
   };
 
   public extractLcpRegionName(cloudRegionId: string, cloudOwner: string):string {
-   return this.featureFlagsService.getFlagState(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST) ?
+    return this.featureFlagsService.getFlagState(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST) ?
       cloudRegionId+AaiService.formatCloudOwnerTrailer(cloudOwner) : cloudRegionId;
   };
 
@@ -271,7 +283,7 @@ export class AaiService {
   public retrieveAndStoreServiceInstanceTopology(serviceInstanceId: string, subscriberId: string, serviceType: string, serviceModeId: string):Observable<ServiceInstance> {
     return this.retrieveServiceInstanceTopology(serviceInstanceId, subscriberId, serviceType).do((service:ServiceInstance) => {
       this.store.dispatch(createServiceInstance(service, serviceModeId));
-      });
+    });
   };
 
 
@@ -296,9 +308,6 @@ export class AaiService {
       .do((res) => {
         this.store.dispatch(setOptionalMembersVnfGroupInstance(serviceModelId, pathQuery, res))
       });
-    // let res = Observable.of((JSON.parse(JSON.stringify(this.loadMockMembers()))));
-    // return  res;
-     
   }
 
   //TODO: make other places use this function
index 01ecb2c..7df15fc 100644 (file)
@@ -9,7 +9,9 @@ export enum Features {
   FLAG_VF_MODULE_RESUME_STATUS_CREATE = 'FLAG_VF_MODULE_RESUME_STATUS_CREATE',
   DRAG_AND_DROP_OPERATION = 'DRAG_AND_DROP_OPERATION',
   FLAG_1906_COMPONENT_INFO = 'FLAG_1906_COMPONENT_INFO',
-  FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE'
+  FLAG_1908_RESUME_MACRO_SERVICE = 'FLAG_1908_RESUME_MACRO_SERVICE',
+  FLAG_FLASH_REPLACE_VF_MODULE ='FLAG_FLASH_REPLACE_VF_MODULE',
+  FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT ='FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT'
 }
 
 @Injectable()
@@ -23,7 +25,11 @@ export class FeatureFlagsService {
 
   /*static method for easy refactoring of code, so no injection of FeatureFlagsService is needed*/
   public static getFlagState(flag: Features, store: NgRedux<AppState>):boolean {
-    return store.getState().global.flags[flag];
+    let storeStateGlobalFields = store.getState().global;
+    if(storeStateGlobalFields && storeStateGlobalFields.flags && storeStateGlobalFields.flags[flag] !== undefined){
+      return storeStateGlobalFields.flags[flag];
+    }
+    return false;
   }
 
 
index 5722811..c192ece 100644 (file)
@@ -3,8 +3,7 @@ import {ActionOnFirstLevel} from "./firstLevel/firstLevel.actions";
 import {ServiceInstanceActions} from "../../models/serviceInstanceActions";
 import {ServiceState} from "./main.reducer";
 
-export function deleteFirstLevel(state: ServiceState, action: ActionOnFirstLevel,shouldUpdateServiceValidationCounter: boolean)
-{
+export function deleteFirstLevel(state: ServiceState, action: ActionOnFirstLevel,shouldUpdateServiceValidationCounter: boolean){
   let newState = _.cloneDeep(state);
   let firstLevel = newState.serviceInstance[action.serviceId][action.firstLevelName][action.storeKey];
   let oldAction = firstLevel.action;
@@ -22,4 +21,10 @@ export function updateServiceValidationCounter(newState: any, oldValidationState
   } else if (!oldValidationState && newValidationState) {
     newState.serviceInstance[serviceUuid].validationCounter++;
   }
+  resetUpgradeStatus(newState, serviceUuid);
 };
+
+function resetUpgradeStatus(newState: any, serviceUuid: string){
+  newState.serviceInstance[serviceUuid].upgradedVFMSonsCounter = 0;
+  newState.serviceInstance[serviceUuid].isUpgraded = false;
+}
index e4e7e49..069ef82 100644 (file)
@@ -10,7 +10,9 @@ export enum ServiceActions {
   ADD_SERVICE_ACTION = 'ADD_SERVICE_ACTION',
   DELETE_ACTION_SERVICE_INSTANCE = "DELETE_ACTION_SERVICE_INSTANCE",
   UNDO_DELETE_ACTION_SERVICE_INSTANCE = "UNDO_DELETE_ACTION_SERVICE_INSTANCE",
-  CHANGE_SERVICE_IS_DIRTY = "CHANGE_SERVICE_IS_DIRTY"
+  CHANGE_SERVICE_IS_DIRTY = "CHANGE_SERVICE_IS_DIRTY",
+  UPGRADE_SERVICE_ACTION = "UPGRADE_SERVICE_ACTION",
+  UNDO_UPGRADE_SERVICE_ACTION = "UNDO_UPGRADE_SERVICE_ACTION"
 }
 
 export interface CreateServiceInstanceAction extends Action {
@@ -40,6 +42,13 @@ export interface AddServiceAction extends Action{
   action: ServiceInstanceActions;
 }
 
+export interface UpgradeServiceAction extends Action{
+  serviceUuid: string;
+}
+
+export interface UndoUpgradeServiceAction extends Action{
+  serviceUuid: string;
+}
 
 export interface DeleteActionServiceInstanceAction extends Action {
   serviceId?: string;
@@ -99,4 +108,12 @@ export const changeServiceIsDirty: ActionCreator<ChangeServiceDirty> = (nodes, s
   serviceId : serviceId
 });
 
+export const upgradeService: ActionCreator<UpgradeServiceAction> = (serviceUuid : string) => ({
+  type: ServiceActions.UPGRADE_SERVICE_ACTION,
+  serviceUuid
+});
 
+export const undoUpgradeService: ActionCreator<UndoUpgradeServiceAction> = (serviceUuid : string) => ({
+  type: ServiceActions.UNDO_UPGRADE_SERVICE_ACTION,
+  serviceUuid
+});
index cff9445..ba8b382 100644 (file)
@@ -6,7 +6,7 @@ import {
   DeleteServiceInstanceAction,
   ServiceActions,
   UpdateServiceInstanceAction,
-  UpdateServiceModelAction
+  UpdateServiceModelAction, UpgradeServiceAction
 } from "./service.actions";
 import {serviceReducer} from "./service.reducers";
 import {ServiceInstanceActions} from "../../../models/serviceInstanceActions";
@@ -513,7 +513,62 @@ describe('serviceReducer', () => {
     expect(state.serviceInstance['serviceId'].isDirty).toBeTruthy();
   });
 
-});
+  test('#UPGRADE_SERVICE should update service action to _Upgrade', () => {
+    const state = serviceReducer(<any>{
+        serviceInstance: {
+          'serviceId': {
+            action: ServiceInstanceActions.None,
+            upgradedVFMSonsCounter: 0,
+            'vnfs': {
+              'vnf1': {
+                action: ServiceInstanceActions.None
+              },
+              'vnf2': {
+                action: ServiceInstanceActions.Create
+              }
+            }
+
+          }
+        }
+      },
+      <UpgradeServiceAction> {
+        type: ServiceActions.UPGRADE_SERVICE_ACTION,
+        serviceUuid: 'serviceId'
+      });
+
+    expect(state.serviceInstance['serviceId'].isUpgraded).toBeTruthy();
+    expect(state.serviceInstance['serviceId'].action).toEqual(ServiceInstanceActions.None_Upgrade);
+    expect(state.serviceInstance['serviceId'].upgradedVFMSonsCounter).toEqual(1);
 
+  });
 
+  test('#UNDO_UPGRADE_SERVICE should cancel the upgrade action back to None', () => {
+    const state = serviceReducer(<any>{
+        serviceInstance: {
+          'serviceId': {
+            isUpgraded: true,
+            upgradedVFMSonsCounter: 1,
+            action: ServiceInstanceActions.None_Upgrade,
+            'vnfs': {
+              'vnf1': {
+                action: ServiceInstanceActions.None_Upgrade
+              },
+              'vnf2': {
+                action: ServiceInstanceActions.Create
+              }
+            }
 
+          }
+        }
+      },
+      <UpgradeServiceAction> {
+        type: ServiceActions.UNDO_UPGRADE_SERVICE_ACTION,
+        serviceUuid: 'serviceId'
+      });
+
+    expect(state.serviceInstance['serviceId'].isUpgraded).toBeFalsy();
+    expect(state.serviceInstance['serviceId'].action).toEqual(ServiceInstanceActions.None);
+    expect(state.serviceInstance['serviceId'].upgradedVFMSonsCounter).toEqual(0);
+  });
+
+});
index c6d3da5..8112383 100644 (file)
@@ -4,8 +4,10 @@ import {
   ChangeServiceDirty,
   CreateServiceInstanceAction,
   ServiceActions,
+  UndoUpgradeServiceAction,
   UpdateServiceInstanceAction,
-  UpdateServiceModelAction
+  UpdateServiceModelAction,
+  UpgradeServiceAction
 } from "./service.actions";
 import {ServiceInstance} from "../../../models/serviceInstance";
 import {ServiceState} from "../main.reducer";
@@ -13,84 +15,99 @@ import {ServiceInstanceActions} from "../../../models/serviceInstanceActions";
 import * as _ from "lodash";
 
 export function serviceReducer(state: ServiceState, action: Action) : ServiceState{
-    switch (action.type) {
-      case ServiceActions.UPDATE_SERVICE_INSTANCE : {
-        let newState = _.cloneDeep(state);
-        const updateServiceInstanceAction = <UpdateServiceInstanceAction>action;
-        const uuid = updateServiceInstanceAction.serviceUuid;
-        const serviceInstance = updateServiceInstanceAction.serviceInstance;
 
+  switch (action.type) {
+    case ServiceActions.UPDATE_SERVICE_INSTANCE : {
+      let newState = _.cloneDeep(state);
+      const updateServiceInstanceAction = <UpdateServiceInstanceAction>action;
+      const uuid = updateServiceInstanceAction.serviceUuid;
+      const serviceInstance = updateServiceInstanceAction.serviceInstance;
 
-        updateUniqueNames(serviceInstance.instanceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
+      updateUniqueNames(serviceInstance.instanceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
 
-        newState.serviceInstance[uuid] = _.merge(newState.serviceInstance[uuid], serviceInstance);
-        return newState;
-      }
-      case ServiceActions.CREATE_SERVICE_INSTANCE : {
-        const updateServiceInstanceAction = <CreateServiceInstanceAction>action;
-        const uuid = updateServiceInstanceAction.serviceUuid;
-        let newState = _.cloneDeep(state);
+      newState.serviceInstance[uuid] = _.merge(newState.serviceInstance[uuid], serviceInstance);
+      return newState;
+    }
+    case ServiceActions.CREATE_SERVICE_INSTANCE : {
+      const updateServiceInstanceAction = <CreateServiceInstanceAction>action;
+      const uuid = updateServiceInstanceAction.serviceUuid;
+      let newState = _.cloneDeep(state);
 
-        const serviceInstance: ServiceInstance =  new ServiceInstance();
-        const currentInstaceName = state.serviceInstance[uuid] ? serviceInstance.instanceName : null;
+      const serviceInstance: ServiceInstance =  new ServiceInstance();
+      const currentInstaceName = state.serviceInstance[uuid] ? serviceInstance.instanceName : null;
 
-        newState.serviceInstance[uuid] = Object.assign(serviceInstance, updateServiceInstanceAction.serviceInstance);
-        newState.serviceInstance[uuid].vidNotions = _.get(state,`serviceHierarchy[${uuid}].service.vidNotions`);
-        if (!_.isNil(updateServiceInstanceAction.serviceInstance)) {
-          updateUniqueNames(currentInstaceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
-        }
-        return newState;
-      }
-      case ServiceActions.DELETE_ALL_SERVICE_INSTANCES: {
-        if (state.serviceInstance) {
-          let newState = _.cloneDeep(state);
-          newState.serviceInstance = {};
-          return Object.assign({}, state, newState);
-        }
-        return Object.assign({}, state);
+      newState.serviceInstance[uuid] = Object.assign(serviceInstance, updateServiceInstanceAction.serviceInstance);
+      newState.serviceInstance[uuid].vidNotions = _.get(state,`serviceHierarchy[${uuid}].service.vidNotions`);
+      if (!_.isNil(updateServiceInstanceAction.serviceInstance)) {
+        updateUniqueNames(currentInstaceName, updateServiceInstanceAction.serviceInstance.instanceName, newState.serviceInstance[uuid]);
       }
-      case ServiceActions.UPDATE_MODEL: {
-        let uuid = (<UpdateServiceModelAction>action).serviceHierarchy.service.uuid;
-        state.serviceHierarchy[uuid] = _.cloneDeep((<UpdateServiceModelAction>action).serviceHierarchy);
-        return Object.assign({}, state);
+      return newState;
+    }
+    case ServiceActions.DELETE_ALL_SERVICE_INSTANCES: {
+      if (state.serviceInstance) {
+        let newState = _.cloneDeep(state);
+        newState.serviceInstance = {};
+        return Object.assign({}, state, newState);
       }
-      case ServiceActions.ADD_SERVICE_ACTION: {
-        const uuid: string = (<AddServiceAction>action).serviceUuid;
-        const actionToAdd: ServiceInstanceActions =  (<AddServiceAction>action).action;
-        state.serviceInstance[uuid].action =  actionToAdd;
-        return Object.assign({}, state);
+      return Object.assign({}, state);
+    }
+    case ServiceActions.UPDATE_MODEL: {
+      let uuid = (<UpdateServiceModelAction>action).serviceHierarchy.service.uuid;
+      state.serviceHierarchy[uuid] = _.cloneDeep((<UpdateServiceModelAction>action).serviceHierarchy);
+      return Object.assign({}, state);
+    }
+    case ServiceActions.ADD_SERVICE_ACTION: {
+      const uuid: string = (<AddServiceAction>action).serviceUuid;
+      const actionToAdd: ServiceInstanceActions =  (<AddServiceAction>action).action;
+      state.serviceInstance[uuid].action =  actionToAdd;
+      return Object.assign({}, state);
+    }
+    case ServiceActions.CHANGE_SERVICE_IS_DIRTY : {
+      let newState = _.cloneDeep(state);
+      let serviceInstanceAction: ServiceInstanceActions = newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].action;
+
+      if(serviceInstanceAction !== ServiceInstanceActions.None){
+        newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
+        return newState;
       }
-      case ServiceActions.CHANGE_SERVICE_IS_DIRTY : {
-        let newState = _.cloneDeep(state);
-        let serviceInstanceAction: ServiceInstanceActions = newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].action;
 
-        if(serviceInstanceAction !== ServiceInstanceActions.None){
+      const nodes =  (<ChangeServiceDirty>action).nodes;
+      for(let node of nodes){
+        const dirty = isDirty(node);
+        if(dirty) {
           newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
           return newState;
         }
+      }
+      newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = false;
+      return newState;
+    }
+    case ServiceActions.UPGRADE_SERVICE_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      let oldServiceAction: string = ServiceInstanceActions.None;
+      const castingAction = <UpgradeServiceAction>action;
+      const uuid: string = castingAction.serviceUuid;
+      return upgradeServiceInstance(clonedState, uuid, oldServiceAction);
+    }
 
-        const nodes =  (<ChangeServiceDirty>action).nodes;
-        for(let node of nodes){
-          const dirty = isDirty(node);
-          if(dirty) {
-            newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = true;
-            return newState;
-          }
-        }
-
-        newState.serviceInstance[(<ChangeServiceDirty>action).serviceId].isDirty = false;
-        return newState;
+    case ServiceActions.UNDO_UPGRADE_SERVICE_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UndoUpgradeServiceAction>action;
+      const uuid: string = castingAction.serviceUuid;
+      if(!_.isNil(clonedState.serviceInstance[uuid].action) && clonedState.serviceInstance[uuid].action.includes("Upgrade")) {
+        return undoUpgradeServiceInstance(clonedState, uuid);
       }
     }
+  }
 }
 
 const isDirty = (node) : boolean => {
   if(node.action !== ServiceInstanceActions.None) return true;
   if(!_.isNil(node.children) && node.children.length > 0){
-      for(let child of node.children){
-        const dirty: boolean = isDirty(child);
-        if(dirty) return true;
-      }
+    for(let child of node.children){
+      const dirty: boolean = isDirty(child);
+      if(dirty) return true;
+    }
   }
   return false;
 };
@@ -105,5 +122,23 @@ const updateUniqueNames = (oldName : string, newName : string, serviceInstance :
   }
 };
 
+function upgradeServiceInstance(clonedState, uuid: string, oldServiceAction: string) {
+  if(!clonedState.serviceInstance[uuid].action.includes("Upgrade")){
+    clonedState.serviceInstance[uuid].action = (`${oldServiceAction}_Upgrade`) as ServiceInstanceActions;
+  }
+  clonedState.serviceInstance[uuid].isUpgraded = true;
+  clonedState.serviceInstance[uuid].upgradedVFMSonsCounter++;
+  return clonedState;
+}
+
+function undoUpgradeServiceInstance(clonedState, uuid: string) {
+  clonedState.serviceInstance[uuid].upgradedVFMSonsCounter--;
+  if(clonedState.serviceInstance[uuid].upgradedVFMSonsCounter == 0){
+    clonedState.serviceInstance[uuid].action = ServiceInstanceActions.None;
+    clonedState.serviceInstance[uuid].isUpgraded = false;
+  }
+  return clonedState;
+}
+
 
 
index a3f0f40..59e5ee1 100644 (file)
@@ -6,7 +6,9 @@ export enum VfModuleActions {
   UPDATE_VF_MODULE = 'UPDATE_VF_MODULE',
   DELETE_ACTION_VF_MODULE_INSTANCE = "DELETE_ACTION_VF_MODULE_INSTANCE",
   UNDO_DELETE_ACTION_VF_MODULE_INSTANCE = "UNDO_DELETE_ACTION_VF_MODULE_INSTANCE",
-  UPDATE_VFMODULE_POSITION = "UPDATE_VFMODULE_POSITION"
+  UPDATE_VFMODULE_POSITION = "UPDATE_VFMODULE_POSITION",
+  UPGRADE_VFMODULE = "UPGRADE_VFMODULE",
+  UNDO_UPGRADE_VFMODULE_ACTION = "UNDO_UPGRADE_VFMODULE_ACTION",
 }
 
 
@@ -47,6 +49,19 @@ export interface DeleteActionVfModuleInstanceAction extends Action {
   serviceId?: string;
 }
 
+export interface UpgradeVfModuleInstanceAction extends Action {
+  modelName : string;
+  vnfStoreKey : string;
+  serviceId?: string;
+  dynamicModelName: string;
+}
+export interface UndoUpgradeVfModuleInstanceAction extends Action {
+  modelName : string;
+  vnfStoreKey : string;
+  serviceId?: string;
+  dynamicModelName: string;
+}
+
 export interface UndoDeleteActionVfModuleInstanceAction extends Action {
   dynamicModelName: string;
   vnfStoreKey : string;
@@ -95,7 +110,6 @@ export const undoDeleteVfModuleInstance: ActionCreator<UndoDeleteActionVfModuleI
   serviceId: serviceId
 });
 
-
 export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (node, instanceId, vnfStoreKey) => ({
   type: VfModuleActions.UPDATE_VFMODULE_POSITION,
   node: node,
@@ -103,3 +117,18 @@ export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (no
   vnfStoreKey : vnfStoreKey
 });
 
+export const upgradeVFModule: ActionCreator<UpgradeVfModuleInstanceAction> = (modelName, vnfStoreKey, serviceId, dynamicModelName) => ({
+  type: VfModuleActions.UPGRADE_VFMODULE,
+  dynamicModelName,
+  modelName,
+  vnfStoreKey,
+  serviceId
+});
+
+export const undoUgradeVFModule: ActionCreator<UndoUpgradeVfModuleInstanceAction> = (modelName, vnfStoreKey, serviceId, dynamicModelName) => ({
+  type: VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION,
+  dynamicModelName,
+  modelName,
+  vnfStoreKey,
+  serviceId
+});
index de6d214..ee0edb0 100644 (file)
@@ -1,7 +1,10 @@
 import {
   CreateVFModuleInstanceAction,
   DeleteActionVfModuleInstanceAction,
-  DeleteVfModuleInstanceAction, UndoDeleteActionVfModuleInstanceAction, UpdateVFModluePosition,
+  DeleteVfModuleInstanceAction,
+  UndoDeleteActionVfModuleInstanceAction,
+  UpdateVFModluePosition,
+  UpgradeVfModuleInstanceAction,
   VfModuleActions
 } from "./vfModule.actions";
 import {vfModuleReducer} from "./vfModule.reducers";
@@ -102,10 +105,10 @@ describe('vfModuleReducer', () => {
     vfModuleInstance.isMissingData = false;
     vfModuleInstance.volumeGroupName = 'volumeGroupName';
     let vfModule = vfModuleReducer(<any>{
-      serviceHierarchy : {
-        'serviceModelId' : {}
-      },
-      serviceInstance : {
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               'vfName' : {
@@ -169,16 +172,16 @@ describe('vfModuleReducer', () => {
 
       }).serviceInstance['serviceModelId'].vnfs['vfName'].vfModules["modelName"]["dynamicModelName"];
 
-      expect(vfModule.position).toEqual(1);
+    expect(vfModule.position).toEqual(1);
   });
 
 
   test('#DELETE_ACTION_VF_MODULE_INSTANCE', ()=>{
     let vfModule = vfModuleReducer(<any>{
-      serviceHierarchy : {
-        'serviceModelId' : {}
-      },
-      serviceInstance : {
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               'vnfStoreKey' : {
@@ -242,7 +245,70 @@ describe('vfModuleReducer', () => {
     expect(vfModule.action).toEqual(ServiceInstanceActions.None);
   });
 
-});
+  test('#UPGRADE_VFMODULE', ()=>{
+    let vfModule = vfModuleReducer(<any>{
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
+          'serviceModelId' : {
+            vnfs : {
+              'vnfStoreKey' : {
+                vfModules : {
+                  'modelName' : {
+                    'dynamicModelName1': {
+                      isMissingData : true,
+                      action : 'None'
+                    },
+                    'dynamicModelName2': {},
+                  }
+                }
+              }
+            }
+          }
+        }},
+      <UpgradeVfModuleInstanceAction>{
+        type: VfModuleActions.UPGRADE_VFMODULE,
+        dynamicModelName: 'dynamicModelName1',
+        vnfStoreKey : 'vnfStoreKey',
+        serviceId: 'serviceModelId',
+        modelName: 'modelName'
+      }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'].vfModules['modelName']['dynamicModelName1'];
+
+    expect(vfModule.action).toEqual(ServiceInstanceActions.None_Upgrade);
+  });
 
+  test('#UNDO_UPGRADE_VFMODULE', ()=>{
+    let vfModule = vfModuleReducer(<any>{
+        serviceHierarchy : {
+          'serviceModelId' : {}
+        },
+        serviceInstance : {
+          'serviceModelId' : {
+            vnfs : {
+              'vnfStoreKey' : {
+                vfModules : {
+                  'modelName' : {
+                    'dynamicModelName1': {
+                      isMissingData : true,
+                      action : 'None_Upgrade'
+                    },
+                    'dynamicModelName2': {},
+                  }
+                }
+              }
+            }
+          }
+        }},
+      <UpgradeVfModuleInstanceAction>{
+        type: VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION,
+        dynamicModelName: 'dynamicModelName1',
+        vnfStoreKey : 'vnfStoreKey',
+        serviceId: 'serviceModelId',
+        modelName: 'modelName'
+      }).serviceInstance['serviceModelId'].vnfs['vnfStoreKey'].vfModules['modelName']['dynamicModelName1'];
 
+    expect(vfModule.action).toEqual(ServiceInstanceActions.None);
+  });
 
+});
index 05319c0..a7aadba 100644 (file)
@@ -3,7 +3,7 @@ import * as _ from "lodash";
 import {
   CreateVFModuleInstanceAction, DeleteActionVfModuleInstanceAction,
   DeleteVfModuleInstanceAction, UndoDeleteActionVfModuleInstanceAction, UpdateVFModluePosition,
-  UpdateVFModuleInstanceAction,
+  UpdateVFModuleInstanceAction, UpgradeVfModuleInstanceAction,
   VfModuleActions
 } from "./vfModule.actions";
 import {ServiceInstance} from "../../../models/serviceInstance";
@@ -26,6 +26,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS
 
       let vfModulesMap = newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules[vfModuleId] || new VfModuleMap();
       let randomId = generateId();
+      vfInstance.action = ServiceInstanceActions.Create;
       vfModulesMap[vfModuleId + randomId] = vfInstance;
       updateUniqueNames(null, vfInstance.instanceName, newState.serviceInstance[serviceUuid]);
       updateUniqueNames(null, vfInstance.volumeGroupName, newState.serviceInstance[serviceUuid]);
@@ -110,6 +111,40 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS
       newState.serviceInstance[serviceUuid].vnfs[updateVFModluePosition.vnfStoreKey].vfModules[modelName][dynamicModelName].position = updateVFModluePosition.node.position;
       return newState;
     }
+
+    case VfModuleActions.UPGRADE_VFMODULE : {
+      let clonedState = _.cloneDeep(state);
+      const upgradeAction = (<UpgradeVfModuleInstanceAction>action);
+      let oldAction = clonedState
+        .serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action;
+      if(!_.isNil(oldAction) && oldAction.includes("Upgrade")) {
+        return clonedState;
+      }
+      clonedState.serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action = (`${oldAction}_Upgrade`) as ServiceInstanceActions;
+      return clonedState;
+    }
+    case VfModuleActions.UNDO_UPGRADE_VFMODULE_ACTION : {
+      let clonedState = _.cloneDeep(state);
+      const upgradeAction = (<UpgradeVfModuleInstanceAction>action);
+      let oldAction = clonedState
+        .serviceInstance[upgradeAction.serviceId]
+        .vnfs[upgradeAction.vnfStoreKey]
+        .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+        .action;
+      if(!_.isNil(oldAction) && oldAction.includes("Upgrade")) {
+        clonedState.serviceInstance[upgradeAction.serviceId]
+          .vnfs[upgradeAction.vnfStoreKey]
+          .vfModules[upgradeAction.modelName][upgradeAction.dynamicModelName]
+          .action = ServiceInstanceActions.None;
+      }
+      return clonedState;
+    }
   }
 }
 
index 25179fe..6fb844e 100644 (file)
@@ -8,7 +8,14 @@ export enum VNFActions {
   REMOVE_VNF_INSTANCE = "REMOVE_VNF_INSTANCE",
   DELETE_ACTION_VNF_INSTANCE = "DELETE_VNF_INSTANCE",
   UNDO_DELETE_ACTION_VNF_INSTANCE = "UNDO_DELETE_VNF_INSTANCE",
-  UPDATE_VNF_POSITION = "UPDATE_VNF_POISTION"
+  UPDATE_VNF_POSITION = "UPDATE_VNF_POISTION",
+  UPGRADE_VNF_ACTION = "UPGRADE_VNF_ACTION",
+  UNDO_UPGRADE_VNF_ACTION = "UNDO_UPGRADE_VNF_ACTION"
+}
+
+export enum VNFMethods{
+  UPGRADE = "upgrade",
+  UNDO_UPGRADE = "undoUpgrade"
 }
 
 
@@ -32,6 +39,16 @@ export interface UpdateVnfInstanceAction extends Action {
   vnfStoreKey?:string;
 }
 
+export interface UpgradeVnfAction extends Action {
+  serviceUuid: string;
+  vnfStoreKey:string;
+}
+
+export interface UndoUpgradeVnfAction extends Action {
+  serviceUuid: string;
+  vnfStoreKey:string;
+}
+
 export interface RemoveVnfInstanceAction extends Action {
   vnfStoreKey: string;
   serviceId?: string;
@@ -82,9 +99,14 @@ export const updateVnfPosition: ActionCreator<UpdateVnfPosition> = (node, instan
   vnfStoreKey : vnfStoreKey
 });
 
+export const upgradeVnf: ActionCreator<UpgradeVnfAction> = (vnfStoreKey, serviceUuid) => ({
+  type: VNFActions.UPGRADE_VNF_ACTION,
+  serviceUuid,
+  vnfStoreKey
+});
 
-
-
-
-
-
+export const undoUpgradeVnf: ActionCreator<UndoUpgradeVnfAction> = (vnfStoreKey, serviceUuid) => ({
+  type: VNFActions.UNDO_UPGRADE_VNF_ACTION,
+  serviceUuid,
+  vnfStoreKey
+});
index a5e37fc..5027775 100644 (file)
@@ -2,7 +2,7 @@ import {VnfInstance} from "../../../models/vnfInstance";
 import {
   CreateVnfInstanceAction,
   RemoveVnfInstanceAction,
-  UpdateVnfPosition,
+  UpdateVnfPosition, UpgradeVnfAction,
   VNFActions
 } from "./vnf.actions";
 import {vnfReducer} from "./vnf.reducers";
@@ -15,7 +15,7 @@ describe('vnfReducer', () => {
     vnfInstance.isMissingData = false;
     vnfInstance.instanceName = 'instanceName';
     let vnfState = vnfReducer(<any>{
-      serviceInstance : {
+        serviceInstance : {
           'serviceModelId' : {
             vnfs : {
               "vnfStoreKey" : {
@@ -129,7 +129,49 @@ describe('vnfReducer', () => {
     expect(vnfs['vnfStoreKey']).toBeUndefined();
   });
 
-});
+  test('#UPGRADE_VNF_ACTION', () => {
+    const vnfStoreKey: string  = 'vnfStoreKey';
+    const serviceModelId: string  = 'serviceModelId';
+    let vnfs = vnfReducer(<any>{serviceInstance : {
+          [serviceModelId] : {
+            vnfs : {
+              [vnfStoreKey] : {
+                isMissingData : true,
+                action : 'None'
+              }
+            }
+          }
+        }},
+      <UpgradeVnfAction>{
+        type: VNFActions.UPGRADE_VNF_ACTION,
+        vnfStoreKey: vnfStoreKey,
+        serviceUuid: serviceModelId
+      }).serviceInstance[serviceModelId].vnfs[vnfStoreKey];
 
+    expect(vnfs).toBeDefined();
+    expect(vnfs[vnfStoreKey]).toBeUndefined();
+  });
+  test('#UNDO_UPGRADE_VNF_ACTION', () => {
+    const vnfStoreKey: string  = 'vnfStoreKey';
+    const serviceModelId: string  = 'serviceModelId';
+    let vnfs = vnfReducer(<any>{serviceInstance : {
+          [serviceModelId] : {
+            vnfs : {
+              [vnfStoreKey] : {
+                isMissingData : true,
+                action : 'None_Upgrade'
+              }
+            }
+          }
+        }},
+      <UpgradeVnfAction>{
+        type: VNFActions.UNDO_UPGRADE_VNF_ACTION,
+        vnfStoreKey: vnfStoreKey,
+        serviceUuid: serviceModelId
+      }).serviceInstance[serviceModelId].vnfs[vnfStoreKey];
 
+    expect(vnfs).toBeDefined();
+    expect(vnfs[vnfStoreKey]).toBeUndefined();
+  });
 
+});
index 072634f..c5cd88a 100644 (file)
@@ -3,7 +3,7 @@ import {VnfInstance} from "../../../models/vnfInstance";
 import {
   CreateVnfInstanceAction,
   RemoveVnfInstanceAction,
-  UpdateVnfInstanceAction, UpdateVnfPosition,
+  UpdateVnfInstanceAction, UpdateVnfPosition, UpgradeVnfAction,
   VNFActions
 } from "./vnf.actions";
 import * as _ from "lodash";
@@ -55,7 +55,6 @@ export function vnfReducer(state: ServiceState, action: Action): ServiceState {
 
     case VNFActions.DELETE_ACTION_VNF_INSTANCE : {
       return deleteFirstLevel(state, <ActionOnFirstLevel>action,true);
-
     }
 
     case VNFActions.UNDO_DELETE_ACTION_VNF_INSTANCE : {
@@ -77,13 +76,56 @@ export function vnfReducer(state: ServiceState, action: Action): ServiceState {
 
     case VNFActions.UPDATE_VNF_POSITION : {
       let newState = _.cloneDeep(state);
-      newState.serviceInstance[(<UpdateVnfPosition>action).instanceId].vnfs[(<UpdateVnfPosition>action).vnfStoreKey].position = (<UpdateVnfPosition>action).node.position;
+      newState.serviceInstance[(<UpdateVnfPosition>action).instanceId]
+        .vnfs[(<UpdateVnfPosition>action).vnfStoreKey]
+        .position = (<UpdateVnfPosition>action).node.position;
       return newState;
     }
-  }
-}
 
+    case VNFActions.UPGRADE_VNF_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UpgradeVnfAction>action;
+      let oldAction = clonedState
+        .serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].action;
+      if(!oldAction.includes("Upgrade")) {
+        clonedState.serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey]
+          .action = (`${oldAction}_Upgrade`) as ServiceInstanceActions;
+      }
+
+      if(_.isNil(clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter)) {
+        clonedState.serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter = 1;
+        return clonedState;
+      }
+      clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter++;
+      return clonedState;
+    }
 
+    case VNFActions.UNDO_UPGRADE_VNF_ACTION: {
+      let clonedState = _.cloneDeep(state);
+      const castingAction = <UpgradeVnfAction>action;
+      if(clonedState.serviceInstance[castingAction.serviceUuid]
+        .vnfs[castingAction.vnfStoreKey]
+        .action.includes("Upgrade")) {
+        clonedState
+          .serviceInstance[castingAction.serviceUuid]
+          .vnfs[castingAction.vnfStoreKey].upgradedVFMSonsCounter--;
+        if(clonedState.serviceInstance[castingAction.serviceUuid].vnfs[castingAction.vnfStoreKey]
+          .upgradedVFMSonsCounter === 0){
+          clonedState.serviceInstance[castingAction.serviceUuid]
+            .vnfs[castingAction.vnfStoreKey]
+            .action = ServiceInstanceActions.None;
+        }
+      }
+      return clonedState;
+    }
+
+  }
+}
 
 
 const updateUniqueNames = (oldName: string, newName: string, serviceInstance: ServiceInstance): void => {
@@ -108,8 +150,3 @@ export const calculateNextUniqueModelName = (vnfModelName: string, serviceId: st
     }
   }
 };
-
-
-
-
-
index ef289df..400a4d8 100644 (file)
@@ -82,6 +82,7 @@ export module Constants {
     public static SERVICE_MODLES_INSTANCES_SUBSCRIBERS_PATH = 'serviceModels.htm#/instances/subscribers';
     public static SERVICES_DIST_STATUS_PATH = '../../rest/models/services?distributionStatus=';
     public static SERVICES_PATH = '../../rest/models/services/';
+    public static SERVICE_LATEST_VERSION = '../../aai_get_newest_model_version_by_invariant/';
     public static SERVICETYPE_SUB_PATH = '&serviceType=';
     public static SERVICEINSTANCEID_SUB_PATH = '&serviceInstanceId=';
     public static SERVICEMODELS_INSTANCES_SERVICES_PATH = 'serviceModels.htm#/instances/services';