Update simulators for CSIT test cases

Issue-ID: OPTFRA-922
Signed-off-by: hariharan97 <hariharan.38@wipro.com>
Change-Id: I3d83a4d048d01a982f70ec9ab126e8bb4634299c

diff --git a/conductor/conductor/tests/functional/simulators/aaisim/aai_imposter.jsont b/conductor/conductor/tests/functional/simulators/aaisim/aai_imposter.jsont
index 777bcb2..5f50aae 100644 (file)
--- a/conductor/conductor/tests/functional/simulators/aaisim/aai_imposter.jsont
+++ b/conductor/conductor/tests/functional/simulators/aaisim/aai_imposter.jsont
@@ -25,6 +25,50 @@
       ]
     }]
   },
+  {
+    "responses": [
+      { "is": { 
+           "statusCode": 200,
+           "body": {{ get_service_profile_response }}
+         }
+      }
+    ],
+    "predicates": [{
+      "and": [
+        {
+          "equals": {
+            "path": "/aai/v14/nodes/service-instances/service-instance/1c7046f2-a5a3-4d7f-9da8-388ee641a795",
+            "method": "GET",
+            "query": {
+               "depth": 2
+            }
+          }
+        }
+      ]
+    }]
+  },
+  {
+    "responses": [
+      { "is": { 
+           "statusCode": 200,
+           "body": {{ get_slice_profile_response }}
+         }
+      }
+    ],
+    "predicates": [{
+      "and": [
+        {
+          "equals": {
+            "path": "/aai/v14/nodes/service-instances/service-instance/8be299a9-ec8a-4321-8529-545f14e89808",
+            "method": "GET",
+            "query": {
+               "depth": 2
+            }
+          }
+        }
+      ]
+    }]
+  },
   {
     "responses": [
       { "is": {

diff --git a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nsi_response.json b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nsi_response.json
index 3d3f080..e28307f 100644 (file)
--- a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nsi_response.json
+++ b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nsi_response.json
@@ -34,50 +34,30 @@
                         "property-value": "csi_test_0211"
                     }
                 ]
-            }
-        ]
-    },
-    "service-profiles": {
-        "service-profile": [
-            {
-                "profile-id": "cdad9f49-4201-4e3a-aac1-b0f27902c299",
-                "latency": 20,
-                "max-number-of-UEs": 0,
-                "coverage-area-TA-list": "Chennai",
-                "ue-mobility-level": "stationary",
-                "resource-sharing-level": "0",
-                "exp-data-rate-UL": 100,
-                "exp-data-rate-DL": 100,
-                "activity-factor": 0,
-                "e2e-latency": 0,
-                "jitter": 0,
-                "survival-time": 0,
-                "exp-data-rate": 0,
-                "payload-size": 0,
-                "traffic-density": 0,
-                "conn-density": 0,
-                "reliability": 99.999,
-                "resource-version": "1581418602494"
             },
             {
-                "profile-id": "fe579f49-4201-4e3a-aac1-b0f27902c276",
-                "latency": 17,
-                "max-number-of-UEs": 0,
-                "coverage-area-TA-list": "Chennai",
-                "ue-mobility-level": "stationary",
-                "resource-sharing-level": "0",
-                "exp-data-rate-UL": 100,
-                "exp-data-rate-DL": 100,
-                "activity-factor": 0,
-                "e2e-latency": 0,
-                "jitter": 0,
-                "survival-time": 0,
-                "exp-data-rate": 0,
-                "payload-size": 0,
-                "traffic-density": 0,
-                "conn-density": 0,
-                "reliability": 99.999,
-                "resource-version": "1581418602494"
+                "related-to": "allotted-resource",
+                "relationship-label": "org.onap.relationships.inventory.Uses",
+                "related-link": "/aai/v21/business/customers/customer/5GCustomer/service-subscriptions/service-subscription/5G/service-instances/service-instance/1c7046f2-a5a3-4d7f-9da8-388ee641a795/allotted-resources/allotted-resource/462e46c2-cd84-45e4-a6c1-77f4ef88328d",
+                "relationship-data": [{
+                    "relationship-key": "customer.global-customer-id",
+                    "relationship-value": "5GCustomer"
+                }, {
+                    "relationship-key": "service-subscription.service-type",
+                    "relationship-value": "5G"
+                }, {
+                    "relationship-key": "service-instance.service-instance-id",
+                    "relationship-value": "1c7046f2-a5a3-4d7f-9da8-388ee641a795"
+                }, {
+                    "relationship-key": "allotted-resource.id",
+                    "relationship-value": "462e46c2-cd84-45e4-a6c1-77f4ef88328d"
+                }],
+                  "related-to-property": [{
+                    "property-key": "allotted-resource.description"
+                }, {
+                    "property-key": "allotted-resource.allotted-resource-name",
+                    "property-value": "serviceProfile_ar_1812"
+                }]
             }
         ]
     }

