Adding Encapsulation in VPLS and correcting bugs.
Change-Id: Idc0c1834ae2bbd0fdaf564fd65360cc0f018d18d
diff --git a/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsAddCommand.java b/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsAddCommand.java
index ffeb81f..b2c1da5 100644
--- a/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsAddCommand.java
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/cli/VplsAddCommand.java
@@ -26,9 +26,9 @@
/**
* CLI to create VPLSs.
*/
-@Command(scope = "onos", name = "vpls-add", description = "Create a new VPLS")
+@Command(scope = "onos", name = "vpls-add", description = "Creates a new VPLS")
public class VplsAddCommand extends AbstractShellCommand {
- private static final String VPLS_EXIST = "VPLS already exists: %s";
+
private VplsConfigurationService vplsConfigService =
get(VplsConfigurationService.class);
@@ -38,11 +38,12 @@
@Override
protected void execute() {
-
- if (vplsConfigService.getAllVpls().contains(vplsName)) {
- print(VPLS_EXIST, vplsName);
+ // Check if the VPLS name is already configured
+ if (VplsCommandUtils.vplsExists(vplsName)) {
+ print(VplsCommandUtils.VPLS_ALREADY_EXISTS, vplsName);
return;
}
- vplsConfigService.addVpls(vplsName, new HashSet<>());
+
+ vplsConfigService.addVpls(vplsName, new HashSet<>(), null);
}
}