[ONOS-7444] Optimize SONA gw doesn't use vrouter app and quagga anymore
- Done: Deriving MAC address from external peer router, SNAT, Floating IP-based routing
- Todo: Vlan, GW loadbalancing
Change-Id: I0cc2a61295c28fa6a796046ca142c4ef525b70d3
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
new file mode 100644
index 0000000..efda0ae
--- /dev/null
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/DeleteExternalPeerRouterCommand.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.openstacknetworking.cli;
+
+import com.google.common.collect.Lists;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.openstacknetworking.api.ExternalPeerRouter;
+import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
+
+import java.util.List;
+
+/**
+ * Deletes external peer router.
+ */
+@Command(scope = "onos", name = "openstack-delete-peer-router",
+ description = "Delete external peer router")
+public class DeleteExternalPeerRouterCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "ip address", description = "ip address",
+ required = true, multiValued = false)
+ private String ipAddress = null;
+
+ private static final String FORMAT = "%-20s%-20s%-20s";
+ private static final String NO_ELEMENT = "There's no external peer router information with given ip address";
+
+ @Override
+ protected void execute() {
+ OpenstackNetworkService service = AbstractShellCommand.get(OpenstackNetworkService.class);
+
+ if (service.externalPeerRouters().stream()
+ .noneMatch(router -> router.externalPeerRouterIp().toString().equals(ipAddress))) {
+ print(NO_ELEMENT);
+ return;
+ }
+
+ try {
+ service.deleteExternalPeerRouter(ipAddress);
+ } catch (IllegalArgumentException e) {
+ log.error("Exception occurred because of {}", e.toString());
+ }
+ print(FORMAT, "Router IP", "Mac Address", "VLAN ID");
+ List<ExternalPeerRouter> routers = Lists.newArrayList(service.externalPeerRouters());
+
+ for (ExternalPeerRouter router: routers) {
+ print(FORMAT, router.externalPeerRouterIp(),
+ router.externalPeerRouterMac().toString(),
+ router.externalPeerRouterVlanId());
+ }
+
+ }
+}
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
index e89141b..a297ca0 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
@@ -259,7 +259,7 @@
private void printFloatingIp(NetFloatingIP floatingIp) {
final String strFloating = String.format(FLOATING_IP_FORMAT,
floatingIp.getId(),
- floatingIp.getFixedIpAddress(),
+ floatingIp.getFloatingIpAddress(),
Strings.isNullOrEmpty(floatingIp.getFixedIpAddress()) ?
"" : floatingIp.getFixedIpAddress());
print(strFloating);