do not remove filter rules when pushing vlan rules
Change-Id: Id1703815a50fff934d73ef3ac37951db9c0f02eb
diff --git a/app/src/main/java/org/onosproject/olt/impl/Olt.java b/app/src/main/java/org/onosproject/olt/impl/Olt.java
index bfc05c8..fa9c2a4 100644
--- a/app/src/main/java/org/onosproject/olt/impl/Olt.java
+++ b/app/src/main/java/org/onosproject/olt/impl/Olt.java
@@ -233,7 +233,6 @@
deviceId,
deviceVlan,
subscriberVlan));
- processFilteringObjectives(deviceId, subscriberPort, true);
} else if (downStatus != null) {
log.error("Subscriber with vlan {} on device {} " +
"on port {} failed downstream uninstallation: {}",
@@ -336,7 +335,6 @@
deviceVlan,
subscriberVlan));
- processFilteringObjectives(deviceId, subscriberPort, false);
} else if (downStatus != null) {
log.error("Subscriber with vlan {} on device {} " +
"on port {} failed downstream installation: {}",
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 95bac6a..1818c02 100644
--- a/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -23,6 +23,13 @@
<null/>
</completers>
</command>
+ <command>
+ <action class="org.onosproject.olt.cli.SubscriberRemoveCommand"/>
+ <completers>
+ <ref component-id="deviceIdCompleter"/>
+ <null/>
+ </completers>
+ </command>
</command-bundle>
<bean id="deviceIdCompleter" class="org.onosproject.cli.net.DeviceIdCompleter"/>