VOL-4076: Convert DT job sadis configs from MEF to IETF format.
Change-Id: Ifb9b6876aacb2c8791471a9ec4b389b0664e29ba
diff --git a/libraries/onos.robot b/libraries/onos.robot
index 1e2fd57..ab7bf8b 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -399,6 +399,42 @@
Should Be True ${matched} No bandwidth profile found for id: ${bw_profile_id}
[Return] ${cir} ${cbs} ${pir} ${pbs} ${gir}
+Verify Meters in ONOS Ietf
+ [Arguments] ${ip} ${port} ${olt_of_id} ${onu_port}
+ [Documentation] Verifies the meters with BW Ietf format (currently, DT workflow uses this format)
+ # Get programmed subscriber
+ ${programmed_sub}= Get Programmed Subscribers ${ip} ${port}
+ ... ${olt_of_id} ${onu_port}
+ Log ${programmed_sub}
+ ${us_bw_profile} ${ds_bw_profile} Get Upstream and Downstream Bandwidth Profile Name
+ ... ${programmed_sub}
+ # Get upstream bandwidth profile details
+ ${us_cir} ${us_cbs} ${us_pir} ${us_pbs} ${us_gir} Get Bandwidth Profile Details Ietf Rest
+ ... ${us_bw_profile}
+ # Verify meter for upstream bandwidth profile
+ ${us_meter_cmd}= Run Keyword If ${us_gir} != 0 Catenate SEPARATOR=
+ ... meters ${olt_of_id} | grep state=ADDED | grep "rate=${us_cir}, burst-size=${us_cbs}"
+ ... | grep "rate=${us_pir}, burst-size=${us_pbs}" | grep "rate=${us_gir}, burst-size=0" | wc -l
+ ... ELSE Catenate SEPARATOR=
+ ... meters ${olt_of_id} | grep state=ADDED | grep "rate=${us_cir}, burst-size=${us_cbs}"
+ ... | grep "rate=${us_pir}, burst-size=${us_pbs}" | wc -l
+ ${upstream_meter_added}= Execute ONOS CLI Command ${ip} ${port}
+ ... ${us_meter_cmd}
+ Should Be Equal As Integers ${upstream_meter_added} 1
+ # Get downstream bandwidth profile details
+ ${ds_cir} ${ds_cbs} ${ds_pir} ${ds_pbs} ${ds_gir} Get Bandwidth Profile Details Ietf Rest
+ ... ${ds_bw_profile}
+ # Verify meter for downstream bandwidth profile
+ ${ds_meter_cmd}= Run Keyword If ${ds_gir} != 0 Catenate SEPARATOR=
+ ... meters ${olt_of_id} | grep state=ADDED | grep "rate=${ds_cir}, burst-size=${ds_cbs}"
+ ... | grep "rate=${ds_pir}, burst-size=${ds_pbs}" | grep "rate=${ds_gir}, burst-size=0" | wc -l
+ ... ELSE Catenate SEPARATOR=
+ ... meters ${olt_of_id} | grep state=ADDED | grep "rate=${ds_cir}, burst-size=${ds_cbs}"
+ ... | grep "rate=${ds_pir}, burst-size=${ds_pbs}" | wc -l
+ ${downstream_meter_added}= Execute ONOS CLI Command ${ip} ${port}
+ ... ${ds_meter_cmd}
+ Should Be Equal As Integers ${downstream_meter_added} 1
+
Verify Meters in ONOS
[Arguments] ${ip} ${port} ${olt_of_id} ${onu_port}
[Documentation] Verifies the meters
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 20437c0..80765bf 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -340,7 +340,7 @@
... ${src['onu']} onu=True onu_reason=${onu_reasons}
# Verify Meters in ONOS
Run Keyword And Continue On Failure Wait Until Keyword Succeeds ${timeout} 5s
- ... Verify Meters in ONOS ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port}
+ ... Verify Meters in ONOS Ietf ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${of_id} ${onu_port}
# TODO: Yet to Verify on the GPON based Physical POD (VOL-2652)
Run Keyword If ${has_dataplane} Run Keyword And Continue On Failure Validate DHCP and Ping True
... True ${src['dp_iface_name']} ${src['s_tag']} ${src['c_tag']} ${dst['dp_iface_ip_qinq']}
diff --git a/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
index 97f0ed0..3306190 100644
--- a/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-adtran-sadis-DT.json
@@ -97,36 +97,37 @@
"entries": [
{
"id": "Default",
- "air": 100000,
+ "gir": 0,
"cbs": 30,
"cir": 16000,
- "ebs": 30,
- "eir": 16000
+ "pbs": 30,
+ "pir": 32000
},
{
"id": "User_Bandwidth1",
- "air": 100000,
+ "gir": 50000,
"cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
},
{
"id": "User_Bandwidth2",
- "air": 100000,
+ "gir": 100000,
"cbs": 5000,
"cir": 100000,
- "ebs": 5000,
- "eir": 100000
+ "pbs": 5000,
+ "pir": 300000
},
{
"id": "User_Bandwidth3",
- "air": 100000,
+ "gir": 100000,
"cbs": 5000,
- "cir": 425000,
- "ebs": 5000,
- "eir": 425000
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
}
+
]
}
}
diff --git a/tests/data/dt-berlin-pod-gpon-sadis-DT.json b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
index 9574587..44708e0 100644
--- a/tests/data/dt-berlin-pod-gpon-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-gpon-sadis-DT.json
@@ -81,48 +81,48 @@
}]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 425000,
- "ebs": 5000,
- "eir": 425000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
index 2ae169a..2ea0c6e 100644
--- a/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-multi-olt-sadis-DT.json
@@ -75,7 +75,7 @@
"circuitId": "ALPHe3d1cf5c-1",
"remoteId": "EC1729003539",
"uniTagList": [
- {
+ {
"uniTagMatch": 4096,
"ponCTag": 4096,
"ponSTag": 12,
@@ -83,7 +83,7 @@
"upstreamBandwidthProfile": "User_Bandwidth1",
"downstreamBandwidthProfile": "User_Bandwidth2",
"isDhcpRequired": false
- }]
+ }]
},
{
"id": "ALPHe3a69d03-1",
@@ -119,48 +119,48 @@
}]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 425000,
- "ebs": 5000,
- "eir": 425000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
index 2c132e9..44708e0 100644
--- a/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
+++ b/tests/data/dt-berlin-pod-openonugo-sadis-DT.json
@@ -91,35 +91,35 @@
"entries":[
{
"id": "Default",
- "air": 100000,
+ "gir": 0,
"cbs": 30,
"cir": 16000,
- "ebs": 30,
- "eir": 16000
+ "pbs": 30,
+ "pir": 32000
},
{
"id": "User_Bandwidth1",
- "air": 100000,
+ "gir": 50000,
"cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
},
{
"id": "User_Bandwidth2",
- "air": 100000,
+ "gir": 100000,
"cbs": 5000,
"cir": 100000,
- "ebs": 5000,
- "eir": 100000
+ "pbs": 5000,
+ "pir": 300000
},
{
"id": "User_Bandwidth3",
- "air": 100000,
+ "gir": 100000,
"cbs": 5000,
- "cir": 425000,
- "ebs": 5000,
- "eir": 425000
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
}
]
diff --git a/tests/data/menlo-certification-pod-radisys-gpon-sadis-DT.json b/tests/data/menlo-certification-pod-radisys-gpon-sadis-DT.json
index 264b131..184c921 100644
--- a/tests/data/menlo-certification-pod-radisys-gpon-sadis-DT.json
+++ b/tests/data/menlo-certification-pod-radisys-gpon-sadis-DT.json
@@ -1,116 +1,117 @@
{
- "apps":{
- "org.opencord.sadis":{
- "sadis":{
- "integration":{
- "cache":{
- "enabled":false,
- "maxsize":50,
- "ttl":"PT0m"
- }
- },
- "entries":[
- {
- "id":"722033538840",
- "nasId":"722033538840",
- "uplinkPort":1048576
- },
- {
- "id":"SCOM00001c7f-1",
- "nasPortId":"SCOM00001c7f-1",
- "circuitId":"SCOM00001c7f-1",
- "remoteId":"SCOM00001c7f",
- "uniTagList":[
- {
- "uniTagMatch":4096,
- "ponCTag":4096,
- "ponSTag":11,
- "technologyProfileId":64,
- "upstreamBandwidthProfile":"User_Bandwidth1",
- "downstreamBandwidthProfile":"User_Bandwidth2",
- "isDhcpRequired":false
- }
- ]
- },
- {
- "id":"SCOM00001c8d-1",
- "nasPortId":"SCOM00001c8d-1",
- "circuitId":"SCOM00001c8d-1",
- "remoteId":"SCOM00001c8d",
- "uniTagList":[
- {
- "uniTagMatch":4096,
- "ponCTag":4096,
- "ponSTag":22,
- "technologyProfileId":64,
- "upstreamBandwidthProfile":"User_Bandwidth2",
- "downstreamBandwidthProfile":"User_Bandwidth3",
- "isDhcpRequired":false
- }
- ]
- },
- {
- "id":"SCOM00019ab7-1",
- "nasPortId":"SCOM00019ab7-1",
- "circuitId":"SCOM00019ab7-1",
- "remoteId":"SCOM00019ab7",
- "uniTagList":[
- {
- "uniTagMatch":4096,
- "ponCTag":4096,
- "ponSTag":33,
- "technologyProfileId":64,
- "upstreamBandwidthProfile":"User_Bandwidth1",
- "downstreamBandwidthProfile":"User_Bandwidth3",
- "isDhcpRequired":false
- }
- ]
- }
+ "apps":{
+ "org.opencord.sadis":{
+ "sadis":{
+ "integration":{
+ "cache":{
+ "enabled":false,
+ "maxsize":50,
+ "ttl":"PT0m"
+ }
+ },
+ "entries":[
+ {
+ "id":"722033538840",
+ "nasId":"722033538840",
+ "uplinkPort":1048576
+ },
+ {
+ "id":"SCOM00001c7f-1",
+ "nasPortId":"SCOM00001c7f-1",
+ "circuitId":"SCOM00001c7f-1",
+ "remoteId":"SCOM00001c7f",
+ "uniTagList":[
+ {
+ "uniTagMatch":4096,
+ "ponCTag":4096,
+ "ponSTag":11,
+ "technologyProfileId":64,
+ "upstreamBandwidthProfile":"User_Bandwidth1",
+ "downstreamBandwidthProfile":"User_Bandwidth2",
+ "isDhcpRequired":false
+ }
]
- },
- "bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
- },
- "entries":[
- {
- "id":"Default",
- "air":100000,
- "cbs":30,
- "cir":16000,
- "ebs":30,
- "eir":16000
- },
- {
- "id":"User_Bandwidth1",
- "air":100000,
- "cbs":10000,
- "cir":30000,
- "ebs":1000,
- "eir":20000
- },
- {
- "id":"User_Bandwidth2",
- "air":100000,
- "cbs":5000,
- "cir":100000,
- "ebs":5000,
- "eir":100000
- },
- {
- "id":"User_Bandwidth3",
- "air":100000,
- "cbs":5000,
- "cir":200000,
- "ebs":5000,
- "eir":200000
- }
+ },
+ {
+ "id":"SCOM00001c8d-1",
+ "nasPortId":"SCOM00001c8d-1",
+ "circuitId":"SCOM00001c8d-1",
+ "remoteId":"SCOM00001c8d",
+ "uniTagList":[
+ {
+ "uniTagMatch":4096,
+ "ponCTag":4096,
+ "ponSTag":22,
+ "technologyProfileId":64,
+ "upstreamBandwidthProfile":"User_Bandwidth2",
+ "downstreamBandwidthProfile":"User_Bandwidth3",
+ "isDhcpRequired":false
+ }
]
- }
+ },
+ {
+ "id":"SCOM00019ab7-1",
+ "nasPortId":"SCOM00019ab7-1",
+ "circuitId":"SCOM00019ab7-1",
+ "remoteId":"SCOM00019ab7",
+ "uniTagList":[
+ {
+ "uniTagMatch":4096,
+ "ponCTag":4096,
+ "ponSTag":33,
+ "technologyProfileId":64,
+ "upstreamBandwidthProfile":"User_Bandwidth1",
+ "downstreamBandwidthProfile":"User_Bandwidth3",
+ "isDhcpRequired":false
+ }
+ ]
+ }
+ ]
+ },
+ "bandwidthprofile":{
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
+ },
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
+
+ ]
}
- }
+ }
+ }
}
diff --git a/tests/data/onf-demo-pod-gpon-sadis-DT.json b/tests/data/onf-demo-pod-gpon-sadis-DT.json
index d380ae5..0a0ff14 100644
--- a/tests/data/onf-demo-pod-gpon-sadis-DT.json
+++ b/tests/data/onf-demo-pod-gpon-sadis-DT.json
@@ -72,48 +72,48 @@
]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 475000,
- "ebs": 5000,
- "eir": 475000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/onf-demo-pod-openonugo-sadis-DT.json b/tests/data/onf-demo-pod-openonugo-sadis-DT.json
index a74fdd2..160b319 100644
--- a/tests/data/onf-demo-pod-openonugo-sadis-DT.json
+++ b/tests/data/onf-demo-pod-openonugo-sadis-DT.json
@@ -72,48 +72,48 @@
]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 475000,
- "ebs": 5000,
- "eir": 475000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/onf-demo-pod-sadis-DT.json b/tests/data/onf-demo-pod-sadis-DT.json
index a74fdd2..160b319 100644
--- a/tests/data/onf-demo-pod-sadis-DT.json
+++ b/tests/data/onf-demo-pod-sadis-DT.json
@@ -72,48 +72,48 @@
]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 475000,
- "ebs": 5000,
- "eir": 475000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/onf-soak-pod-sadis-DT.json b/tests/data/onf-soak-pod-sadis-DT.json
index f2c0e6b..14a34ac 100644
--- a/tests/data/onf-soak-pod-sadis-DT.json
+++ b/tests/data/onf-soak-pod-sadis-DT.json
@@ -51,49 +51,49 @@
]
},
"bandwidthprofile":{
- "integration":{
- "url" : "http://bbsim-sadis-server.voltha.svc:58080/profiles/%s",
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "url" : "http://bbsim-sadis-server.voltha.svc:58080/profiles/%s",
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 10000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/data/tucson-pod-DT-sadis.json b/tests/data/tucson-pod-DT-sadis.json
index a3cb714..331a181 100644
--- a/tests/data/tucson-pod-DT-sadis.json
+++ b/tests/data/tucson-pod-DT-sadis.json
@@ -64,48 +64,48 @@
]
},
"bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id": "Default",
+ "gir": 0,
+ "cbs": 30,
+ "cir": 16000,
+ "pbs": 30,
+ "pir": 32000
},
- "entries":[
- {
- "id": "Default",
- "air": 100000,
- "cbs": 30,
- "cir": 16000,
- "ebs": 30,
- "eir": 16000
- },
- {
- "id": "User_Bandwidth1",
- "air": 100000,
- "cbs": 1000,
- "cir": 30000,
- "ebs": 1000,
- "eir": 20000
- },
- {
- "id": "User_Bandwidth2",
- "air": 100000,
- "cbs": 5000,
- "cir": 100000,
- "ebs": 5000,
- "eir": 100000
- },
- {
- "id": "User_Bandwidth3",
- "air": 100000,
- "cbs": 5000,
- "cir": 475000,
- "ebs": 5000,
- "eir": 475000
- }
+ {
+ "id": "User_Bandwidth1",
+ "gir": 50000,
+ "cbs": 10000,
+ "cir": 50000,
+ "pbs": 1000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth2",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 300000
+ },
+ {
+ "id": "User_Bandwidth3",
+ "gir": 100000,
+ "cbs": 5000,
+ "cir": 100000,
+ "pbs": 5000,
+ "pir": 400000
+ }
- ]
+ ]
}
}
}
diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 9547077..db84926 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -468,10 +468,14 @@
${subscriber_id}= Set Variable ${of_id}/${onu_port}
${bandwidth_profile_name} Get Bandwidth Profile Name For Given Subscriber ${subscriber_id}
... upstreamBandwidthProfile
- ${limiting_bw_value_upstream} Get Limiting Bandwidth Details ${bandwidth_profile_name}
+ ${us_cir} ${us_cbs} ${us_pir} ${us_pbs} ${us_gir}= Get Bandwidth Profile Details Ietf Rest
+ ... ${bandwidth_profile_name}
+ ${limiting_bw_value_upstream}= Set Variable If ${us_pir} != 0 ${us_pir} ${us_gir}
${bandwidth_profile_name} Get Bandwidth Profile Name For Given Subscriber ${subscriber_id}
... downstreamBandwidthProfile
- ${limiting_bw_value_dnstream} Get Limiting Bandwidth Details ${bandwidth_profile_name}
+ ${ds_cir} ${ds_cbs} ${ds_pir} ${ds_pbs} ${ds_gir}= Get Bandwidth Profile Details Ietf Rest
+ ... ${bandwidth_profile_name}
+ ${limiting_bw_value_dnstream}= Set Variable If ${ds_pir} != 0 ${ds_pir} ${ds_gir}
# Stream TCP packets from RG to server
${updict}= Run Iperf3 Test Client ${src} server=${dst['dp_iface_ip_qinq']}
@@ -523,10 +527,14 @@
${subscriber_id}= Set Variable ${of_id}/${onu_port}
${bandwidth_profile_name} Get Bandwidth Profile Name For Given Subscriber ${subscriber_id}
... upstreamBandwidthProfile
- ${limiting_bw_value_upstream} Get Limiting Bandwidth Details ${bandwidth_profile_name}
+ ${us_cir} ${us_cbs} ${us_pir} ${us_pbs} ${us_gir}= Get Bandwidth Profile Details Ietf Rest
+ ... ${bandwidth_profile_name}
+ ${limiting_bw_value_upstream}= Set Variable If ${us_pir} != 0 ${us_pir} ${us_gir}
${bandwidth_profile_name} Get Bandwidth Profile Name For Given Subscriber ${subscriber_id}
... downstreamBandwidthProfile
- ${limiting_bw_value_dnstream} Get Limiting Bandwidth Details ${bandwidth_profile_name}
+ ${ds_cir} ${ds_cbs} ${ds_pir} ${ds_pbs} ${ds_gir}= Get Bandwidth Profile Details Ietf Rest
+ ... ${bandwidth_profile_name}
+ ${limiting_bw_value_dnstream}= Set Variable If ${ds_pir} != 0 ${ds_pir} ${ds_gir}
# Stream UDP packets from RG to server
${uprate}= Run Keyword If ${limiting_bw_value_upstream} != 1000000