Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 146 insertions, 144 deletions

diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
index d34da2bea..6f23f3192 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json
@@ -12,7 +12,7 @@
     "serviceEcompNaming": "false",
     "instantiationType": "Macro",
     "inputs": {
-      "2017488_adiodvpe0_ASN": {
+      "2017488_pasqualevpe0_ASN": {
         "type": "string",
         "description": "AV/PE",
         "entry_schema": null,
@@ -24,15 +24,17 @@
     },
     "vidNotions": {
       "instantiationUI": "legacy",
-      "modelCategory": "other"
+      "viewEditUI": "legacy",
+      "modelCategory": "other",
+      "instantiationType": "Macro"
     }
   },
   "vnfs": {
-    "2017-388_ADIOD-vPE 1": {
+    "2017-388_PASQUALE-vPE 1": {
       "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413",
       "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
-      "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-      "name": "2017-388_ADIOD-vPE",
+      "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+      "name": "2017-388_PASQUALE-vPE",
       "version": "1.0",
       "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a",
       "inputs": {
@@ -95,37 +97,37 @@
         "vnf_config_template_version": {
           "displayName": "vnf_config_template_version",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+          "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
         },
         "bandwidth_units": {
           "displayName": "bandwidth_units",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "ASN": {
           "displayName": "ASN",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_ASN"
+          "inputName": "2017488_pasqualevpe0_ASN"
         },
         "vnf_instance_name": {
           "displayName": "vnf_instance_name",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_instance_name"
+          "inputName": "2017488_pasqualevpe0_vnf_instance_name"
         }
       },
       "properties": {
         "vmxvre_retype": "RE-VMX",
-        "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+        "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
         "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
         "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
         "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -170,7 +172,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+        "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
         "vnf_name": "mtnj309me6vre",
         "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
         "vmxvre_volume_type_1": "HITACHI",
@@ -178,14 +180,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -195,7 +197,7 @@
         "vmxvre_ore_present": "0",
         "vmxvre_volume_name_0": "vREXI_FBVolume",
         "vmxvre_type": "0",
-        "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+        "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
         "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
         "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
         "vmx_int_ctl_len": "24",
@@ -209,16 +211,16 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 1",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 1",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-388_ADIOD-vPE 0": {
+    "2017-388_PASQUALE-vPE 0": {
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-      "name": "2017-388_ADIOD-vPE",
+      "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+      "name": "2017-388_PASQUALE-vPE",
       "version": "4.0",
       "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
       "inputs": {
@@ -281,37 +283,37 @@
         "vnf_config_template_version": {
           "displayName": "vnf_config_template_version",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+          "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
         },
         "bandwidth_units": {
           "displayName": "bandwidth_units",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "ASN": {
           "displayName": "ASN",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_ASN"
+          "inputName": "2017488_pasqualevpe0_ASN"
         },
         "vnf_instance_name": {
           "displayName": "vnf_instance_name",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_instance_name"
+          "inputName": "2017488_pasqualevpe0_vnf_instance_name"
         }
       },
       "properties": {
         "vmxvre_retype": "RE-VMX",
-        "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+        "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
         "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
         "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
         "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -357,7 +359,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+        "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
         "vnf_name": "mtnj309me6vre",
         "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
         "vmxvre_volume_type_1": "HITACHI",
@@ -365,14 +367,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -382,7 +384,7 @@
         "vmxvre_ore_present": "0",
         "vmxvre_volume_name_0": "vREXI_FBVolume",
         "vmxvre_type": "0",
-        "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+        "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
         "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
         "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
         "vmx_int_ctl_len": "24",
@@ -396,16 +398,16 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-388_ADIOD-vPE 0",
+      "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
       "vfModules": {},
       "volumeGroups": {},
       "vfcInstanceGroups": {}
     },
-    "2017-488_ADIOD-vPE 0": {
+    "2017-488_PASQUALE-vPE 0": {
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
-      "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
-      "name": "2017-488_ADIOD-vPE",
+      "description": "Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM",
+      "name": "2017-488_PASQUALE-vPE",
       "version": "5.0",
       "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45",
       "inputs": {
@@ -468,37 +470,37 @@
         "vnf_config_template_version": {
           "displayName": "vnf_config_template_version",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_config_template_version"
+          "inputName": "2017488_pasqualevpe0_vnf_config_template_version"
         },
         "bandwidth_units": {
           "displayName": "bandwidth_units",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth_units"
+          "inputName": "pasqualevpe0_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "adiodvpe0_bandwidth"
+          "inputName": "pasqualevpe0_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_AIC_CLLI"
+          "inputName": "2017488_pasqualevpe0_AIC_CLLI"
         },
         "ASN": {
           "displayName": "ASN",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_ASN"
+          "inputName": "2017488_pasqualevpe0_ASN"
         },
         "vnf_instance_name": {
           "displayName": "vnf_instance_name",
           "command": "get_input",
-          "inputName": "2017488_adiodvpe0_vnf_instance_name"
+          "inputName": "2017488_pasqualevpe0_vnf_instance_name"
         }
       },
       "properties": {
         "vmxvre_retype": "RE-VMX",
-        "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version",
+        "vnf_config_template_version": "get_input:2017488_pasqualevpe0_vnf_config_template_version",
         "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
         "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
         "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
@@ -545,7 +547,7 @@
         "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
         "vmxvre_int_ctl_ip_0": "10.0.0.10",
         "ecomp_generated_naming": "false",
-        "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI",
+        "AIC_CLLI": "get_input:2017488_pasqualevpe0_AIC_CLLI",
         "vnf_name": "mtnj309me6vre",
         "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
         "vmxvre_volume_type_1": "HITACHI",
@@ -553,14 +555,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:adiodvpe0_bandwidth_units",
+        "bandwidth_units": "get_input:pasqualevpe0_bandwidth_units",
         "vnf_id": "123",
         "vmxvre_oam_prefix": "24",
         "availability_zone_0": "mtpocfo-kvm-az01",
-        "ASN": "get_input:2017488_adiodvpe0_ASN",
+        "ASN": "get_input:2017488_pasqualevpe0_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:adiodvpe0_bandwidth",
+        "bandwidth": "get_input:pasqualevpe0_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -570,7 +572,7 @@
         "vmxvre_ore_present": "0",
         "vmxvre_volume_name_0": "vREXI_FBVolume",
         "vmxvre_type": "0",
-        "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name",
+        "vnf_instance_name": "get_input:2017488_pasqualevpe0_vnf_instance_name",
         "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
         "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
         "vmx_int_ctl_len": "24",
@@ -584,21 +586,21 @@
         "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
       },
       "type": "VF",
-      "modelCustomizationName": "2017-488_ADIOD-vPE 0",
+      "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
       "vfModules": {
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
           "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "baseModule": false
           },
           "inputs": {
@@ -608,10 +610,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_config_template_version"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
               "constraints": null,
               "required": true,
               "default": "17.2"
@@ -622,10 +624,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth_units"
               },
-              "fromInputName": "adiodvpe0_bandwidth_units",
+              "fromInputName": "pasqualevpe0_bandwidth_units",
               "constraints": null,
               "required": true,
               "default": "Gbps"
@@ -636,10 +638,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth"
               },
-              "fromInputName": "adiodvpe0_bandwidth",
+              "fromInputName": "pasqualevpe0_bandwidth",
               "constraints": null,
               "required": true,
               "default": "10"
@@ -650,10 +652,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "AIC_CLLI"
               },
-              "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
               "constraints": null,
               "required": true,
               "default": "ATLMY8GA"
@@ -664,10 +666,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_instance_name"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
               "constraints": null,
               "required": true,
               "default": "mtnj309me6"
@@ -675,37 +677,37 @@
           },
           "volumeGroupAllowed": true
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
           "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
           "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
           "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+          "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
           "version": "5",
-          "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
           "properties": {
             "minCountInstances": 1,
             "maxCountInstances": 1,
             "initialCount": 1,
-            "vfModuleLabel": "ADIOD_base_vPE_BV",
+            "vfModuleLabel": "PASQUALE_base_vPE_BV",
             "baseModule": true
           },
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
           "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "ADIOD_vPFE_BV",
+            "vfModuleLabel": "PASQUALE_vPFE_BV",
             "baseModule": false
           },
           "inputs": {},
@@ -713,19 +715,19 @@
         }
       },
       "volumeGroups": {
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
           "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
           "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
           "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "version": "6",
-          "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "baseModule": false
           },
           "inputs": {
@@ -735,10 +737,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_config_template_version"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+              "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
               "constraints": null,
               "required": true,
               "default": "17.2"
@@ -749,10 +751,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth_units"
               },
-              "fromInputName": "adiodvpe0_bandwidth_units",
+              "fromInputName": "pasqualevpe0_bandwidth_units",
               "constraints": null,
               "required": true,
               "default": "Gbps"
@@ -763,10 +765,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "bandwidth"
               },
-              "fromInputName": "adiodvpe0_bandwidth",
+              "fromInputName": "pasqualevpe0_bandwidth",
               "constraints": null,
               "required": true,
               "default": "10"
@@ -777,10 +779,10 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "AIC_CLLI"
               },
-              "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+              "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
               "constraints": null,
               "required": true,
               "default": "ATLMY8GA"
@@ -791,29 +793,29 @@
               "entry_schema": null,
               "inputProperties": {
                 "sourceType": "HEAT",
-                "vfModuleLabel": "ADIOD_vRE_BV",
+                "vfModuleLabel": "PASQUALE_vRE_BV",
                 "paramName": "vnf_instance_name"
               },
-              "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+              "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
               "constraints": null,
               "required": true,
               "default": "mtnj309me6"
             }
           }
         },
