[VOL-4737] Fixing unit tests.
Change-Id: I4738ba0a779a9b774693dcc8948371a85e576315
diff --git a/app/src/test/resources/3 b/app/src/test/resources/3
index 418b0b0..ff6cf66 100644
--- a/app/src/test/resources/3
+++ b/app/src/test/resources/3
@@ -16,7 +16,7 @@
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority": 0,
- "dsPonSTagPriority": 0,
+ "dsPonSTagPriority": 1,
"technologyProfileId":64,
"upstreamBandwidthProfile":"HSA",
"downstreamBandwidthProfile":"HSA",
diff --git a/app/src/test/resources/4 b/app/src/test/resources/4
index ea0b618..c308a94 100644
--- a/app/src/test/resources/4
+++ b/app/src/test/resources/4
@@ -16,7 +16,7 @@
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
- "dsPonSTagPriority":0,
+ "dsPonSTagPriority":1,
"technologyProfileId":64,
"upstreamBandwidthProfile":"HSA",
"downstreamBandwidthProfile":"HSA",
@@ -24,16 +24,20 @@
},
{
"uniTagMatch":200,
- "ponCTag":3,
- "ponSTag":2,
+ "ponCTag":2,
+ "ponSTag":3,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
- "dsPonSTagPriority":0,
+ "dsPonSTagPriority":1,
"technologyProfileId":65,
"upstreamBandwidthProfile":"IPTV",
"downstreamBandwidthProfile":"IPTV",
- "serviceName":"IPTV"
- }
+ "serviceName":"IPTV",
+ "isIgmpRequired": "true",
+ "isDhcpRequired": "true",
+ "configuredMacAddress": "ff:aa:dd:cc:bb:ee",
+ "enableMacLearning": "true"
+ }
]
}
diff --git a/app/src/test/resources/HybridSubConfig.json b/app/src/test/resources/HybridSubConfig.json
index e88a414..e6a7a5c 100644
--- a/app/src/test/resources/HybridSubConfig.json
+++ b/app/src/test/resources/HybridSubConfig.json
@@ -24,8 +24,8 @@
"uniTagList": [
{
"uniTagMatch":100,
- "ponCTag":"2,",
- "ponSTag":"2",
+ "ponCTag":2,
+ "ponSTag":2,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
@@ -51,8 +51,8 @@
"uniTagList": [
{
"uniTagMatch":100,
- "ponCTag":"2,",
- "ponSTag":"2",
+ "ponCTag":2,
+ "ponSTag":2,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
@@ -64,8 +64,8 @@
},
{
"uniTagMatch":200,
- "ponCTag":3,
- "ponSTag":2,
+ "ponCTag":2,
+ "ponSTag":3,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority": 0,
@@ -76,7 +76,8 @@
"serviceName":"IPTV",
"isIgmpRequired": "true",
"isDhcpRequired": "true",
- "configuredMacAddress": "\"ff:aa:dd:cc:bb:ee\""
+ "configuredMacAddress": "ff:aa:dd:cc:bb:ee",
+ "enableMacLearning": "true"
}
]
}
diff --git a/app/src/test/resources/LocalSubConfig.json b/app/src/test/resources/LocalSubConfig.json
index 6eff750..377c98a 100644
--- a/app/src/test/resources/LocalSubConfig.json
+++ b/app/src/test/resources/LocalSubConfig.json
@@ -23,8 +23,8 @@
"uniTagList": [
{
"uniTagMatch":100,
- "ponCTag":"2,",
- "ponSTag":"2",
+ "ponCTag":2,
+ "ponSTag":2,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
@@ -50,8 +50,8 @@
"uniTagList": [
{
"uniTagMatch":100,
- "ponCTag":"2,",
- "ponSTag":"2",
+ "ponCTag":2,
+ "ponSTag":2,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority":0,
@@ -63,8 +63,8 @@
},
{
"uniTagMatch":200,
- "ponCTag":3,
- "ponSTag":2,
+ "ponCTag":2,
+ "ponSTag":3,
"usPonCTagPriority":0,
"usPonSTagPriority":1,
"dsPonCTagPriority": 0,
@@ -75,24 +75,25 @@
"serviceName":"IPTV",
"isIgmpRequired": "true",
"isDhcpRequired": "true",
- "configuredMacAddress": "\"ff:aa:dd:cc:bb:ee\""
+ "configuredMacAddress": "ff:aa:dd:cc:bb:ee",
+ "enableMacLearning": "true"
}
]
},
{
"id": "5",
"nasPortId": "1/1/2",
- "uplinkPort": 125,
- "slot": 3,
- "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
- "ipAddress":"10.10.10.10",
- "nasId":"XXX-NASID",
- "circuitId":"circuit123",
- "remoteId":"remote123",
+ "uplinkPort": 130,
+ "slot": 7,
+ "hardwareIdentifier": "ff:aa:dd:cc:bb:ee",
+ "ipAddress":"30.30.30.30",
+ "nasId":"MNO-NASID",
+ "circuitId":"circuit567",
+ "remoteId":"remote567",
"uniTagList": [
{
- "ponCTag":"2,",
- "ponSTag":"2",
+ "ponCTag":2,
+ "ponSTag":3,
"technologyProfileId":64,
"upstreamBandwidthProfile":"HSA",
"downstreamBandwidthProfile":"HSA"
@@ -102,22 +103,28 @@
{
"id": "6",
"nasPortId": "1/1/2",
- "uplinkPort": 125,
- "slot": 3,
- "hardwareIdentifier": "aa:bb:cc:dd:ee:ff",
- "ipAddress":"10.10.10.10",
- "nasId":"XXX-NASID",
- "circuitId":"circuit123",
- "remoteId":"remote123",
+ "uplinkPort": 130,
+ "slot": 7,
+ "hardwareIdentifier": "ff:aa:dd:cc:bb:ee",
+ "ipAddress":"30.30.30.30",
+ "nasId":"MNO-NASID",
+ "circuitId":"circuit567",
+ "remoteId":"remote567",
"uniTagList": [
{
- "ponCTag":"2,",
- "ponSTag":"2",
+ "serviceName": "HSIA",
+ "uniTagMatch": "100",
+ "ponCTag":2,
+ "ponSTag":2,
"technologyProfileId":64,
"upstreamBandwidthProfile":"HSA",
"downstreamBandwidthProfile":"HSA",
"upstreamOltBandwidthProfile":"HSA_OLT",
- "downstreamOltBandwidthProfile":"HSA_OLT"
+ "downstreamOltBandwidthProfile":"HSA_OLT",
+ "usPonCTagPriority":0,
+ "usPonSTagPriority":1,
+ "dsPonCTagPriority": 0,
+ "dsPonSTagPriority": 1
}
]
}