diff --git a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nssi_response.json b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nssi_response.json
index 0e00ca3..0e76264 100644 (file)
--- a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nssi_response.json
+++ b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_nssi_response.json
@@ -35,31 +35,30 @@
                         "property-value": "nsi_test_0211"
                     }
                 ]
-            }
-        ]
-    },
-    "slice-profiles": {
-        "slice-profile": [
-            {
-                "profile-id": "cdad9f49-4201-4e3a-aac1-b0f27902c299",
-                "latency": 20,
-                "max-number-of-UEs": 0,
-                "coverage-area-TA-list": "Chennai",
-                "ue-mobility-level": "stationary",
-                "resource-sharing-level": "0",
-                "exp-data-rate-UL": 100,
-                "exp-data-rate-DL": 100,
-                "activity-factor": 0,
-                "e2e-latency": 0,
-                "jitter": 0,
-                "survival-time": 0,
-                "exp-data-rate": 0,
-                "payload-size": 0,
-                "traffic-density": 0,
-                "conn-density": 0,
-                "reliability": 99.999,
-                "resource-version": "1581418602494"
-            }
+            }, {
+      "related-to": "allotted-resource",
+      "relationship-label": "org.onap.relationships.inventory.Uses",
+      "related-link": "/aai/v21/business/customers/customer/5GCustomer/service-subscriptions/service-subscription/5G/service-instances/service-instance/1c7046f2-a5a3-4d7f-9da8-388ee641a795/allotted-resources/allotted-resource/462e46c2-cd84-45e4-a6c1-77f4ef88328d",
+      "relationship-data": [{
+        "relationship-key": "customer.global-customer-id",
+        "relationship-value": "5GCustomer"
+      }, {
+        "relationship-key": "service-subscription.service-type",
+        "relationship-value": "5G"
+      }, {
+        "relationship-key": "service-instance.service-instance-id",
+        "relationship-value": "8be299a9-ec8a-4321-8529-545f14e89808"
+      }, {
+        "relationship-key": "allotted-resource.id",
+        "relationship-value": "462e46c2-cd84-45e4-a6c1-77f4ef88328d"
+      }],
+      "related-to-property": [{
+        "property-key": "allotted-resource.description"
+      }, {
+        "property-key": "allotted-resource.allotted-resource-name",
+        "property-value": "sliceProfile_ar_1812"
+      }]
+    }
         ]
     }
 }]}

diff --git a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_service_profile_response.json b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_service_profile_response.json
new file mode 100644 (file)
index 0000000..97db608
--- /dev/null
+++ b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_service_profile_response.json
@@ -0,0 +1,75 @@
+{
+    "allotted-resources": {
+        "allotted-resource": [
+            {
+                "allotted-resource-name": "serviceProfile_ar_1812",
+                "id": "462e46c2-cd84-45e4-a6c1-77f4ef88328d",
+                "model-invariant-id": "3a3ec7f8-425f-4801-bed5-4df697fd9c67",
+                "model-version-id": "2c8e2fda-8103-4467-b820-6952bb95ed5c",
+                "relationship-list": {
+                    "relationship": [
+                        {
+                            "related-link": "/aai/v21/business/customers/customer/5GCustomer/service-subscriptions/service-subscription/5G/service-instances/service-instance/b49301c0-0964-420c-99ee-acc47a93da70",
+                            "related-to": "service-instance",
+                            "related-to-property": [
+                                {
+                                    "property-key": "service-instance.service-instance-name",
+                                    "property-value": "nssi_embb_nsst_1812"
+                                }
+                            ],
+                            "relationship-data": [
+                                {
+                                    "relationship-key": "customer.global-customer-id",
+                                    "relationship-value": "5GCustomer"
+                                },
+                                {
+                                    "relationship-key": "service-subscription.service-type",
+                                    "relationship-value": "5G"
+                                },
+                                {
+                                    "relationship-key": "service-instance.service-instance-id",
+                                    "relationship-value": "b49301c0-0964-420c-99ee-acc47a93da70"
+                                }
+                            ],
+                            "relationship-label": "org.onap.relationships.inventory.Uses"
+                        }
+                    ]
+                },
+                "resource-version": "1612348253454",
+                "type": "Allotted Resource"
+            }
+        ]
+    },
+    "environment-context": "01-5B179BD4",
+    "model-invariant-id": "96db48e6-7d62-4007-a0dd-b7e5322032a0",
+    "model-version-id": "7fca6ef0-5eea-4d4b-9312-75770de5a3a5",
+    "orchestration-status": "activated",
+    "resource-version": "1608296844317",
+    "service-instance-id": "1c7046f2-a5a3-4d7f-9da8-388ee641a795",
+    "service-instance-name": "embb_serviceProfile_1812",
+    "service-role": "e2eserviceprofile-service",
+    "service-profiles": {
+        "service-profile": [
+            {
+                "profile-id": "fe579f49-4201-4e3a-aac1-b0f27902c276",
+                "latency": 17,
+                "max-number-of-UEs": 0,
+                "coverage-area-TA-list": "Chennai",
+                "ue-mobility-level": "stationary",
+                "resource-sharing-level": "0",
+                "exp-data-rate-UL": 100,
+                "exp-data-rate-DL": 100,
+                "activity-factor": 0,
+                "e2e-latency": 0,
+                "jitter": 0,
+                "survival-time": 0,
+                "exp-data-rate": 0,
+                "payload-size": 0,
+                "traffic-density": 0,
+                "conn-density": 0,
+                "reliability": 99.999,
+                "resource-version": "1581418602494"
+            }
+        ]
+    }
+}