-        "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
           "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
           "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
           "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
           "description": null,
-          "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "version": "6",
-          "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+          "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "ADIOD_vPFE_BV",
+            "vfModuleLabel": "PASQUALE_vPFE_BV",
             "baseModule": false
           },
           "inputs": {}
@@ -823,24 +825,24 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "ADIOD_vRE_BV",
+        "vfModuleLabel": "PASQUALE_vRE_BV",
         "baseModule": false
       },
       "inputs": {
@@ -850,10 +852,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_config_template_version"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+          "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
           "constraints": null,
           "required": true,
           "default": "17.2"
@@ -864,10 +866,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth_units"
           },
-          "fromInputName": "adiodvpe0_bandwidth_units",
+          "fromInputName": "pasqualevpe0_bandwidth_units",
           "constraints": null,
           "required": true,
           "default": "Gbps"
@@ -878,10 +880,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth"
           },
-          "fromInputName": "adiodvpe0_bandwidth",
+          "fromInputName": "pasqualevpe0_bandwidth",
           "constraints": null,
           "required": true,
           "default": "10"
@@ -892,10 +894,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "AIC_CLLI"
           },
-          "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+          "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
           "constraints": null,
           "required": true,
           "default": "ATLMY8GA"
@@ -906,10 +908,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_instance_name"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+          "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
           "constraints": null,
           "required": true,
           "default": "mtnj309me6"
