SEBA-815 Multi Tcont support by OLT app.
Change-Id: I024ef2fcb3d3e59cc86bd2088726ae513fcff796
diff --git a/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index f871bc9..a472391 100644
--- a/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -34,9 +34,6 @@
<action class="org.opencord.olt.cli.ShowOltCommand"/>
</command>
<command>
- <action class="org.opencord.olt.cli.ShowSubscribersCommand"/>
- </command>
- <command>
<action class="org.opencord.olt.cli.ShowProgrammedSubscribersCommand"/>
</command>
<command>
@@ -45,6 +42,12 @@
<command>
<action class="org.opencord.olt.cli.ShowBpMeterMappingsCommand"/>
</command>
+ <command>
+ <action class="org.opencord.olt.cli.UniTagAddCommand"/>
+ </command>
+ <command>
+ <action class="org.opencord.olt.cli.UniTagRemoveCommand"/>
+ </command>
</command-bundle>
<bean id="deviceIdCompleter" class="org.onosproject.cli.net.DeviceIdCompleter"/>
diff --git a/app/src/main/resources/vlan_cfg.json b/app/src/main/resources/vlan_cfg.json
index 133aed7..3bb577f 100644
--- a/app/src/main/resources/vlan_cfg.json
+++ b/app/src/main/resources/vlan_cfg.json
@@ -1,6 +1,6 @@
{
-"apps" : {
- "org.opencord.sadis" : {
+ "apps" : {
+ "org.opencord.sadis" : {
"sadis" : {
"integration" : {
"cache" : {
@@ -11,12 +11,44 @@
},
"entries" : [ {
"id" : "s1-eth1",
- "cTag" : 2,
- "sTag" : 4,
"nasPortId" : "s1-eth1",
- "technologyProfileId" : 10,
- "upstreamBandwidthProfile" : "High-Speed-Internet",
- "downstreamBandwidthProfile" : "User1-Specific"
+ "uniTagList": [
+ {
+ "uniTagMatch": 35,
+ "ponCTag":33,
+ "ponSTag":7,
+ "technologyProfileId": 2,
+ "upstreamBandwidthProfile":"High-Speed-Internet",
+ "downstreamBandwidthProfile":"Service1"
+ },
+ {
+ "uniTagMatch": 45,
+ "ponCTag":43,
+ "ponSTag":10,
+ "technologyProfileId": 3,
+ "upstreamBandwidthProfile":"VOIP",
+ "downstreamBandwidthProfile":"Service2",
+ "isDhcpRequired":"true"
+ },
+ {
+ "uniTagMatch": 55,
+ "ponCTag": 55,
+ "ponSTag": 550,
+ "technologyProfileId": 4,
+ "upstreamBandwidthProfile": "VOD",
+ "downstreamBandwidthProfile": "Service3",
+ "isDhcpRequired": "true",
+ "isIgmpRequired": "true"
+ },
+ {
+ "ponCTag": 55,
+ "ponSTag": 555,
+ "dsPonCTagPriority": 5,
+ "dsPonSTagPriority": 5,
+ "technologyProfileId": 4,
+ "serviceName": "MC"
+ }
+ ]
}, {
"id" : "1",
"hardwareIdentifier" : "00:00:00:00:00:01",
@@ -24,39 +56,76 @@
"uplinkPort": "2"
} ]
},
- "bandwidthprofile":{
- "integration":{
- "cache":{
- "enabled":true,
- "maxsize":40,
- "ttl":"PT1m"
- }
- },
- "entries":[
- {
- "id":"High-Speed-Internet",
- "cir":200000000,
- "cbs":348000,
- "eir":10000000,
- "ebs":348000,
- "air":10000000
- },
- {
- "id":"User1-Specific",
- "cir":300000000,
- "cbs":348000,
- "eir":20000000,
- "ebs":348000
- }
- ]
- }
+ "bandwidthprofile":{
+ "integration":{
+ "cache":{
+ "enabled":true,
+ "maxsize":40,
+ "ttl":"PT1m"
+ }
+ },
+ "entries":[
+ {
+ "id":"High-Speed-Internet",
+ "cir": 500000,
+ "cbs": 10000,
+ "eir": 500000,
+ "ebs": 10000,
+ "air": 100000
+ },
+ {
+ "id":"VOIP",
+ "cir": 500000,
+ "cbs": 10000,
+ "eir": 500000,
+ "ebs": 10000,
+ "air": 100000
+ },
+ {
+ "id":"Service1",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"Service2",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"VOD",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"Service3",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"Default",
+ "cir": 0,
+ "cbs": 0,
+ "eir": 512,
+ "ebs": 30,
+ "air": 0
+ }
+ ]
+ }
}
},
- "devices":{
- "of:0000000000000001":{
- "basic":{
- "driver":"pmc-olt"
- }
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"pmc-olt"
}
- }
+ }
+ }
}
diff --git a/app/src/main/resources/vlan_cfg_with_default.json b/app/src/main/resources/vlan_cfg_with_default.json
index 7cd792a..e168283 100644
--- a/app/src/main/resources/vlan_cfg_with_default.json
+++ b/app/src/main/resources/vlan_cfg_with_default.json
@@ -11,12 +11,17 @@
},
"entries" : [ {
"id" : "s1-eth1",
- "cTag" : 2,
- "sTag" : 4,
"nasPortId" : "s1-eth1",
- "technologyProfileId" : 10,
- "upstreamBandwidthProfile" : "High-Speed-Internet",
- "downstreamBandwidthProfile" : "User1-Specific"
+ "uniTagList": [
+ {
+ "uniTagMatch": 35,
+ "ponCTag":33,
+ "ponSTag":7,
+ "technologyProfileId": 2,
+ "upstreamBandwidthProfile":"High-Speed-Internet",
+ "downstreamBandwidthProfile":"Service1"
+ }
+ ]
}, {
"id" : "1",
"hardwareIdentifier" : "00:00:00:00:00:01",
@@ -35,26 +40,55 @@
"entries":[
{
"id":"High-Speed-Internet",
- "cir":200000000,
- "cbs":348000,
- "eir":10000000,
- "ebs":348000,
- "air":10000000
+ "cir": 500000,
+ "cbs": 10000,
+ "eir": 500000,
+ "ebs": 10000,
+ "air": 100000
},
{
- "id":"User1-Specific",
- "cir":300000000,
- "cbs":348000,
- "eir":20000000,
- "ebs":348000
+ "id":"VOIP",
+ "cir": 500000,
+ "cbs": 10000,
+ "eir": 500000,
+ "ebs": 10000,
+ "air": 100000
+ },
+ {
+ "id":"Service1",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"Service2",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"VOD",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
+ },
+ {
+ "id":"Service3",
+ "cir": 600000,
+ "cbs": 10000,
+ "eir": 400000,
+ "ebs": 10000
},
{
"id":"Default",
- "cir":0,
- "cbs":0,
- "eir":512,
- "ebs":30,
- "air":0
+ "cir": 0,
+ "cbs": 0,
+ "eir": 512,
+ "ebs": 30,
+ "air": 0
}
]
}