Refactored to handle service instance by service type
- Added service instance handler
- Implemented dummy, vsg, and olt agent instance handler
Change-Id: Id3edd5eecb1caadf0f835cb10a952100e18b283b
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java b/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
index b50d6fc..be097ce 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
+++ b/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
@@ -20,6 +20,7 @@
import com.google.common.collect.Sets;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.TpPort;
import org.onosproject.core.ApplicationId;
@@ -46,6 +47,7 @@
public static final String GATEWAY_IP = "gatewayIp";
public static final String GATEWAY_MAC = "gatewayMac";
public static final String LOCAL_MANAGEMENT_IP = "localManagementIp";
+ public static final String MANAGEMENT_IP = "managementIpRange";
public static final String OVSDB_PORT = "ovsdbPort";
public static final String CORDVTN_NODES = "nodes";
@@ -187,6 +189,25 @@
}
/**
+ * Returns management IP address range.
+ *
+ * @return management network ip prefix, or null
+ */
+ public IpPrefix managementIpRange() {
+ JsonNode jsonNode = object.get(MANAGEMENT_IP);
+ if (jsonNode == null) {
+ return null;
+ }
+
+ try {
+ return IpPrefix.valueOf(jsonNode.asText());
+ } catch (IllegalArgumentException e) {
+ log.error("{}:{} wrong address format", MANAGEMENT_IP, jsonNode);
+ return null;
+ }
+ }
+
+ /**
* Returns XOS access information.
*
* @return XOS access, or null
diff --git a/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java b/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java
index bd25b0f..1a8849e 100644
--- a/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java
+++ b/src/main/java/org/onosproject/cordvtn/api/CordVtnService.java
@@ -15,14 +15,8 @@
*/
package org.onosproject.cordvtn.api;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.HostId;
import org.onosproject.xosclient.api.VtnServiceId;
-import java.util.Map;
-
/**
* Service for provisioning overlay virtual networks on compute nodes.
*/
@@ -31,21 +25,6 @@
String CORDVTN_APP_ID = "org.onosproject.cordvtn";
/**
- * Adds a new VM on a given node and connect point.
- *
- * @param node cordvtn node
- * @param connectPoint connect point
- */
- void addServiceVm(CordVtnNode node, ConnectPoint connectPoint);
-
- /**
- * Removes a VM from a given node and connect point.
- *
- * @param connectPoint connect point
- */
- void removeServiceVm(ConnectPoint connectPoint);
-
- /**
* Creates dependencies for a given tenant service.
*
* @param tServiceId id of the service which has a dependency
@@ -62,14 +41,4 @@
* @param pServiceId id of the service which provide dependency
*/
void removeServiceDependency(VtnServiceId tServiceId, VtnServiceId pServiceId);
-
- /**
- * Updates virtual service gateways.
- *
- * @param vSgHost host id of vSG host
- * @param serviceVlan service vlan id
- * @param vSgs map of ip and mac address of vSGs running in this vSG host
- */
- void updateVirtualSubscriberGateways(HostId vSgHost, String serviceVlan,
- Map<IpAddress, MacAddress> vSgs);
}
diff --git a/src/main/java/org/onosproject/cordvtn/api/Instance.java b/src/main/java/org/onosproject/cordvtn/api/Instance.java
new file mode 100644
index 0000000..83c7c08
--- /dev/null
+++ b/src/main/java/org/onosproject/cordvtn/api/Instance.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.cordvtn.api;
+
+import com.google.common.base.Strings;
+import org.onlab.packet.Ip4Address;
+import org.onlab.packet.MacAddress;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.PortNumber;
+import org.onosproject.xosclient.api.VtnPortId;
+import org.onosproject.xosclient.api.VtnService;
+import org.onosproject.xosclient.api.VtnServiceId;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Provides methods to help to handle network service instance.
+ */
+public final class Instance {
+
+ public static final String SERVICE_ID = "serviceId";
+ public static final String SERVICE_TYPE = "serviceType";
+ public static final String PORT_ID = "vtnPortId";
+ public static final String CREATE_TIME = "createTime";
+ public static final String NESTED_INSTANCE = "nestedInstance";
+ public static final String TRUE = "true";
+
+ private final Host host;
+
+ /**
+ * Default constructor.
+ *
+ * @param instance host object of this instance
+ */
+ private Instance(Host instance) {
+ this.host = instance;
+ }
+
+ /**
+ * Returns host object of this instance.
+ *
+ * @return host
+ */
+ public Host host() {
+ return this.host;
+ }
+
+ /**
+ * Returns new instance.
+ *
+ * @param host host object of this instance
+ * @return instance
+ */
+ public static Instance of(Host host) {
+ checkNotNull(host);
+ checkArgument(!Strings.isNullOrEmpty(host.annotations().value(SERVICE_ID)));
+ checkArgument(!Strings.isNullOrEmpty(host.annotations().value(SERVICE_TYPE)));
+ checkArgument(!Strings.isNullOrEmpty(host.annotations().value(PORT_ID)));
+ checkArgument(!Strings.isNullOrEmpty(host.annotations().value(CREATE_TIME)));
+
+ return new Instance(host);
+ }
+
+ /**
+ * Returns service ID of a given host.
+ *
+ * @return vtn service id
+ */
+ public VtnServiceId serviceId() {
+ String serviceId = host.annotations().value(SERVICE_ID);
+ return VtnServiceId.of(serviceId);
+ }
+
+ /**
+ * Returns service type of a given host.
+ *
+ * @return vtn service type
+ */
+ public VtnService.ServiceType serviceType() {
+ String serviceType = host.annotations().value(SERVICE_TYPE);
+ return VtnService.ServiceType.valueOf(serviceType);
+ }
+
+ /**
+ * Returns port ID of a given host.
+ *
+ * @return vtn port id
+ */
+ public VtnPortId portId() {
+ String portId = host.annotations().value(PORT_ID);
+ return VtnPortId.of(portId);
+ }
+
+ /**
+ * Returns if the instance is nested container or not.
+ *
+ * @return true if it's nested container; false otherwise
+ */
+ public boolean isNestedInstance() {
+ return host.annotations().value(NESTED_INSTANCE) != null;
+ }
+
+ /**
+ * Returns MAC address of this instance.
+ *
+ * @return mac address
+ */
+ public MacAddress mac() {
+ return host.mac();
+ }
+
+ /**
+ * Returns IP address of this instance.
+ *
+ * @return ip address
+ */
+ public Ip4Address ipAddress() {
+ // assume all instance has only one IP address, and only IP4 is supported now
+ return host.ipAddresses().stream().findFirst().get().getIp4Address();
+ }
+
+ /**
+ * Returns device ID of this host.
+ *
+ * @return device id
+ */
+ public DeviceId deviceId() {
+ return host.location().deviceId();
+ }
+
+ /**
+ * Returns the port number where this host is.
+ *
+ * @return port number
+ */
+ public PortNumber portNumber() {
+ return host.location().port();
+ }
+
+ /**
+ * Returns annotation value with a given key.
+ *
+ * @param annotationKey annotation key
+ * @return annotation value
+ */
+ public String getAnnotation(String annotationKey) {
+ return host.annotations().value(annotationKey);
+ }
+
+ @Override
+ public String toString() {
+ return host.toString();
+ }
+}
diff --git a/src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java b/src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java
new file mode 100644
index 0000000..3e5be2f
--- /dev/null
+++ b/src/main/java/org/onosproject/cordvtn/api/InstanceHandler.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * 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.cordvtn.api;
+
+/**
+ * Handles service instance detection and removal.
+ */
+public interface InstanceHandler {
+
+ /**
+ * Handles newly detected instance.
+ *
+ * @param instance instance
+ */
+ void instanceDetected(Instance instance);
+
+ /**
+ * Handles removed instance.
+ *
+ * @param instance instance
+ */
+ void instanceRemoved(Instance instance);
+}