Support to inject custom controller info through openstacknode
Change-Id: I3a545477b99f515b9e35ee0e7d5aaa03d979eaf7
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackControllerCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackControllerCodec.java
new file mode 100644
index 0000000..1921d43
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackControllerCodec.java
@@ -0,0 +1,64 @@
+/*
+ * 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.openstacknode.codec;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.behaviour.ControllerInfo;
+import org.slf4j.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Openstack controller codec used for serializing and de-serializing JSON string.
+ */
+public class OpenstackControllerCodec extends JsonCodec<ControllerInfo> {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String IP = "ip";
+ private static final String PORT = "port";
+ private static final String TCP = "tcp"; // controller connection should always be TCP
+
+ private static final String MISSING_MESSAGE = " is required in ControllerInfo";
+
+ @Override
+ public ObjectNode encode(ControllerInfo controller, CodecContext context) {
+ checkNotNull(controller, "Openstack controller cannot be null");
+
+ return context.mapper().createObjectNode()
+ .put(IP, controller.ip().toString())
+ .put(PORT, controller.port());
+ }
+
+ @Override
+ public ControllerInfo decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ String ip = nullIsIllegal(json.get(IP).asText(),
+ IP + MISSING_MESSAGE);
+ int port = nullIsIllegal(json.get(PORT).asInt(),
+ PORT + MISSING_MESSAGE);
+
+ return new ControllerInfo(IpAddress.valueOf(ip), port, TCP);
+ }
+}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
index 4f89c3c..282560d 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackNodeCodec.java
@@ -22,11 +22,12 @@
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.behaviour.ControllerInfo;
+import org.onosproject.openstacknode.api.DefaultOpenstackNode;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
-import org.onosproject.openstacknode.api.DefaultOpenstackNode;
import org.slf4j.Logger;
import java.util.ArrayList;
@@ -55,6 +56,7 @@
private static final String INTEGRATION_BRIDGE = "integrationBridge";
private static final String STATE = "state";
private static final String PHYSICAL_INTERFACES = "phyIntfs";
+ private static final String CONTROLLERS = "controllers";
private static final String AUTHENTICATION = "authentication";
private static final String END_POINT = "endPoint";
@@ -100,6 +102,12 @@
});
result.set(PHYSICAL_INTERFACES, phyIntfs);
+ ArrayNode controllers = context.mapper().createArrayNode();
+ node.controllers().forEach(controller -> {
+ ObjectNode controllerJson = context.codec(ControllerInfo.class).encode(controller, context);
+ controllers.add(controllerJson);
+ });
+
if (node.authentication() != null) {
ObjectNode authJson = context.codec(OpenstackAuth.class)
.encode(node.authentication(), context);
@@ -163,6 +171,21 @@
}
nodeBuilder.phyIntfs(phyIntfs);
+ // parse customized controllers
+ List<ControllerInfo> controllers = new ArrayList<>();
+ JsonNode controllersJson = json.get(CONTROLLERS);
+ if (controllersJson != null) {
+
+ final JsonCodec<ControllerInfo>
+ controllerCodec = context.codec(ControllerInfo.class);
+
+ IntStream.range(0, controllersJson.size()).forEach(i -> {
+ ObjectNode controllerJson = get(controllersJson, i);
+ controllers.add(controllerCodec.decode(controllerJson, context));
+ });
+ }
+ nodeBuilder.controllers(controllers);
+
// parse authentication
JsonNode authJson = json.get(AUTHENTICATION);
if (json.get(AUTHENTICATION) != null) {
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuth.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuth.java
index 3257353..5a3b30d 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuth.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuth.java
@@ -22,6 +22,9 @@
import static com.google.common.base.Preconditions.checkArgument;
+/**
+ * Implementation class of openstack authentication.
+ */
public class DefaultOpenstackAuth implements OpenstackAuth {
private final String version;
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
index dc879d8..06b65a3 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
@@ -256,13 +256,19 @@
return;
}
- Set<IpAddress> controllerIps = clusterService.getNodes().stream()
+ List<ControllerInfo> controllers;
+
+ if (osNode.controllers() != null && osNode.controllers().size() > 0) {
+ controllers = (List<ControllerInfo>) osNode.controllers();
+ } else {
+ Set<IpAddress> controllerIps = clusterService.getNodes().stream()
.map(ControllerNode::ip)
.collect(Collectors.toSet());
- List<ControllerInfo> controllers = controllerIps.stream()
- .map(ip -> new ControllerInfo(ip, DEFAULT_OFPORT, DEFAULT_OF_PROTO))
- .collect(Collectors.toList());
+ controllers = controllerIps.stream()
+ .map(ip -> new ControllerInfo(ip, DEFAULT_OFPORT, DEFAULT_OF_PROTO))
+ .collect(Collectors.toList());
+ }
String dpid = deviceId.toString().substring(DPID_BEGIN);
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterface.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterface.java
index f4238a3..498ce5c 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterface.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackPhyInterface.java
@@ -22,6 +22,9 @@
import static com.google.common.base.Preconditions.checkArgument;
+/**
+ * Implementation class of openstack physical interface.
+ */
public class DefaultOpenstackPhyInterface implements OpenstackPhyInterface {
private final String network;
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
index d766473..0383b97 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DistributedOpenstackNodeStore.java
@@ -25,6 +25,7 @@
import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
+import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.openstacknode.api.DefaultOpenstackNode;
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackNode;
@@ -83,6 +84,7 @@
.register(NodeState.class)
.register(OpenstackPhyInterface.class)
.register(DefaultOpenstackPhyInterface.class)
+ .register(ControllerInfo.class)
.register(DefaultOpenstackAuth.class)
.register(DefaultOpenstackAuth.Perspective.class)
.register(DefaultOpenstackAuth.Protocol.class)
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeCodecRegister.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeCodecRegister.java
index c1609a9..9002237 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeCodecRegister.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeCodecRegister.java
@@ -21,10 +21,12 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onosproject.codec.CodecService;
+import org.onosproject.net.behaviour.ControllerInfo;
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
import org.onosproject.openstacknode.codec.OpenstackAuthCodec;
+import org.onosproject.openstacknode.codec.OpenstackControllerCodec;
import org.onosproject.openstacknode.codec.OpenstackNodeCodec;
import org.onosproject.openstacknode.codec.OpenstackPhyInterfaceCodec;
@@ -46,6 +48,7 @@
codecService.registerCodec(OpenstackNode.class, new OpenstackNodeCodec());
codecService.registerCodec(OpenstackAuth.class, new OpenstackAuthCodec());
codecService.registerCodec(OpenstackPhyInterface.class, new OpenstackPhyInterfaceCodec());
+ codecService.registerCodec(ControllerInfo.class, new OpenstackControllerCodec());
log.info("Started");
}
@@ -55,6 +58,7 @@
codecService.unregisterCodec(OpenstackNode.class);
codecService.unregisterCodec(OpenstackAuth.class);
codecService.unregisterCodec(OpenstackPhyInterface.class);
+ codecService.unregisterCodec(ControllerInfo.class);
log.info("Stopped");
}