Brian O'Connor

Updating application appIds for optical

Change-Id: I46d33f11d9e6bf6531c2ed4ac8f30c84a5c8cdbc
...@@ -156,6 +156,7 @@ public class AclManager implements AclService { ...@@ -156,6 +156,7 @@ public class AclManager implements AclService {
156 @Deactivate 156 @Deactivate
157 public void deactivate() { 157 public void deactivate() {
158 hostService.removeListener(hostListener); 158 hostService.removeListener(hostListener);
159 + // TODO can be replaced with this.clearAcl()
159 flowRuleService.removeFlowRulesById(appId); 160 flowRuleService.removeFlowRulesById(appId);
160 aclStore.clearAcl(); 161 aclStore.clearAcl();
161 log.info("Stopped"); 162 log.info("Stopped");
......
...@@ -72,7 +72,7 @@ public class LambdaForwarding { ...@@ -72,7 +72,7 @@ public class LambdaForwarding {
72 72
73 @Activate 73 @Activate
74 public void activate() { 74 public void activate() {
75 - appId = coreService.registerApplication("org.onosproject.fwd"); 75 + appId = coreService.registerApplication("org.onosproject.lambdafwd");
76 76
77 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1); 77 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff01"), 1);
78 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2); 78 uglyMap.put(DeviceId.deviceId("of:0000ffffffffff02"), 2);
......
...@@ -68,8 +68,7 @@ public class MplsForwarding { ...@@ -68,8 +68,7 @@ public class MplsForwarding {
68 68
69 @Activate 69 @Activate
70 public void activate() { 70 public void activate() {
71 - appId = coreService.registerApplication("org.onosproject.testapp" + 71 + appId = coreService.registerApplication("org.onosproject.mplsfwd");
72 - ".mplsfwd");
73 72
74 uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1); 73 uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1);
75 uglyMap.put(DeviceId.deviceId("of:0000000000000002"), 2); 74 uglyMap.put(DeviceId.deviceId("of:0000000000000002"), 2);
......