Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

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

3 files changed, 57 insertions, 57 deletions

diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
index 4a0dc2422..df0fed086 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json
@@ -40,72 +40,72 @@
       "type": "VF",
       "modelCustomizationName": "092017_VSP_GINGERby11 0",
       "vfModules": {
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_vmt..module-1": {
           "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd",
           "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78",
           "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_vmt..module-1",
+          "name": "092017VspGingerby11..CORNELIUS_vmt..module-1",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_vmt..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_vmt"
+            "vfModuleLabel": "CORNELIUS_vmt"
           },
           "inputs": {},
           "volumeGroupAllowed": false
         },
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
           "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
           "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
           "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_mmn..module-2",
+          "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_mmn"
+            "vfModuleLabel": "CORNELIUS_mmn"
           },
           "inputs": {},
           "volumeGroupAllowed": true
         },
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_base..module-0": {
           "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749",
           "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653",
           "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_base..module-0",
+          "name": "092017VspGingerby11..CORNELIUS_base..module-0",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_base..module-0",
           "properties": {
             "minCountInstances": 1,
             "maxCountInstances": 1,
             "initialCount": 1,
-            "vfModuleLabel": "pxmc_base"
+            "vfModuleLabel": "CORNELIUS_base"
           },
           "inputs": {},
           "volumeGroupAllowed": false
         }
       },
       "volumeGroups": {
-        "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+        "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
           "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
           "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
           "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
           "description": null,
-          "name": "092017VspGingerby11..pxmc_mmn..module-2",
+          "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "version": "1",
-          "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+          "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
             "initialCount": 0,
-            "vfModuleLabel": "pxmc_mmn"
+            "vfModuleLabel": "CORNELIUS_mmn"
           },
           "inputs": {}
         }
@@ -114,76 +114,76 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_vmt..module-1": {
       "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd",
       "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78",
       "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_vmt..module-1",
+      "name": "092017VspGingerby11..CORNELIUS_vmt..module-1",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_vmt..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_vmt"
+        "vfModuleLabel": "CORNELIUS_vmt"
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_base..module-0": {
       "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749",
       "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653",
       "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_base..module-0",
+      "name": "092017VspGingerby11..CORNELIUS_base..module-0",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_base..module-0",
       "properties": {
         "minCountInstances": 1,
         "maxCountInstances": 1,
         "initialCount": 1,
-        "vfModuleLabel": "pxmc_base"
+        "vfModuleLabel": "CORNELIUS_base"
       },
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
       "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
       "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
       "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_mmn..module-2",
+      "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_mmn"
+        "vfModuleLabel": "CORNELIUS_mmn"
       },
       "inputs": {},
       "volumeGroupAllowed": true
     }
   },
   "volumeGroups": {
-    "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": {
+    "092017_vsp_gingerby110..092017VspGingerby11..CORNELIUS_mmn..module-2": {
       "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6",
       "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d",
       "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457",
       "description": null,
-      "name": "092017VspGingerby11..pxmc_mmn..module-2",
+      "name": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "version": "1",
-      "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2",
+      "modelCustomizationName": "092017VspGingerby11..CORNELIUS_mmn..module-2",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
         "initialCount": 0,
-        "vfModuleLabel": "pxmc_mmn"
+        "vfModuleLabel": "CORNELIUS_mmn"
       },
       "inputs": {}
     }
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
index fe7efe36f..2da74cf8a 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json
@@ -99,7 +99,7 @@
       "modelCustomizationName": "ExtVL 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "serviceProxies": {},
   "vfModules": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
index 12d1c273a..7ccd9778f 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json
@@ -15,7 +15,7 @@
   },
   "vnfs": {},
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
     "Port Mirroring Configuration By Policy 1": {
       "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c",
@@ -35,9 +35,9 @@
       "type": "Configuration",
       "modelCustomizationName": "Port Mirroring Configuration By Policy 1",
       "sourceNodes": [
-        "vmmeservice2_proxy 2",
-        "vmmeservice2_proxy 3",
-        "vmmeservice_proxy 1"
+        "vflorenceservice2_proxy 2",
+        "vflorenceservice2_proxy 3",
+        "vflorenceservice_proxy 1"
       ],
       "collectorNodes": [
         "pprobeservice_proxy 5"
@@ -62,9 +62,9 @@
       "type": "Configuration",
       "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
       "sourceNodes": [
-        "vmmeservice2_proxy 2",
-        "vmmeservice_proxy 1",
-        "vmmeservice_proxy 0"
+        "vflorenceservice2_proxy 2",
+        "vflorenceservice_proxy 1",
+        "vflorenceservice_proxy 0"
       ],
       "collectorNodes": [
         "pprobeservice_proxy 4"
@@ -73,11 +73,11 @@
     }
   },
   "serviceProxies": {
-    "vmmeservice_proxy 0": {
+    "vflorenceservice_proxy 0": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService",
-      "name": "vmmeService Service Proxy",
+      "description": "A Proxy for Service vflorenceService",
+      "name": "vflorenceService Service Proxy",
       "version": "1.0",
       "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17",
       "inputs": {},
@@ -86,13 +86,13 @@
       "type": "Service Proxy",
       "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
       "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
-      "sourceModelName": "vmmeService"
+      "sourceModelName": "vflorenceService"
     },
-    "vmmeservice_proxy 1": {
+    "vflorenceservice_proxy 1": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService",
-      "name": "vmmeService Service Proxy",
+      "description": "A Proxy for Service vflorenceService",
+      "name": "vflorenceService Service Proxy",
       "version": "1.0",
       "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb",
       "inputs": {},
@@ -101,13 +101,13 @@
       "type": "Service Proxy",
       "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
       "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
-      "sourceModelName": "vmmeService"
+      "sourceModelName": "vflorenceService"
     },
-    "vmmeservice2_proxy 3": {
+    "vflorenceservice2_proxy 3": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService2",
-      "name": "vmmeService2 Service Proxy",
+      "description": "A Proxy for Service vflorenceService2",
+      "name": "vflorenceService2 Service Proxy",
       "version": "1.0",
       "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a",
       "inputs": {},
@@ -116,7 +116,7 @@
       "type": "Service Proxy",
       "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
       "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
-      "sourceModelName": "vmmeService2"
+      "sourceModelName": "vflorenceService2"
     },
     "pprobeservice_proxy 4": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
@@ -148,11 +148,11 @@
       "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
       "sourceModelName": "pProbeService"
     },
-    "vmmeservice2_proxy 2": {
+    "vflorenceservice2_proxy 2": {
       "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
       "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
-      "description": "A Proxy for Service vmmeService2",
-      "name": "vmmeService2 Service Proxy",
+      "description": "A Proxy for Service vflorenceService2",
+      "name": "vflorenceService2 Service Proxy",
       "version": "1.0",
       "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17",
       "inputs": {},
@@ -161,7 +161,7 @@
       "type": "Service Proxy",
       "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
       "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
-      "sourceModelName": "vmmeService2"
+      "sourceModelName": "vflorenceService2"
     }
   },
   "vfModules": {},