commit b1cef5c12db27ba667cafcf96cfadf62d632367d
author Carolina Fernandez <carolina.fernandez@i2cat.net> Tue Nov 22 19:18:40 2016 +0100
committer Thomas Vachuska <tom@onlab.us> Fri Dec 02 21:15:12 2016 +0000
tree f1aed9860c21f14b6d6eb56d985f0ded2039f52c
parent bee19498b5b71d69cc0a4a8e47e5b866b88eca6e

[ONOS-5420] CP/untagged ifaces support in VPLS

Changes:
- Tests to account for tag-tag and tag-notag connectivity
- Introducing untagged ifaces in netcfg and topo files

Change-Id: If56fd4d8bbe4f1f2505e4d5d85c3eeda8c22ac5c

apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsSetEncapCommandCompleter.java

diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsSetEncapCommandCompleter.java b/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsSetEncapCommandCompleter.java
index 409d2a7..8ae7df2 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsSetEncapCommandCompleter.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/cli/completer/VplsSetEncapCommandCompleter.java
@@ -18,7 +18,7 @@
 
 import com.google.common.collect.Lists;
 import org.onosproject.cli.AbstractChoicesCompleter;
-import org.onosproject.vpls.config.VplsConfigurationService;
+import org.onosproject.vpls.config.VplsConfigService;
 
 import java.util.List;
 
@@ -30,8 +30,8 @@
 public class VplsSetEncapCommandCompleter extends AbstractChoicesCompleter {
     @Override
     protected List<String> choices() {
-        VplsConfigurationService vplsConfigService =
-                get(VplsConfigurationService.class);
+        VplsConfigService vplsConfigService =
+                get(VplsConfigService.class);
 
         return Lists.newArrayList(vplsConfigService.vplsNames());
     }