ONOS-6742 Refactored OpenstackNode
- Removed gateway node uplink interface configuration steps
- Added checking group states
- Refactored interface, store, manager and handler
Change-Id: I9149edbec6481b15377848c8f24bdc5c6c73adc4
diff --git a/apps/openstacknode/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeConfig.java b/apps/openstacknode/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeConfig.java
new file mode 100644
index 0000000..774342a
--- /dev/null
+++ b/apps/openstacknode/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeConfig.java
@@ -0,0 +1,128 @@
+/*
+ * 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.openstacknode.api;
+
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Sets;
+import org.onlab.packet.IpAddress;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.config.Config;
+import org.onosproject.openstacknode.impl.DefaultOpenstackNode;
+
+import java.util.Set;
+
+import static org.onosproject.net.config.Config.FieldPresence.MANDATORY;
+import static org.onosproject.net.config.Config.FieldPresence.OPTIONAL;
+import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
+
+/**
+ * Configuration object for OpensatckNode service.
+ */
+public final class OpenstackNodeConfig extends Config<ApplicationId> {
+
+ private static final String NODES = "nodes";
+ private static final String HOST_NAME = "hostname";
+ private static final String TYPE = "type";
+ private static final String MANAGEMENT_IP = "managementIp";
+ private static final String DATA_IP = "dataIp";
+ private static final String INTEGRATION_BRIDGE = "integrationBridge";
+
+ // GATEWAY node specific fields
+ private static final String ROUTER_BRIDGE = "routerBridge";
+ private static final String VLAN_INTF_NAME = "vlanPort";
+
+ @Override
+ public boolean isValid() {
+ boolean result = hasOnlyFields(NODES);
+ if (object.get(NODES) == null || object.get(NODES).size() < 1) {
+ return true;
+ }
+
+ for (JsonNode node : object.get(NODES)) {
+ if (get(node, DATA_IP) == null && get(node, VLAN_INTF_NAME) == null) {
+ final String msg = "There is neither tunnel interface nor vlan port";
+ throw new IllegalArgumentException(msg);
+ }
+ ObjectNode osNode = (ObjectNode) node;
+ result &= hasOnlyFields(osNode,
+ HOST_NAME,
+ TYPE,
+ MANAGEMENT_IP,
+ DATA_IP,
+ INTEGRATION_BRIDGE,
+ ROUTER_BRIDGE,
+ VLAN_INTF_NAME
+ );
+
+ result &= isString(osNode, HOST_NAME, MANDATORY);
+ result &= isString(osNode, TYPE, MANDATORY);
+ result &= isIpAddress(osNode, MANAGEMENT_IP, MANDATORY);
+ result &= isString(osNode, INTEGRATION_BRIDGE, MANDATORY);
+ result &= isString(osNode, VLAN_INTF_NAME, OPTIONAL);
+ result &= isIpAddress(osNode, DATA_IP, OPTIONAL);
+
+ DeviceId.deviceId(osNode.get(INTEGRATION_BRIDGE).asText());
+ OpenstackNode.NodeType.valueOf(osNode.get(TYPE).asText());
+
+ if (osNode.get(TYPE).asText().equals(GATEWAY.name())) {
+ result &= isString(osNode, ROUTER_BRIDGE, MANDATORY);
+ DeviceId.deviceId(osNode.get(ROUTER_BRIDGE).asText());
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns the set of nodes read from network config.
+ *
+ * @return set of openstack nodes
+ */
+ public Set<OpenstackNode> openstackNodes() {
+ Set<OpenstackNode> nodes = Sets.newHashSet();
+ for (JsonNode node : object.get(NODES)) {
+ OpenstackNode.NodeType type = OpenstackNode.NodeType.valueOf(get(node, TYPE));
+ OpenstackNode.Builder nodeBuilder = DefaultOpenstackNode.builder()
+ .intgBridge(DeviceId.deviceId(get(node, INTEGRATION_BRIDGE)))
+ .managementIp(IpAddress.valueOf(get(node, MANAGEMENT_IP)))
+ .type(type)
+ .hostname(get(node, HOST_NAME))
+ .state(NodeState.INIT);
+
+ if (get(node, DATA_IP) != null) {
+ nodeBuilder.dataIp(IpAddress.valueOf(get(node, DATA_IP)));
+ }
+ if (get(node, VLAN_INTF_NAME) != null) {
+ nodeBuilder.vlanIntf(get(node, VLAN_INTF_NAME));
+ }
+ if (type.equals(GATEWAY)) {
+ nodeBuilder.routerBridge(DeviceId.deviceId(get(node, ROUTER_BRIDGE)));
+ }
+ nodes.add(nodeBuilder.build());
+ }
+ return nodes;
+ }
+
+ private String get(JsonNode jsonNode, String path) {
+ JsonNode jNode = jsonNode.get(path);
+ if (jNode == null || jNode.isMissingNode()) {
+ return null;
+ }
+ return jNode.asText();
+ }
+}