| commit | 46fdfaf492b07827dcc61f0c466cd1ad5a1f41e5 | [log] [tgz] |
|---|---|---|
| author | Charles Chan <rascov@gmail.com> | Wed Nov 09 20:51:44 2016 -0800 |
| committer | Charles Chan <charles@onlab.us> | Thu Nov 17 19:29:11 2016 +0000 |
| tree | 07372715cdd832ca163d7eedfb6bc2f36a5987d1 | |
| parent | ee891c5c7b16bd179fde438ed50cb03747d25c27 [diff] |
Determines the subnet of given port by checking the interface config directly Previously, SR checked the subnet data structure which contains multiple subnets now in order to support generic routing Change-Id: Ib6e4b107583d9fd1bca248b31a6c437236560199
diff --git a/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java b/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java index a5a7268..0f3a431 100644 --- a/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java +++ b/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java
@@ -68,7 +68,7 @@ InputStream invalidJsonStream = SegmentRoutingAppConfigTest.class .getResourceAsStream("/app-invalid.json"); - String key = SegmentRoutingManager.SR_APP_ID; + String key = SegmentRoutingManager.APP_NAME; ApplicationId subject = new TestApplicationId(key); ObjectMapper mapper = new ObjectMapper(); JsonNode jsonNode = mapper.readTree(jsonStream);
diff --git a/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java b/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java index f472a90..143bc29 100644 --- a/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java +++ b/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java
@@ -62,7 +62,7 @@ InputStream invalidJsonStream = SegmentRoutingAppConfigTest.class .getResourceAsStream("/xconnect-invalid.json"); - String key = SegmentRoutingManager.SR_APP_ID; + String key = SegmentRoutingManager.APP_NAME; ApplicationId subject = new TestApplicationId(key); ObjectMapper mapper = new ObjectMapper(); JsonNode jsonNode = mapper.readTree(jsonStream);