@@ -917,37 +919,37 @@
       },
       "volumeGroupAllowed": true
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
       "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
       "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091",
       "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+      "name": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
       "version": "5",
-      "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
       "properties": {
         "minCountInstances": 1,
         "maxCountInstances": 1,
         "initialCount": 1,
-        "vfModuleLabel": "ADIOD_base_vPE_BV",
+        "vfModuleLabel": "PASQUALE_base_vPE_BV",
         "baseModule": true
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "ADIOD_vPFE_BV",
+        "vfModuleLabel": "PASQUALE_vPFE_BV",
         "baseModule": false
       },
       "inputs": {},
@@ -955,19 +957,19 @@
     }
   },
   "volumeGroups": {
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
       "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
       "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
       "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "name": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "version": "6",
-      "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "ADIOD_vRE_BV",
+        "vfModuleLabel": "PASQUALE_vRE_BV",
         "baseModule": false
       },
       "inputs": {
@@ -977,10 +979,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_config_template_version"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
+          "fromInputName": "2017488_pasqualevpe0_vnf_config_template_version",
           "constraints": null,
           "required": true,
           "default": "17.2"
@@ -991,10 +993,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth_units"
           },
-          "fromInputName": "adiodvpe0_bandwidth_units",
+          "fromInputName": "pasqualevpe0_bandwidth_units",
           "constraints": null,
           "required": true,
           "default": "Gbps"
@@ -1005,10 +1007,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "bandwidth"
           },
-          "fromInputName": "adiodvpe0_bandwidth",
+          "fromInputName": "pasqualevpe0_bandwidth",
           "constraints": null,
           "required": true,
           "default": "10"
