diff options
author | 2021-02-23 15:32:45 +0000 | |
---|---|---|
committer | 2021-02-23 15:32:45 +0000 | |
commit | 1c840a4e3bc9dc9fe389d460e1bb1c0666614955 (patch) | |
tree | 49e1dd43f260df6023a18a9a81b3fa94b0224e6d /cps-service/src/test/resources/e2e | |
parent | 861ecab596c548d77cc18f1581a992159ada82ee (diff) |
Updating RAN Inventory tests to use the latest model and data
Issue-ID: CPS-200
Signed-off-by: niamhcore <niamh.core@est.tech>
Change-Id: I22fbfd66a2f355f38dc4502445df8041ed0db7c5
Diffstat (limited to 'cps-service/src/test/resources/e2e')
-rw-r--r-- | cps-service/src/test/resources/e2e/basic/cps-ran-inventory-data.json | 59 | ||||
-rw-r--r-- | cps-service/src/test/resources/e2e/basic/cps-ran-inventory@2021-01-28.yang (renamed from cps-service/src/test/resources/e2e/basic/cps-ran-inventory.yang) | 99 |
2 files changed, 84 insertions, 74 deletions
diff --git a/cps-service/src/test/resources/e2e/basic/cps-ran-inventory-data.json b/cps-service/src/test/resources/e2e/basic/cps-ran-inventory-data.json index 1dbdab2ca..fb2efb1c9 100644 --- a/cps-service/src/test/resources/e2e/basic/cps-ran-inventory-data.json +++ b/cps-service/src/test/resources/e2e/basic/cps-ran-inventory-data.json @@ -1,31 +1,34 @@ { -"ran-inventory":{ - "rannfnssiid": "14559ead-f4fe-4c1c-a94c-8015fad3ea35", - "subnetStatus": "active", - "nsstid": "2372a5dc-ee24-4a45-85f5-65103dfdc5b4", - "slicetype": "embb", - "isshareable": "Shareable", - "sliceProfilesList": [ - { - "sliceProfileId": "f33a9dd8-ae51-4acf-8073-c9390c25f6f1", - "sNSSAI": "001-11000", - "maxNumberofUEs": 300, - "latency": 5, - "uLThptPerSlice": 40, - "dLThptPerSlice": 50, - "maxNumberofConns": 500, - "uEMobilityLevel": "FULLY MOBILITY", - "coverageAreaList": [ - "Washington" - ], - "resourceSharingLevel": "Shareable", - "pLMNIdList": [ - { - "mcc": "310", - "mnc": "410" - } - ] - } - ] + "cps-ran-inventory:ran-inventory":{ + "ran-slices":[{ + "rannfnssiid": "14559ead-f4fe-4c1c-a94c-8015fad3ea35", + "subnetStatus": "active", + "nsstid": "2372a5dc-ee24-4a45-85f5-65103dfdc5b4", + "slicetype": "embb", + "isshareable": "Shareable", + "sliceProfilesList": [ + { + "sliceProfileId": "f33a9dd8-ae51-4acf-8073-c9390c25f6f1", + "sNSSAI": "001-11000", + "maxNumberofUEs": 300, + "latency": 5, + "uLThptPerSlice": 40, + "dLThptPerSlice": 50, + "maxNumberofConns": 500, + "uEMobilityLevel": "FULLY MOBILITY", + "coverageAreaList": [ + "Washington" + ], + "resourceSharingLevel": "Shareable", + "pLMNIdList": [ + { + "mcc": "310", + "mnc": "410" + } + ] + } + ] + } + ] } }
\ No newline at end of file diff --git a/cps-service/src/test/resources/e2e/basic/cps-ran-inventory.yang b/cps-service/src/test/resources/e2e/basic/cps-ran-inventory@2021-01-28.yang index 0e504cafa..c16a68251 100644 --- a/cps-service/src/test/resources/e2e/basic/cps-ran-inventory.yang +++ b/cps-service/src/test/resources/e2e/basic/cps-ran-inventory@2021-01-28.yang @@ -57,46 +57,46 @@ module cps-ran-inventory { } grouping SliceProfile{ - leaf sliceProfileId{ - type string; - mandatory true; - description "slice profile id"; - } - leaf sNSSAI{ - type string; - mandatory false; - description "The S-NSSAI may include both the SST and SD fields (in which case the S-NSSAI length is 32 bits in total), or the S-NSSAI may just include the SST field (in which case the S-NSSAI length is 8 bits only)"; - } - leaf maxNumberofUEs{ - type int64 { range "0..68719476735"; } - mandatory false; - description "maximum number of UEs"; - } - leaf latency{ - type int64 { range "0..68719476735"; } - mandatory false; - description "latency of the slice requested by the operator"; - } - leaf uLThptPerSlice{ - type int64 { range "0..68719476735"; } - mandatory false; - description "uplink throughput of the slice requested by the operator"; - } - leaf dLThptPerSlice{ - type int64 { range "0..68719476735"; } - mandatory false; - description "downlink throughput of the slice requested by the operator"; - } - leaf maxNumberofConns{ - type int64 { range "0..68719476735"; } - mandatory false; - description "maximum number of connections to be served by the slice"; - } - leaf uEMobilityLevel{ - type string; - mandatory false; - description "Mobility level of the UE"; - } + leaf sliceProfileId{ + type string; + mandatory true; + description "slice profile id"; + } + leaf sNSSAI{ + type string; + mandatory false; + description "The S-NSSAI may include both the SST and SD fields (in which case the S-NSSAI length is 32 bits in total), or the S-NSSAI may just include the SST field (in which case the S-NSSAI length is 8 bits only)"; + } + leaf maxNumberofUEs{ + type int64 { range "0..68719476735"; } + mandatory false; + description "maximum number of UEs"; + } + leaf latency{ + type int64 { range "0..68719476735"; } + mandatory false; + description "latency of the slice requested by the operator"; + } + leaf uLThptPerSlice{ + type int64 { range "0..68719476735"; } + mandatory false; + description "uplink throughput of the slice requested by the operator"; + } + leaf dLThptPerSlice{ + type int64 { range "0..68719476735"; } + mandatory false; + description "downlink throughput of the slice requested by the operator"; + } + leaf maxNumberofConns{ + type int64 { range "0..68719476735"; } + mandatory false; + description "maximum number of connections to be served by the slice"; + } + leaf uEMobilityLevel{ + type string; + mandatory false; + description "Mobility level of the UE"; + } leaf resourceSharingLevel{ type string; description "Resource sharing level"; @@ -117,7 +117,7 @@ module cps-ran-inventory { uses PLMNId; } - } + } grouping PLMNId { description @@ -141,17 +141,17 @@ module cps-ran-inventory { } } - container ran-inventory{ + grouping ran-slices{ leaf rannfnssiid{ description "NSSI of a RAN network function"; type string; } list sliceProfilesList{ - uses SliceProfile; - key "sliceProfileId"; - description "List of slice profiles supported by the ran slice"; - } + uses SliceProfile; + key "sliceProfileId"; + description "List of slice profiles supported by the ran slice"; + } leaf subnetStatus{ description "status of RAN NF NSSI"; @@ -173,4 +173,11 @@ module cps-ran-inventory { type string; } } + container ran-inventory{ + list ran-slices{ + uses ran-slices; + key "rannfnssiid"; + description "List of RAN Slices"; + } + } } |