Merge from ecomp 718fd196 - Integration Tests

Issue-ID: VID-378

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

5 files changed, 49 insertions, 34 deletions

diff --git a/vid-automation/conf/categoryParams b/vid-automation/conf/categoryParams
index 57cfcdc49..5c8049bfe 100644
--- a/vid-automation/conf/categoryParams
+++ b/vid-automation/conf/categoryParams
@@ -21,25 +21,33 @@
       "categoryId": "1"
     },
     {
-      "name": "DFW",
+      "name": "WATKINS",
       "categoryId": "2"
     },
     {
-      "name": "ECOMP",
+      "name": "ONAP",
       "categoryId": "3"
     },
     {
-      "name": "Wireline",
+      "name": "Melissa",
       "categoryId": "4"
     },
     {
-      "name": "MetroPacketCore",
+      "name": "WayneHolland",
       "appId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
       "categoryId": "4"
     },
     {
       "name": "x1",
       "categoryId": "2"
+    },
+    {
+      "name": "1908.19",
+      "categoryId": "7"
+    },
+    {
+      "name": "1908.27",
+      "categoryId": "7"
     }
   ]
 }
\ No newline at end of file
diff --git a/vid-automation/conf/environments b/vid-automation/conf/environments
index ad12be2be..c917ec087 100644
--- a/vid-automation/conf/environments
+++ b/vid-automation/conf/environments
@@ -1,23 +1,29 @@
 {
     "headers": ["Environment ID", "Environment Name", "ECOMP Environment ID", "ECOMP Environment Name", "Tenant Context", "Environment Type", "Workload Context", "Status", "Action", "Attach Manifest"],
     "basicList": [
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""]
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""]
     ],
     "fullList": [
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST", "Inactive", "Activate", ""]
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST_1908.19", "INACTIVE", "Activate", ""]
+    ],
+    "fullListWithoutReleaseLabel": [
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST", "INACTIVE", "Activate", ""]
     ],
     "sortedList": [
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""],
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""]
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""],
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""]
 
     ],
     "filteredList": [
-        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""]
+        ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""]
     ]
 }
\ No newline at end of file
diff --git a/vid-automation/conf/newEnvironment b/vid-automation/conf/newEnvironment
index f34c0037e..0e7136b5b 100644
--- a/vid-automation/conf/newEnvironment
+++ b/vid-automation/conf/newEnvironment
@@ -5,5 +5,6 @@
   "EcompEnvironmentId": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
   "EcompEnvironmentName": "ECOMP Env Name",
   "tenantContext": "ECOMP Test",
-  "workloadContext": "VNF_TEST"
+  "workloadContext": "VNF_TEST",
+  "release": "1908.19"
 }
