Merge automation from ECOMP's repository

[vid.git] / vid-automation / src / main / resources / registration_to_simulator / create_new_instance / aai_get_models_by_service_type_SILVIA_ROBBINS.json

diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_USP_VOICE.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
similarity index 99%
rename from vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_USP_VOICE.json
rename to vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
index df6a69a..af955a4 100644 (file)
--- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_USP_VOICE.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
@@ -10,7 +10,7 @@
               "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89"
             },
             "service-subscription": {
-              "service-type": "VIRTUAL USP"
+              "service-type": "TYLER SILVIA"
             }
           }
         ]
@@ -28,7 +28,7 @@
       "inventory-response-item": [
         {
           "service-subscription": {
-            "service-type": "VIRTUAL USP",
+            "service-type": "TYLER SILVIA",
             "resource-version": "1494001841964"
           },
           "extra-properties": {},
@@ -83,7 +83,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "e25c1753-d5f7-4b5e-880e-cdad5c2f74f7",
                   "service-instance-name": "lll052617B",
@@ -96,7 +96,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -104,7 +104,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -377,7 +377,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "28378666-89cd-47df-8ed9-fc1839a4b265",
                   "service-instance-name": "test_rt945klol4",
@@ -390,7 +390,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -398,7 +398,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -589,7 +589,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "5bfa3a21-65b3-4047-8455-69af6e8451f2",
                   "service-instance-name": "HHHKJKJKJKJKJ",
@@ -604,7 +604,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -612,7 +612,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -1353,7 +1353,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "f53eeb76-3011-4745-8bd4-fb725ee54e8b",
                   "service-instance-name": "bcvbcvc",
@@ -1366,7 +1366,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -1374,7 +1374,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -1775,7 +1775,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "d8f23bb5-5822-4374-8ece-964c0af90d60",
                   "service-instance-name": "lll052617A",
@@ -1788,7 +1788,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -1796,7 +1796,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -1861,7 +1861,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "f363b54e-ed50-4c7b-b404-b54291da2f25",
                   "service-instance-name": "test0450450",
@@ -1876,7 +1876,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -1884,7 +1884,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -1905,7 +1905,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "da3ac66a-fdcb-44b8-bef5-16bc0603acfc",
                   "service-instance-name": "dfhmg",
@@ -1918,7 +1918,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -1926,7 +1926,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -2847,7 +2847,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "6f9f86b0-ef30-45a6-b92b-df246a5c6168",
                   "service-instance-name": "mnbkjhgfddsa",
@@ -2862,7 +2862,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -2870,7 +2870,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -4879,7 +4879,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "45ae5259-949e-4163-ae40-61e564eb04ba",
                   "service-instance-name": "dfgbdfbgdf",
@@ -4894,7 +4894,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -4902,7 +4902,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -4967,7 +4967,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "6798f1fa-fb5c-4638-b1ff-b7b66052e71d",
                   "service-instance-name": "vid-test-creation-3333",
@@ -4982,7 +4982,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -4990,7 +4990,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -5447,7 +5447,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "643e277d-7dfe-4ff2-8894-a1ad18860d95",
                   "service-instance-name": "test_045004",
@@ -5462,7 +5462,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -5470,7 +5470,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -5579,7 +5579,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "16626bff-21ad-4a2b-820e-1894d06be31c",
                   "service-instance-name": "test0560560",
@@ -5594,7 +5594,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -5602,7 +5602,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -5711,7 +5711,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "f778648a-1db5-4fd2-9d6d-1c3e9dc810c9",
                   "service-instance-name": "test_0er50405",
@@ -5726,7 +5726,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -5734,7 +5734,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6147,7 +6147,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "e720e20f-9997-4e42-a959-a5e4f20135fd",
                   "service-instance-name": "hjgfdsfrg",
@@ -6162,7 +6162,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6170,7 +6170,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6235,7 +6235,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "a2a9e86a-2639-4d3d-8aae-24736c0aa5ac",
                   "service-instance-name": "test_94589485",
@@ -6250,7 +6250,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6258,7 +6258,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6279,7 +6279,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "8330708c-8d75-466a-9a95-4dd4c4b56863",
                   "service-instance-name": "almog-test-003",
@@ -6294,7 +6294,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6302,7 +6302,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6411,7 +6411,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "1d439d6d-5867-4522-a730-528256378011",
                   "service-instance-name": "test_84584",
@@ -6426,7 +6426,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6434,7 +6434,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6499,7 +6499,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "c9407d5f-0227-4335-b1b2-9148a5a27c0e",
                   "service-instance-name": "ready",
@@ -6514,7 +6514,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6522,7 +6522,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -6675,7 +6675,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2",
                   "service-instance-name": "test_jhgjhghh5",
@@ -6690,7 +6690,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -6698,7 +6698,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7029,7 +7029,7 @@
                 }
               },
               {
-                "model-name": "RG-7-7_mDNS_Service",
+                "model-name": "RG-7-7_CHARLOTTE_Service",
                 "service-instance": {
                   "service-instance-id": "ae3e6c21-8463-456e-a746-d9932c467e79",
                   "service-instance-name": "mdnsinstance",
@@ -7046,7 +7046,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "RG-7-7_mDNS_Service"
+                      "property-value": "RG-7-7_CHARLOTTE_Service"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -7054,7 +7054,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "RG-7-7_mDNS_Service"
+                      "property-value": "RG-7-7_CHARLOTTE_Service"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7251,7 +7251,7 @@
                 }
               },
               {
-                "model-name": "HNPortal SRIOV Provider Net 4",
+                "model-name": "WILKINS SRIOV Provider Net 4",
                 "service-instance": {
                   "service-instance-id": "1f9c366c-c3c2-4c7b-8f31-fa1ed8f440ad",
                   "service-instance-name": "",
@@ -7274,7 +7274,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "HNPortal SRIOV Provider Net 4"
+                      "property-value": "WILKINS SRIOV Provider Net 4"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7473,7 +7473,7 @@
                 }
               },
               {
-                "model-name": "VID-PCRF-05-15-17-SRVS",
+                "model-name": "VID-RODERICK-05-15-17-SRVS",
                 "service-instance": {
                   "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760",
                   "service-instance-name": "svc",
@@ -7488,7 +7488,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -7496,7 +7496,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "VID-PCRF-05-15-17-SRVS"
+                      "property-value": "VID-RODERICK-05-15-17-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7607,7 +7607,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "7c569714-4174-4d91-9fd0-14051794c3d2",
                   "service-instance-name": "sdfsdfdsf",
@@ -7622,7 +7622,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -7630,7 +7630,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7695,7 +7695,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "47f70a06-7846-44ff-9488-2d60536baf72",
                   "service-instance-name": "dfghdfghsdfg",
@@ -7710,7 +7710,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -7718,7 +7718,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7739,7 +7739,7 @@
                 }
               },
               {
-                "model-name": "HNPortal SRIOV Provider Net 4",
+                "model-name": "WILKINS SRIOV Provider Net 4",
                 "service-instance": {
                   "service-instance-id": "145dc127-918e-46dc-beca-fe07cc00c62b",
                   "service-instance-name": "",
@@ -7762,7 +7762,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "HNPortal SRIOV Provider Net 4"
+                      "property-value": "WILKINS SRIOV Provider Net 4"
                     },
                     {
                       "property-name": "model.model-type",
@@ -7827,7 +7827,7 @@
                 }
               },
               {
-                "model-name": "BK-PCRF-1707-SRVS",
+                "model-name": "BK-RODERICK-1707-SRVS",
                 "service-instance": {
                   "service-instance-id": "d712579c-75fd-4a8f-9378-bfb9bf3aaf58",
                   "service-instance-name": "demolynn",
@@ -7842,7 +7842,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "BK-PCRF-1707-SRVS"
+                      "property-value": "BK-RODERICK-1707-SRVS"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -7850,7 +7850,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "BK-PCRF-1707-SRVS"
+                      "property-value": "BK-RODERICK-1707-SRVS"
                     },
                     {
                       "property-name": "model.model-type",
@@ -9903,7 +9903,7 @@
                 }
               },
               {
-                "model-name": "ADIOD vCE Tenant OAM Network",
+                "model-name": "PASQUALE vCE Tenant OAM Network",
                 "service-instance": {
                   "service-instance-id": "13dec3b0-ab57-4359-b4ec-4db0811256fc",
                   "service-instance-name": "newadio",
@@ -9918,7 +9918,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PID 291364a : ASTRA Tenant OAM network model for vCE (ADIOD)"
+                      "property-value": "PID 291364a : ASTRA Tenant OAM network model for vCE (PASQUALE)"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -9926,7 +9926,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "ADIOD vCE Tenant OAM Network"
+                      "property-value": "PASQUALE vCE Tenant OAM Network"
                     },
                     {
                       "property-name": "model.model-type",
@@ -10265,7 +10265,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "54705472-6522-4d55-a6b8-091a3173f5dd",
                   "service-instance-name": "test_9934585345",
@@ -10280,7 +10280,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -10288,7 +10288,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -10441,10 +10441,10 @@
                 }
               },
               {
-                "model-name": "Mobility_VSP_Service",
+                "model-name": "Emanuel_VSP_Service",
                 "service-instance": {
                   "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147",
-                  "service-instance-name": "Mobility_VSP_Service_DS_0906_01",
+                  "service-instance-name": "Emanuel_VSP_Service_DS_0906_01",
                   "service-type": "",
                   "service-role": "",
                   "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c",
@@ -10456,7 +10456,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "Mobility_VSP_Service_msdn"
+                      "property-value": "Emanuel_VSP_Service_msdn"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -10464,7 +10464,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "Mobility_VSP_Service"
+                      "property-value": "Emanuel_VSP_Service"
                     },
                     {
                       "property-name": "model.model-type",
@@ -11568,7 +11568,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "54515abc-20c2-4852-9f79-f54530b1c17b",
                   "service-instance-name": "XSXSXXSX",
@@ -11583,7 +11583,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -11591,7 +11591,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -12211,7 +12211,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "e62bf002-1de0-4efb-9b5a-7f48ec5400f3",
                   "service-instance-name": "test_056056",
@@ -12226,7 +12226,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -12234,7 +12234,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -12299,7 +12299,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_TEST",
+                "model-name": "3_RODERICK_TEST",
                 "service-instance": {
                   "service-instance-id": "f001f409-8cd7-4e5a-b104-a193d0e596ab",
                   "service-instance-name": "test_0450450777",
@@ -12322,7 +12322,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_TEST"
+                      "property-value": "3_RODERICK_TEST"
                     },
                     {
                       "property-name": "model.model-type",
@@ -12705,7 +12705,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "6eeb541a-2976-4ae2-986f-1e34c7927983",
                   "service-instance-name": "test_lfgfjdf7",
@@ -12720,7 +12720,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -12728,7 +12728,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -12749,7 +12749,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "45a68dc7-6d41-47b1-b123-5c958abe49e3",
                   "service-instance-name": "test_jhjhjjh",
@@ -12764,7 +12764,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -12772,7 +12772,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -13062,7 +13062,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_SERV",
+                "model-name": "3_RODERICK_SERV",
                 "service-instance": {
                   "service-instance-id": "09e1de12-2b12-431c-abbe-cb786fba1d3e",
                   "service-instance-name": "test03490348",
@@ -13077,7 +13077,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "PCRF_SERV"
+                      "property-value": "RODERICK_SERV"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -13085,7 +13085,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_SERV"
+                      "property-value": "3_RODERICK_SERV"
                     },
                     {
                       "property-name": "model.model-type",
@@ -13428,7 +13428,7 @@
                 }
               },
               {
-                "model-name": "3_PCRF_TEST",
+                "model-name": "3_RODERICK_TEST",
                 "service-instance": {
                   "service-instance-id": "7b66fff7-15e3-4421-8e80-695ce78e9a40",
                   "service-instance-name": "test865555665",
@@ -13451,7 +13451,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "3_PCRF_TEST"
+                      "property-value": "3_RODERICK_TEST"
                     },
                     {
                       "property-name": "model.model-type",
@@ -15433,10 +15433,10 @@
                 }
               },
               {
-                "model-name": "Vmee_Mor_Service",
+                "model-name": "Vgeraldine_Mor_Service",
                 "service-instance": {
                   "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97",
-                  "service-instance-name": "vmee1",
+                  "service-instance-name": "vgeraldine1",
                   "service-type": "",
                   "service-role": "",
                   "environment-context": "General_Revenue-Bearing",
@@ -15450,7 +15450,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "Vmee_Mor_Service"
+                      "property-value": "Vgeraldine_Mor_Service"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -15458,7 +15458,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "Vmee_Mor_Service"
+                      "property-value": "Vgeraldine_Mor_Service"
                     },
                     {
                       "property-name": "model.model-type",