diff --git a/conductor/conductor/tests/functional/simulators/aaisim/responses/get_slice_profile_response.json b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_slice_profile_response.json
new file mode 100644 (file)
index 0000000..f0ff6f4
--- /dev/null
+++ b/conductor/conductor/tests/functional/simulators/aaisim/responses/get_slice_profile_response.json
@@ -0,0 +1,75 @@
+{
+    "allotted-resources": {
+        "allotted-resource": [
+            {
+                "allotted-resource-name": "sliceProfile_ar_1812",
+                "id": "462e46c2-cd84-45e4-a6c1-77f4ef88328d",
+                "model-invariant-id": "3a3ec7f8-425f-4801-bed5-4df697fd9c67",
+                "model-version-id": "2c8e2fda-8103-4467-b820-6952bb95ed5c",
+                "relationship-list": {
+                    "relationship": [
+                        {
+                            "related-link": "/aai/v21/business/customers/customer/5GCustomer/service-subscriptions/service-subscription/5G/service-instances/service-instance/b49301c0-0964-420c-99ee-acc47a93da70",
+                            "related-to": "service-instance",
+                            "related-to-property": [
+                                {
+                                    "property-key": "service-instance.service-instance-name",
+                                    "property-value": "nssi_embb_nsst_1812"
+                                }
+                            ],
+                            "relationship-data": [
+                                {
+                                    "relationship-key": "customer.global-customer-id",
+                                    "relationship-value": "5GCustomer"
+                                },
+                                {
+                                    "relationship-key": "service-subscription.service-type",
+                                    "relationship-value": "5G"
+                                },
+                                {
+                                    "relationship-key": "service-instance.service-instance-id",
+                                    "relationship-value": "b49301c0-0964-420c-99ee-acc47a93da70"
+                                }
+                            ],
+                            "relationship-label": "org.onap.relationships.inventory.Uses"
+                        }
+                    ]
+                },
+                "resource-version": "1612348253454",
+                "type": "Allotted Resource"
+            }
+        ]
+    },
+    "environment-context": "01-5B179BD4",
+    "model-invariant-id": "96db48e6-7d62-4007-a0dd-b7e5322032a0",
+    "model-version-id": "7fca6ef0-5eea-4d4b-9312-75770de5a3a5",
+    "orchestration-status": "activated",
+    "resource-version": "1608296844317",
+    "service-instance-id": "8be299a9-ec8a-4321-8529-545f14e89808",
+    "service-instance-name": "embb_sliceProfile_1812",
+    "service-role": "e2esliceprofile-service",
+    "slice-profiles": {
+        "slice-profile": [
+            {
+                "profile-id": "cdad9f49-4201-4e3a-aac1-b0f27902c299",
+                "latency": 20,
+                "max-number-of-UEs": 0,
+                "coverage-area-TA-list": "Chennai",
+                "ue-mobility-level": "stationary",
+                "resource-sharing-level": "0",
+                "exp-data-rate-UL": 100,
+                "exp-data-rate-DL": 100,
+                "activity-factor": 0,
+                "e2e-latency": 0,
+                "jitter": 0,
+                "survival-time": 0,
+                "exp-data-rate": 0,
+                "payload-size": 0,
+                "traffic-density": 0,
+                "conn-density": 0,
+                "reliability": 99.999,
+                "resource-version": "1581418602494"
+            }
+        ]
+    }
+}