Update slice/service profiles

Issue-ID: OPTFRA-979

Signed-off-by: deepikasatheesh <deepika.s84@wipro.com>
Change-Id: I863f5c0a734e184c3aac80f492cc2bea359570c2

diff --git a/apps/nst/optimizers/conf/configIinputs.json b/apps/nst/optimizers/conf/configIinputs.json
index d4140f9..11247bb 100644 (file)
--- a/apps/nst/optimizers/conf/configIinputs.json
+++ b/apps/nst/optimizers/conf/configIinputs.json
@@ -18,7 +18,7 @@
                                "skip_post_instantiation_configuration": "true",
                                "controller_actor": "SO-REF-DATA",
                                "sNSSAI": "01-3226E7D1",
-                               "plmnIdList": "39-00",
+                               "pLMNIdList": "39-00",
                                "sST": "embb",
                                "uEMobilityLevel": "stationary",
                                "activityFactor": "0",

diff --git a/config/slicing_config.yaml b/config/slicing_config.yaml
index 1dd01ce..e456aec 100644 (file)
--- a/config/slicing_config.yaml
+++ b/config/slicing_config.yaml
@@ -16,11 +16,11 @@ attribute_mapping:
     latency: latency
     resourceSharingLevel: resource_sharing_level
     uEMobilityLevel: ue_mobility_level
-    maxNumberOfUEs: max_number_of_ues
+    maxNumberofUEs: max_number_of_ues
     dLThptPerUE: dl_thpt_per_ue
     uLThptPerUE: ul_thpt_per_ue
     sNSSAI: s_nssai
-    plmnIdList: plmn_id_list
+    pLMNIdList: plmn_id_list
     activityFactor: activity_factor
     coverageAreaTAList: coverage_area_ta_list
     availability: availability
@@ -31,11 +31,11 @@ attribute_mapping:
     expDataRateDL: exp_data_rate_dl
     uLThptPerSlice: ul_thpt_per_slice
     expDataRateUL: exp_data_rate_ul
-    MaxPktSize: max_pkt_size
+    maxPktSize: max_pkt_size
     msgSizeByte: msg_size_byte
-    maxNumberOfConns: max_number_of_conns
-    maxNumberOfPDUSessions: max_number_of_pdu_sessions
-    terminalDensity: terminal_density
+    maxNumberofConns: max_number_of_conns
+    maxNumberofPDUSessions: max_number_of_pdu_sessions
+    termDensity: terminal_density
     survivalTime: survival_time
     areaTrafficCapDL: area_traffic_cap_dl
     areaTrafficCapUL: area_traffic_cap_ul
@@ -47,6 +47,10 @@ attribute_mapping:
     sliceProfileId: slice_profile_id
     snssaiList: s_nssai_list
     domainType: domain_type
+    logicInterfaceId: logical_interface_id
+    ipAddress: ip_address
+    nextHopInfo: next_hop_info
+    perfReq: perf_req
 
   snake_to_camel:
     max_bandwidth: maxBandwidth
@@ -55,11 +59,11 @@ attribute_mapping:
     latency: latency
     resource_sharing_level: resourceSharingLevel
     ue_mobility_level: uEMobilityLevel
-    max_number_of_ues: maxNumberOfUEs
+    max_number_of_ues: maxNumberofUEs
     dl_thpt_per_ue: dLThptPerUE
     ul_thpt_per_ue: uLThptPerUE
     s_nssai: sNSSAI
-    plmn_id_list: plmnIdList
+    plmn_id_list: pLMNIdList
     activity_factor: activityFactor
     coverage_area_ta_list: coverageAreaTAList
     availability: availability
@@ -70,11 +74,11 @@ attribute_mapping:
     exp_data_rate_dl: expDataRateDL
     ul_thpt_per_slice: uLThptPerSlice
     exp_data_rate_ul: expDataRateUL
-    max_pkt_size: MaxPktSize
+    max_pkt_size: maxPktSize
     msg_size_byte: msgSizeByte
-    max_number_of_conns: maxNumberOfConns
-    max_number_of_pdu_sessions: maxNumberOfPDUSessions
-    terminal_density: terminalDensity
+    max_number_of_conns: maxNumberofConns
+    max_number_of_pdu_sessions: maxNumberofPDUSessions
+    terminal_density: termDensity
     survival_time: survivalTime
     area_traffic_cap_dl: areaTrafficCapDL
     area_traffic_cap_ul: areaTrafficCapUL
@@ -86,3 +90,7 @@ attribute_mapping:
     slice_profile_id: sliceProfileId
     s_nssai_list: snssaiList
     domain_type: domainType
+    logical_interface_id: logicInterfaceId
+    ip_address: ipAddress
+    next_hop_info: nextHopInfo
+    perf_req: perfReq

diff --git a/test/apps/slice_selection/new_solution_nsi_response.json b/test/apps/slice_selection/new_solution_nsi_response.json
index 3fbeffe..52624b6 100644 (file)
--- a/test/apps/slice_selection/new_solution_nsi_response.json
+++ b/test/apps/slice_selection/new_solution_nsi_response.json
@@ -14,7 +14,7 @@
                   "latency": 10,
                   "reliability": 99.99,
                   "uEMobilityLevel": "stationary",
