Merge automation from ECOMP's repository

Reference commit in ECOMP: 8e92a8c6

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

2 files changed, 28 insertions, 28 deletions

diff --git a/vid-automation/conf/services b/vid-automation/conf/services
index 85e0552f6..36139d7fa 100644
--- a/vid-automation/conf/services
+++ b/vid-automation/conf/services
@@ -6,7 +6,7 @@
     "invariantUuid": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
     "name": "1707vidnf",
     "version": "9.0",
-    "category": "Mobility",
+    "category": "Emanuel",
     "description": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code.",
     "serviceRole" : "pnf"
   },
@@ -37,7 +37,7 @@
     "name": "action-data",
     "version": "1.0",
     "category": "Network L1-3",
-    "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+    "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
     "serviceRole": "Testing"
   },
   "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": {
@@ -47,7 +47,7 @@
       "name": "action-data",
       "version": "1.0",
       "category": "Network L1-3",
-      "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+      "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
       "serviceRole": "Testing"
     }}
 }
\ No newline at end of file
diff --git a/vid-automation/conf/users b/vid-automation/conf/users
index e2bc05a85..757b04c78 100644
--- a/vid-automation/conf/users
+++ b/vid-automation/conf/users
@@ -13,19 +13,19 @@
             "userId": "1",
             "password": "1"
           },
-          "roles": ["USP VOICE___VIRTUAL USP", "USP VOICE___HOSTED COMMUNICATIONS", "MSO_1610_ST___HOSTED COMMUNICATIONS", "MSO_1610_ST___MSO-dev-service-type", "MSO_1610_ST___VIRTUAL USP"],
-          "subscriberNames": ["USP VOICE", "MSO_1610_ST"],
-          "serviceTypes": ["VIRTUAL USP", "HOSTED COMMUNICATIONS", "MSO-dev-service-type"],
+          "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"],
+          "serviceTypes": ["TYLER SILVIA", "DARREN MCGEE", "MSO-dev-service-type"],
           "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
         },
-        "mobilityMobility": {
+        "emanuelEmanuel": {
           "credentials": {
             "userId": "3",
             "password": "3"
           },
-          "roles": ["Mobility___Mobility"],
-          "subscriberNames": ["Mobility"],
-          "serviceTypes": ["Mobility"],
+          "roles": ["Emanuel___Emanuel"],
+          "subscriberNames": ["Emanuel"],
+          "serviceTypes": ["Emanuel"],
           "tenants": ["c630e297a3ae486497d63eacec1d7c14", "d3b49834f7164cbe831bfbfa35ef649b"]
         },
         "FIREWALL_AIM_Trans": {
@@ -33,19 +33,19 @@
              "userId": "667",
              "password": "667"
            },
-           "roles": ["FIREWALL/MISC___AIM Transport"],
-           "subscriberNames": ["FIREWALL/MISC"],
+           "roles": ["CRAIG/ROBERTS___AIM Transport"],
+           "subscriberNames": ["CRAIG/ROBERTS"],
            "serviceTypes": ["AIM Transport"],
            "tenants": null
          },
-        "mobilityVMMSC": {
+        "emanuelvWINIFRED": {
           "credentials": {
             "userId": "4",
             "password": "4"
           },
-          "roles": ["Mobility___vMMSC", "Mobility___vFlowLogic"],
-          "subscriberNames": ["Mobility"],
-          "serviceTypes": ["vMMSC", "vFlowLogic"],
+          "roles": ["Emanuel___vWINIFRED", "Emanuel___vFlowLogic"],
+          "subscriberNames": ["Emanuel"],
+          "serviceTypes": ["vWINIFRED", "vRichardson"],
           "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
         },
         "Porfirio Gerhardt": {
@@ -54,36 +54,36 @@
             "password": "822"
           },
           "roles": [
-            "PACKET CORE___Mobility",
-            "PACKET CORE___vFlowLogic"
+            "JULIO ERICKSON___Emanuel",
+            "JULIO ERICKSON___vFlowLogic"
 
           ],
-          "subscriberNames": ["PACKET CORE"],
-          "serviceTypes": ["Mobility", "vFlowLogic"],
+          "subscriberNames": ["JULIO ERICKSON"],
+          "serviceTypes": ["Emanuel", "vRichardson"],
           "tenants": null
         },
-        "Mobility vFlowLogic": {
+        "Emanuel vFlowLogic": {
           "credentials": {
             "userId": "321",
             "password": "312"
           },
           "roles": [
-            "Mobility___vFlowLogic"
+            "Emanuel___vFlowLogic"
           ],
-          "subscriberNames": ["Mobility"],
-          "serviceTypes": ["vFlowLogic"],
+          "subscriberNames": ["Emanuel"],
+          "serviceTypes": ["vRichardson"],
           "tenants": null
         },
-        "Mobility_with_tenant" : {
+        "Emanuel_with_tenant" : {
           "credentials": {
             "userId": "321",
             "password": "312"
           },
           "roles": [
-            "Mobility___vMMSC___test-mtn6-09"
+            "Emanuel___vWINIFRED___test-hvf6-09"
           ],
-          "subscriberNames": ["Mobility"],
-          "serviceTypes": ["vFlowLogic"],
+          "subscriberNames": ["Emanuel"],
+          "serviceTypes": ["vRichardson"],
           "tenants": null
         }
       }