Merge branch...

Merge branch 'feat/237-elaborate-ietf-slice-nbi-to-support-adding-deleting-new-sdp-connection-group-and-match' into camara-demo-integration

src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/ietf_slice_handler.py

@@ -104,7 +104,11 @@ def validate_ietf_slice_data(request_data: Dict) -> None:
 class IETFSliceHandler:
     @staticmethod
     def get_all_ietf_slices(context_client: ContextClient) -> Dict:
-        slices_list = context_client.ListSlices(Empty())
+        existing_context_ids = context_client.ListContextIds(Empty())
+        context_ids = list(existing_context_ids.context_ids)
+        if len(context_ids) != 1:
+            raise Exception("Number of contexts should be 1")
+        slices_list = context_client.ListSlices(context_ids[0])
         slices = slices_list.slices
         ietf_slices = {"network-slice-services": {"slice-service": []}}
         for slice in slices:

src/nbi/tests/data/camara-e2e-topology.json

@@ -41,14 +41,14 @@
                         "action": 1,
                         "custom": {
                             "resource_key": "_connect/address",
-                            "resource_value": "10.1.7.194"
+                            "resource_value": "10.1.6.201"
                         }
                     },
                     {
                         "action": 1,
                         "custom": {
                             "resource_key": "_connect/port",
-                            "resource_value": "80"
+                            "resource_value": "9091"
                         }
                     },
                     {
@@ -1659,4 +1659,4 @@
             ]
         }
     ]
-}
+}
\ No newline at end of file

src/nbi/tests/data/slice/post_network_slice2.json

@@ -156,8 +156,8 @@
                             },
                             {
                                 "id": 2,
-                                "p2mp-sender-sdp": "2",
-                                "p2mp-receiver-sdp": "1",
+                                "p2p-sender-sdp": "2",
+                                "p2p-receiver-sdp": "1",
                                 "service-slo-sle-policy": {
                                     "slo-policy": {
                                         "metric-bound": [
@@ -186,4 +186,4 @@
             }
         }
     ]
-}
+}
\ No newline at end of file