\ No newline at end of file
diff --git a/vid-automation/conf/serviceModels b/vid-automation/conf/serviceModels
index 8271e77a0..23ea480f2 100644
--- a/vid-automation/conf/serviceModels
+++ b/vid-automation/conf/serviceModels
@@ -1,34 +1,34 @@
 { "serviceModels": {
     "959a7ba0-89ee-4984-9af6-65d5bdda4b0e": {
-        "serviceName":	"ServicevMMSCPID298109",
-        "subscriberName": "Mobility",
+        "serviceName":	"ServicevWINIFREDPID298109",
+        "subscriberName": "Emanuel",
         "serviceInstanceName": "ggghhh",
-        "modelName": "VSP1710PID298109_vMMSC",
+        "modelName": "VSP1710PID298109_vWINIFRED",
         "modelInvariantUuid":	"e7961100-cde6-4b5a-bcda-b8945086950a",
         "modelVersion": "1.0",
         "modelUuid": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e",
         "modelCustomizationUuid":	"6b8fc7dc-2db1-4283-a222-b07d10595495",
-        "resourceName": "VSP1710PID298109_vMMSC 0",
-        "nfType": "MOBILITY MESSAGING",
-        "nfRole": "VMMSC",
+        "resourceName": "VSP1710PID298109_vWINIFRED 0",
+        "nfType": "EMANUEL MESSAGING",
+        "nfRole": "VWINIFRED",
         "nfFunction": "Multimedia Message Service Center",
         "nfNamingCode": "MMSC"
   },
      "d205e01d-e5da-4e68-8c52-f95cb0607959": {
-          "serviceName":	"ServicevMMSCPID298109",
-          "subscriberName": "Mobility",
+          "serviceName":	"ServicevWINIFREDPID298109",
+          "subscriberName": "Emanuel",
           "serviceInstanceName": "ggghhh",
-          "modelName": "Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8",
+          "modelName": "Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8",
           "modelInvariantUuid":	"d9f9c851-9543-476e-b3c2-a2e5284a26aa",
           "modelVersion": "1",
           "modelUuid": "d205e01d-e5da-4e68-8c52-f95cb0607959",
           "modelCustomizationUuid":	"e81b58ce-ae9b-4bde-9f81-9962a5007756"
    },
       "13f022c4-651e-4326-b8e1-61e9a8c7a7ad": {
-             "serviceName":	"ServicevMMSCPID298109",
-             "subscriberName": "Mobility",
+             "serviceName":	"ServicevWINIFREDPID298109",
+             "subscriberName": "Emanuel",
              "serviceInstanceName": "ggghhh",
-             "modelName": "Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3",
+             "modelName": "Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3",
              "modelInvariantUuid":	"6931e88a-fbcc-4ca9-8583-876b669c3106",
              "modelVersion": "1",
              "modelUuid": "13f022c4-651e-4326-b8e1-61e9a8c7a7ad",
diff --git a/vid-automation/conf/users b/vid-automation/conf/users
index 757b04c78..de18c38d7 100644
--- a/vid-automation/conf/users
+++ b/vid-automation/conf/users
@@ -13,8 +13,8 @@
             "userId": "1",
             "password": "1"
           },
-          "roles": ["SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___HOSTED COMMUNICATIONS", "CAR_2020_ER___HOSTED COMMUNICATIONS", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA"],
-          "subscriberNames": ["SILVIA ROBBINS", "CAR_2020_ER"],
+          "roles": ["SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___DARREN MCGEE", "CAR_2020_ER___DARREN MCGEE", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA","READ___LOGS___PERMITTED","Emanuel___mySubType", "global-customer-id___service-instance-type"],
+          "subscriberNames": ["SILVIA ROBBINS", "CAR_2020_ER", "Emanuel", "global-customer-id"],
           "serviceTypes": ["TYLER SILVIA", "DARREN MCGEE", "MSO-dev-service-type"],
           "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
         },
@@ -43,7 +43,7 @@
             "userId": "4",
             "password": "4"
           },
-          "roles": ["Emanuel___vWINIFRED", "Emanuel___vFlowLogic"],
+          "roles": ["Emanuel___vWINIFRED", "Emanuel___vRichardson"],
           "subscriberNames": ["Emanuel"],
           "serviceTypes": ["vWINIFRED", "vRichardson"],
           "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
@@ -55,20 +55,20 @@
           },
           "roles": [
             "JULIO ERICKSON___Emanuel",
-            "JULIO ERICKSON___vFlowLogic"
+            "JULIO ERICKSON___vRichardson"
 
           ],
           "subscriberNames": ["JULIO ERICKSON"],
           "serviceTypes": ["Emanuel", "vRichardson"],
           "tenants": null
         },
-        "Emanuel vFlowLogic": {
+        "Emanuel vRichardson": {
           "credentials": {
             "userId": "321",
             "password": "312"
           },
           "roles": [
-            "Emanuel___vFlowLogic"
+            "Emanuel___vRichardson"
           ],
           "subscriberNames": ["Emanuel"],
           "serviceTypes": ["vRichardson"],