[VOL-3989] Tech profile and Sadis config changes for TT Multi Tcont testing
Change-Id: Ia7f4147277985fd8e4c90373728cfa37ad889897
diff --git a/tests/data/TechProfile-TT-MCAST.json b/tests/data/TechProfile-TT-MCAST-AdditionalBW-NA.json
similarity index 97%
copy from tests/data/TechProfile-TT-MCAST.json
copy to tests/data/TechProfile-TT-MCAST-AdditionalBW-NA.json
index 5ed4f97..23fec6d 100644
--- a/tests/data/TechProfile-TT-MCAST.json
+++ b/tests/data/TechProfile-TT-MCAST-AdditionalBW-NA.json
@@ -9,7 +9,7 @@
"max_gem_payload_size": "auto"
},
"us_scheduler":{
- "additional_bw": "AdditionalBW_BestEffort",
+ "additional_bw": "AdditionalBW_NA",
"direction": "UPSTREAM",
"priority": 1,
"weight": 20,
diff --git a/tests/data/TechProfile-TT-MCAST.json b/tests/data/TechProfile-TT-MCAST-AdditionalBW-None.json
similarity index 97%
rename from tests/data/TechProfile-TT-MCAST.json
rename to tests/data/TechProfile-TT-MCAST-AdditionalBW-None.json
index 5ed4f97..2047f32 100644
--- a/tests/data/TechProfile-TT-MCAST.json
+++ b/tests/data/TechProfile-TT-MCAST-AdditionalBW-None.json
@@ -9,7 +9,7 @@
"max_gem_payload_size": "auto"
},
"us_scheduler":{
- "additional_bw": "AdditionalBW_BestEffort",
+ "additional_bw": "AdditionalBW_None",
"direction": "UPSTREAM",
"priority": 1,
"weight": 20,
diff --git a/tests/data/TechProfile-TT-VoIP.json b/tests/data/TechProfile-TT-VoIP.json
index a5ead2d..c0ee3f8 100644
--- a/tests/data/TechProfile-TT-VoIP.json
+++ b/tests/data/TechProfile-TT-VoIP.json
@@ -9,7 +9,7 @@
"max_gem_payload_size": "auto"
},
"us_scheduler": {
- "additional_bw": "AdditionalBW_BestEffort",
+ "additional_bw": "AdditionalBW_None",
"direction": "UPSTREAM",
"priority": 0,
"weight": 20,
diff --git a/tests/data/flex-ocp-cord-sadis-TT.json b/tests/data/flex-ocp-cord-sadis-TT.json
index 8a91c09..0906ec1 100644
--- a/tests/data/flex-ocp-cord-sadis-TT.json
+++ b/tests/data/flex-ocp-cord-sadis-TT.json
@@ -52,6 +52,48 @@
"cbs" : 10000,
"eir" : 300000,
"ebs" : 10000
+ }, {
+ "id" : "Fixed9Gbps",
+ "cir" : 0,
+ "cbs" : 0,
+ "eir" : 0,
+ "ebs" : 0,
+ "air" : 9000000
+ }, {
+ "id" : "TCONT_TYPE1_200Mbps_Fixed_ForVOIP",
+ "pir" : 0,
+ "pbs" : 0,
+ "cir" : 0,
+ "cbs" : 0,
+ "gir" : 200000
+ }, {
+ "id" : "TCONT_TYPE2_500Mbps_Assured_ForVoD",
+ "pir" : 500000,
+ "pbs" : 10000,
+ "cir" : 500000,
+ "cbs" : 10000,
+ "gir" : 0
+ }, {
+ "id" : "TCONT_TYPE3_700Mbps_Peak_500Mbps_Assured_ForVoD",
+ "pir" : 700000,
+ "pbs" : 10000,
+ "cir" : 500000,
+ "cbs" : 10000,
+ "gir" : 0
+ }, {
+ "id" : "TCONT_TYPE4_1Gbps_Peak_User1_HSI_Upstream",
+ "pir" : 1000000,
+ "pbs" : 10000,
+ "cir" : 0,
+ "cbs" : 0,
+ "gir" : 0
+ }, {
+ "id" : "TCONT_TYPE5_1Gbps_Peak_500Mbps_Assured_200Mbps_Fixed_User1_HSI_Upstream",
+ "pir" : 1000000,
+ "pbs" : 10000,
+ "cir" : 500000,
+ "cbs" : 10000,
+ "gir" : 200000
} ]
},
"sadis" : {
@@ -65,55 +107,15 @@
"entries" : [ {
"id" : "ALPHe3d1cfa7-1",
"nasPortId" : "ALPHe3d1cfa7-1",
+ "circuitId" : "ALPHe3d1cfa7-1",
+ "remoteId" : "ALPHe3d1cfa7-1",
"uniTagList" : [ {
- "uniTagMatch" : 35,
- "ponCTag" : 901,
- "ponSTag" : 111,
- "usPonCTagPriority" : 0,
- "usPonSTagPriority" : 0,
- "dsPonCTagPriority" : 0,
- "dsPonSTagPriority" : 0,
+ "ponCTag" : 999,
+ "ponSTag" : 999,
"technologyProfileId" : 64,
- "downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
- "isDhcpRequired" : "true",
- "serviceName" : "HSIA"
- }, {
- "uniTagMatch" : 65,
- "ponCTag" : 444,
- "ponSTag" : 333,
- "usPonCTagPriority" : 7,
- "usPonSTagPriority" : 7,
- "dsPonCTagPriority" : 7,
- "dsPonSTagPriority" : 7,
- "technologyProfileId" : 65,
- "downstreamBandwidthProfile" : "VOIP",
- "upstreamBandwidthProfile" : "User1-Specific2",
- "isDhcpRequired" : "true",
- "configuredMacAddress" : "b4:96:91:0c:4f:e5",
- "serviceName" : "VOIP"
- }, {
- "uniTagMatch" : 55,
- "ponCTag" : 55,
- "ponSTag" : 555,
- "usPonCTagPriority" : 5,
- "usPonSTagPriority" : 5,
- "dsPonCTagPriority" : 5,
- "dsPonSTagPriority" : 5,
- "technologyProfileId" : 66,
- "downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
- "configuredMacAddress" : "b4:96:91:0c:4f:e5",
- "serviceName" : "VOD",
- "isDhcpRequired" : "true",
- "isIgmpRequired" : "true"
- }, {
- "ponCTag" : 55,
- "ponSTag" : 550,
- "dsPonCTagPriority" : 5,
- "dsPonSTagPriority" : 5,
- "technologyProfileId" : 66,
- "serviceName" : "MC"
+ "downstreamBandwidthProfile" : "Fixed9Gbps",
+ "upstreamBandwidthProfile" : "Fixed9Gbps",
+ "isDhcpRequired" : "true"
} ]
}, {
"id" : "ALPHe3d1cea3-1",
@@ -128,7 +130,7 @@
"dsPonSTagPriority" : 0,
"technologyProfileId" : 64,
"downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
+ "upstreamBandwidthProfile" : "TCONT_TYPE4_1Gbps_Peak_User1_HSI_Upstream",
"isDhcpRequired" : "true",
"serviceName" : "HSIA"
}, {
@@ -141,7 +143,7 @@
"dsPonSTagPriority" : 7,
"technologyProfileId" : 65,
"downstreamBandwidthProfile" : "VOIP",
- "upstreamBandwidthProfile" : "User1-Specific2",
+ "upstreamBandwidthProfile" : "TCONT_TYPE1_200Mbps_Fixed_ForVOIP",
"isDhcpRequired" : "true",
"configuredMacAddress" : "2c:60:0c:ee:d6:27",
"serviceName" : "VOIP"
@@ -155,7 +157,7 @@
"dsPonSTagPriority" : 5,
"technologyProfileId" : 66,
"downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
+ "upstreamBandwidthProfile" : "TCONT_TYPE2_500Mbps_Assured_ForVoD",
"configuredMacAddress" : "2c:60:0c:ee:d6:27",
"serviceName" : "VOD",
"isDhcpRequired" : "true",
@@ -181,7 +183,7 @@
"dsPonSTagPriority" : 0,
"technologyProfileId" : 64,
"downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
+ "upstreamBandwidthProfile" : "TCONT_TYPE5_1Gbps_Peak_500Mbps_Assured_200Mbps_Fixed_User1_HSI_Upstream",
"isDhcpRequired" : "true",
"serviceName" : "HSIA"
}, {
@@ -194,7 +196,7 @@
"dsPonSTagPriority" : 7,
"technologyProfileId" : 65,
"downstreamBandwidthProfile" : "VOIP",
- "upstreamBandwidthProfile" : "User1-Specific2",
+ "upstreamBandwidthProfile" : "TCONT_TYPE1_200Mbps_Fixed_ForVOIP",
"isDhcpRequired" : "true",
"configuredMacAddress" : "2c:60:0c:ee:d7:68",
"serviceName" : "VOIP"
@@ -206,9 +208,9 @@
"usPonSTagPriority" : 5,
"dsPonCTagPriority" : 5,
"dsPonSTagPriority" : 5,
- "technologyProfileId" : 66,
+ "technologyProfileId" : 67,
"downstreamBandwidthProfile" : "High-Speed-Internet",
- "upstreamBandwidthProfile" : "User1-Specific",
+ "upstreamBandwidthProfile" : "TCONT_TYPE3_700Mbps_Peak_500Mbps_Assured_ForVoD",
"configuredMacAddress" : "2c:60:0c:ee:d7:68",
"serviceName" : "VOD",
"isDhcpRequired" : "true",
@@ -218,7 +220,7 @@
"ponSTag" : 550,
"dsPonCTagPriority" : 5,
"dsPonSTagPriority" : 5,
- "technologyProfileId" : 66,
+ "technologyProfileId" : 67,
"serviceName" : "MC"
} ]
}, {