-                  "maxNumberOfUEs": 100
+                  "maxNumberofUEs": 100
                },
                {
                   "domainType": "CN",

diff --git a/test/apps/slice_selection/nsi_selection_request.json b/test/apps/slice_selection/nsi_selection_request.json
index acd23a2..39fb925 100644 (file)
--- a/test/apps/slice_selection/nsi_selection_request.json
+++ b/test/apps/slice_selection/nsi_selection_request.json
@@ -55,9 +55,9 @@
          "capabilityDetails":{
              "latency": "4",
              "reliability": "99.9",
-             "maxNumberOfUEs": "10",
+             "maxNumberofUEs": "10",
              "maxThroughput": "50",
-             "terminalDensity": "60"
+             "termDensity": "60"
          }
       },
       {
@@ -65,9 +65,9 @@
          "capabilityDetails":{
              "latency": "3",
              "reliability": "99.9",
-             "maxNumberOfUEs": "10",
+             "maxNumberofUEs": "10",
              "maxThroughput": "50",
-             "terminalDensity": "60"
+             "termDensity": "60"
          }
       },
       {
@@ -75,9 +75,9 @@
          "capabilityDetails":{
              "latency": "2",
              "reliability": "99.9",
-             "maxNumberOfUEs": "10",
+             "maxNumberofUEs": "10",
              "maxThroughput": "50",
-             "terminalDensity": "60"
+             "termDensity": "60"
          }
       }
    ]

diff --git a/test/functest/simulators/simulated-config/slicing_config.yaml b/test/functest/simulators/simulated-config/slicing_config.yaml
index 1dd01ce..e456aec 100644 (file)
--- a/test/functest/simulators/simulated-config/slicing_config.yaml
+++ b/test/functest/simulators/simulated-config/slicing_config.yaml
@@ -16,11 +16,11 @@ attribute_mapping:
     latency: latency
     resourceSharingLevel: resource_sharing_level
     uEMobilityLevel: ue_mobility_level
-    maxNumberOfUEs: max_number_of_ues
+    maxNumberofUEs: max_number_of_ues
     dLThptPerUE: dl_thpt_per_ue
     uLThptPerUE: ul_thpt_per_ue
     sNSSAI: s_nssai
-    plmnIdList: plmn_id_list
+    pLMNIdList: plmn_id_list
     activityFactor: activity_factor
     coverageAreaTAList: coverage_area_ta_list
     availability: availability
@@ -31,11 +31,11 @@ attribute_mapping:
     expDataRateDL: exp_data_rate_dl
     uLThptPerSlice: ul_thpt_per_slice
     expDataRateUL: exp_data_rate_ul
-    MaxPktSize: max_pkt_size
+    maxPktSize: max_pkt_size
     msgSizeByte: msg_size_byte
-    maxNumberOfConns: max_number_of_conns
-    maxNumberOfPDUSessions: max_number_of_pdu_sessions
-    terminalDensity: terminal_density
+    maxNumberofConns: max_number_of_conns
+    maxNumberofPDUSessions: max_number_of_pdu_sessions
+    termDensity: terminal_density
     survivalTime: survival_time
     areaTrafficCapDL: area_traffic_cap_dl
     areaTrafficCapUL: area_traffic_cap_ul
@@ -47,6 +47,10 @@ attribute_mapping:
     sliceProfileId: slice_profile_id
     snssaiList: s_nssai_list
     domainType: domain_type
+    logicInterfaceId: logical_interface_id
+    ipAddress: ip_address
+    nextHopInfo: next_hop_info
+    perfReq: perf_req
 
   snake_to_camel:
     max_bandwidth: maxBandwidth
@@ -55,11 +59,11 @@ attribute_mapping:
     latency: latency
     resource_sharing_level: resourceSharingLevel
     ue_mobility_level: uEMobilityLevel
-    max_number_of_ues: maxNumberOfUEs
+    max_number_of_ues: maxNumberofUEs
     dl_thpt_per_ue: dLThptPerUE
     ul_thpt_per_ue: uLThptPerUE
     s_nssai: sNSSAI
-    plmn_id_list: plmnIdList
+    plmn_id_list: pLMNIdList
     activity_factor: activityFactor
     coverage_area_ta_list: coverageAreaTAList
     availability: availability
@@ -70,11 +74,11 @@ attribute_mapping:
     exp_data_rate_dl: expDataRateDL
     ul_thpt_per_slice: uLThptPerSlice
     exp_data_rate_ul: expDataRateUL
-    max_pkt_size: MaxPktSize
+    max_pkt_size: maxPktSize
     msg_size_byte: msgSizeByte
-    max_number_of_conns: maxNumberOfConns
-    max_number_of_pdu_sessions: maxNumberOfPDUSessions
-    terminal_density: terminalDensity
+    max_number_of_conns: maxNumberofConns
+    max_number_of_pdu_sessions: maxNumberofPDUSessions
+    terminal_density: termDensity
     survival_time: survivalTime
     area_traffic_cap_dl: areaTrafficCapDL
     area_traffic_cap_ul: areaTrafficCapUL
@@ -86,3 +90,7 @@ attribute_mapping:
     slice_profile_id: sliceProfileId
     s_nssai_list: snssaiList
     domain_type: domainType
+    logical_interface_id: logicInterfaceId
+    ip_address: ipAddress
+    next_hop_info: nextHopInfo
+    perf_req: perfReq