@@ -1019,10 +1021,10 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "AIC_CLLI"
           },
-          "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
+          "fromInputName": "2017488_pasqualevpe0_AIC_CLLI",
           "constraints": null,
           "required": true,
           "default": "ATLMY8GA"
@@ -1033,29 +1035,29 @@
           "entry_schema": null,
           "inputProperties": {
             "sourceType": "HEAT",
-            "vfModuleLabel": "ADIOD_vRE_BV",
+            "vfModuleLabel": "PASQUALE_vRE_BV",
             "paramName": "vnf_instance_name"
           },
-          "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
+          "fromInputName": "2017488_pasqualevpe0_vnf_instance_name",
           "constraints": null,
           "required": true,
           "default": "mtnj309me6"
         }
       }
     },
-    "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": {
+    "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
       "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
       "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
       "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557",
       "description": null,
-      "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "name": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "version": "6",
-      "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2",
+      "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "ADIOD_vPFE_BV",
+        "vfModuleLabel": "PASQUALE_vPFE_BV",
         "baseModule": false
       },
       "inputs": {}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
index a749e5787..0c462b32f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json
@@ -2,13 +2,13 @@
   "service": {
     "uuid": "a1531622-4e08-43fa-9ffd-222090cab7d2",
     "invariantUuid": "c54c1178-ab4b-498c-aea0-52cc2043d44f",
-    "name": "mdns_2017_1011_IST_Service",
+    "name": "CHARLOTTE_2017_1011_IST_Service",
     "version": "5.0",
     "toscaModelURL": null,
     "category": "Emanuel",
     "serviceType": "",
     "serviceRole": "",
-    "description": "mdns_2017_1011_IST_Service -Creating Service for PID 298109a",
+    "description": "CHARLOTTE_2017_1011_IST_Service -Creating Service for PID 298109a",
     "serviceEcompNaming": "true",
     "instantiationType": "ClientConfig",
     "inputs": {},
@@ -19,29 +19,29 @@
     }
   },
   "vnfs": {
-    "mdns_2017_1011_IST_Vf 0": {
+    "CHARLOTTE_2017_1011_IST_Vf 0": {
       "uuid": "e54ac8ab-746b-494d-918a-efab23a50e0d",
       "invariantUuid": "b22715a2-4ec1-4e2f-bf4f-d79fa9519707",
-      "description": "mdns_2017_1011_IST_Vf -Creating for PID 298109a",
-      "name": "mdns_2017_1011_IST_Vf",
+      "description": "CHARLOTTE_2017_1011_IST_Vf -Creating for PID 298109a",
+      "name": "CHARLOTTE_2017_1011_IST_Vf",
       "version": "4.0",
       "customizationUuid": "efa526df-e1f5-4fda-9e0d-475cb5e44e4f",
       "inputs": {},
       "commands": {},
       "properties": {
-        "nf_naming": "{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyMobility1710.*, ecomp_generated_naming=true}",
+        "nf_naming": "{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyEmanuel1710.*, ecomp_generated_naming=true}",
         "multi_stage_design": "false",
         "availability_zone_max_count": "1",
         "ecomp_generated_naming": "true",
         "node_count": "4.0",
-        "dns_image_name": "NIMBUS_MDNS_3.0.4.qcow2",
+        "dns_image_name": "KENNEDY_CHARLOTTE_3.0.4.qcow2",
         "route_eth0": "135.144.38.211/32 via 107.239.83.1 dev eth0 155.165.201.253/32 via 107.239.83.1 dev eth0 141.204.0.0/16 via 107.239.83.1 dev eth0 ",
         "dns_flavor_name": "nv.c4r4d80"
       },
       "type": "VF",
-      "modelCustomizationName": "mdns_2017_1011_IST_Vf 0",
+      "modelCustomizationName": "CHARLOTTE_2017_1011_IST_Vf 0",
       "vfModules": {
-        "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
+        "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
           "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90",
           "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b",
           "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de",
@@ -59,7 +59,7 @@
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
+        "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
           "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45",
           "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159",
           "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232",
@@ -83,12 +83,12 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
+    "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": {
       "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90",
       "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b",
       "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de",
@@ -106,7 +106,7 @@
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
+    "CHARLOTTE_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": {
       "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45",
       "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159",
       "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232",