[ONOS-7444] Optimize SONA gw doesn't use vrouter app and quagga anymore
Change-Id: I70fd7a9dbe219a9ea6081d0f19bf051a1bee090a
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
index 06e592c..8bf4ceb 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/Constants.java
@@ -28,4 +28,11 @@
public static final String DEFAULT_TUNNEL = "vxlan";
public static final String PATCH_INTG_BRIDGE = "patch-intg";
public static final String PATCH_ROUT_BRIDGE = "patch-rout";
+ public static final String GATEWAY = "GATEWAY";
+ public static final String HOST_NAME = "hostname";
+ public static final String TYPE = "type";
+ public static final String MANAGEMENT_IP = "managementIp";
+ public static final String DATA_IP = "dataIp";
+ public static final String VLAN_INTF_NAME = "vlanPort";
+ public static final String UPLINK_PORT = "uplinkPort";
}
\ No newline at end of file
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/NodeState.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/NodeState.java
index f65901c..f34bdb7 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/NodeState.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/NodeState.java
@@ -45,20 +45,6 @@
@Override
public NodeState nextState() {
- return PORT_CREATED;
- }
- },
- /**
- * Indicates required ports are added.
- */
- PORT_CREATED {
- @Override
- public void process(OpenstackNodeHandler handler, OpenstackNode osNode) {
- handler.processPortCreatedState(osNode);
- }
-
- @Override
- public NodeState nextState() {
return COMPLETE;
}
},
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java
index ca03b86..f1e2bc5 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java
@@ -72,13 +72,6 @@
DeviceId intgBridge();
/**
- * Returns the router bridge device ID.
- *
- * @return device id; null if the node type is compute
- */
- DeviceId routerBridge();
-
- /**
* Returns the management network IP address of the node.
*
* @return ip address
@@ -151,6 +144,13 @@
MacAddress vlanPortMac();
/**
+ * Returns the uplink port name.
+ *
+ * @return uplink port name; null if the node type is compute
+ */
+ String uplinkPort();
+
+ /**
* Returns new openstack node instance with given state.
*
* @param newState updated state
@@ -195,14 +195,6 @@
Builder intgBridge(DeviceId intgBridge);
/**
- * Returns openstack node builder with supplied router bridge ID.
- *
- * @param routerBridge router bridge id
- * @return openstack node builder
- */
- Builder routerBridge(DeviceId routerBridge);
-
- /**
* Returns openstack node builder with supplied management IP address.
*
* @param managementIp management ip address
@@ -227,6 +219,14 @@
Builder vlanIntf(String vlanIntf);
/**
+ * Returns openstack node builder with supplied uplink port.
+ *
+ * @param uplinkPort uplink port name
+ * @return openstack node builder
+ */
+ Builder uplinkPort(String uplinkPort);
+
+ /**
* Returns openstack node builder with supplied node state.
*
* @param state node state
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeHandler.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeHandler.java
index 0264d17..a421410 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeHandler.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeHandler.java
@@ -37,14 +37,6 @@
void processDeviceCreatedState(OpenstackNode osNode);
/**
- * Processes the given node for port created state.
- * It creates gateway groups on compute node.
- *
- * @param osNode openstack node
- */
- void processPortCreatedState(OpenstackNode osNode);
-
- /**
* Processes the given node for complete state.
* It performs post-init jobs for the complete node.
*