merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 44 insertions, 0 deletions

diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json
new file mode 100644
index 000000000..c93191db1
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json
@@ -0,0 +1,19 @@
+{
+  "services": [
+    {
+      "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695",
+      "invariantUUID": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6",
+      "name": "Mobility Networking Svc Mode",
+      "version": "1.0",
+      "toscaModelURL": null,
+      "category": "service",
+      "lifecycleState": null,
+      "lastUpdaterUserId": null,
+      "lastUpdaterFullName": null,
+      "distributionStatus": "DISTRIBUTION_COMPLETE_OK",
+      "artifacts": null,
+      "resources": null
+    }
+  ],
+  "readOnly": false
+}
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json
new file mode 100644
index 000000000..90ca6128b
--- /dev/null
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json
@@ -0,0 +1,25 @@
+{
+  "service": {
+    "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695",
+    "invariantUuid": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6",
+    "name": "Mobility Networking Svc Mode",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Emanuel",
+    "serviceType": null,
+    "serviceRole": null,
+    "description": "single generic service model with mobility VLs in it to create any mobility network",
+    "serviceEcompNaming": "false",
+    "instantiationType": null,
+    "inputs": {}
+  },
+  "vnfs": {},
+  "networks": {},
+  "collectionResource": null,
+  "configurations": null,
+  "fabricConfigurations": {},
+  "serviceProxies": null,
+  "vfModules": null,
+  "volumeGroups": null,
+  "pnfs": null
+}