[ONOS-7621] Support injecting keystone auth info through network-cfg
Change-Id: I2439e257f0f576c46b68322b8c8f1c87fa2cc9ae
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
new file mode 100644
index 0000000..3257353
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuth.java
@@ -0,0 +1,225 @@
+/*
+ * 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.impl;
+
+import com.google.common.base.MoreObjects;
+import org.onosproject.openstacknode.api.OpenstackAuth;
+
+import java.util.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+public class DefaultOpenstackAuth implements OpenstackAuth {
+
+ private final String version;
+ private final Integer port;
+ private final Protocol protocol;
+ private final String username;
+ private final String password;
+ private final String project;
+ private final Perspective perspective;
+
+ private static final String NOT_NULL_MSG = "% cannot be null";
+
+ /**
+ * A default constructor of keystone authentication instance.
+ *
+ * @param version version number
+ * @param port endpoint port number
+ * @param protocol endpoint protocol type
+ * @param username keystone username
+ * @param password keystone password
+ * @param project project name
+ * @param perspective user perspective
+ */
+ protected DefaultOpenstackAuth(String version, Integer port, Protocol protocol,
+ String username, String password, String project,
+ Perspective perspective) {
+
+ this.version = version;
+ this.port = port;
+ this.protocol = protocol;
+ this.username = username;
+ this.password = password;
+ this.project = project;
+ this.perspective = perspective;
+ }
+
+ @Override
+ public String version() {
+ return version;
+ }
+
+ @Override
+ public Integer port() {
+ return port;
+ }
+
+ @Override
+ public Protocol protocol() {
+ return protocol;
+ }
+
+ @Override
+ public String username() {
+ return username;
+ }
+
+ @Override
+ public String password() {
+ return password;
+ }
+
+ @Override
+ public String project() {
+ return project;
+ }
+
+ @Override
+ public Perspective perspective() {
+ return perspective;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (obj instanceof DefaultOpenstackAuth) {
+ DefaultOpenstackAuth that = (DefaultOpenstackAuth) obj;
+ return Objects.equals(version, that.version) &&
+ Objects.equals(port, that.port) &&
+ Objects.equals(protocol, that.protocol) &&
+ Objects.equals(username, that.username) &&
+ Objects.equals(password, that.password) &&
+ Objects.equals(project, that.project) &&
+ Objects.equals(perspective, that.perspective);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(version,
+ port,
+ protocol,
+ username,
+ password,
+ project,
+ perspective);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(getClass())
+ .add("version", version)
+ .add("port", port)
+ .add("protocol", protocol)
+ .add("username", username)
+ .add("password", password)
+ .add("project", project)
+ .add("perspective", perspective)
+ .toString();
+ }
+
+ /**
+ * Returns new builder instance.
+ *
+ * @return keystone authentication instance builder
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * A builder class for openstack authentication.
+ */
+ public static final class Builder implements OpenstackAuth.Builder {
+
+ private String version;
+ private Integer port;
+ private Protocol protocol;
+ private String username;
+ private String password;
+ private String project;
+ private Perspective perspective;
+
+ // private constructor not intended to use from external
+ private Builder() {
+ }
+
+ @Override
+ public OpenstackAuth build() {
+ checkArgument(version != null, NOT_NULL_MSG, "version");
+ checkArgument(port != null, NOT_NULL_MSG, "port");
+ checkArgument(protocol != null, NOT_NULL_MSG, "protocol");
+ checkArgument(username != null, NOT_NULL_MSG, "username");
+ checkArgument(password != null, NOT_NULL_MSG, "password");
+ checkArgument(project != null, NOT_NULL_MSG, "project");
+
+ return new DefaultOpenstackAuth(version,
+ port,
+ protocol,
+ username,
+ password,
+ project,
+ perspective);
+ }
+
+ @Override
+ public Builder version(String version) {
+ this.version = version;
+ return this;
+ }
+
+ @Override
+ public Builder port(Integer port) {
+ this.port = port;
+ return this;
+ }
+
+ @Override
+ public Builder protocol(Protocol protocol) {
+ this.protocol = protocol;
+ return this;
+ }
+
+ @Override
+ public Builder username(String username) {
+ this.username = username;
+ return this;
+ }
+
+ @Override
+ public Builder password(String password) {
+ this.password = password;
+ return this;
+ }
+
+ @Override
+ public Builder project(String project) {
+ this.project = project;
+ return this;
+ }
+
+ @Override
+ public Builder perspective(Perspective perspective) {
+ this.perspective = perspective;
+ return this;
+ }
+ }
+}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNode.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNode.java
index c632847..f05d58b 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNode.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNode.java
@@ -28,6 +28,7 @@
import org.onosproject.net.group.DefaultGroupKey;
import org.onosproject.net.group.GroupKey;
import org.onosproject.openstacknode.api.NodeState;
+import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
@@ -56,6 +57,7 @@
private final String uplinkPort;
private final NodeState state;
private final Collection<OpenstackPhyInterface> phyIntfs;
+ private final OpenstackAuth auth;
private static final String NOT_NULL_MSG = "Node % cannot be null";
@@ -73,6 +75,7 @@
* @param uplinkPort uplink port name
* @param state node state
* @param phyIntfs physical interfaces
+ * @param auth keystone authentication info
*/
protected DefaultOpenstackNode(String hostname, NodeType type,
DeviceId intgBridge,
@@ -81,7 +84,8 @@
String vlanIntf,
String uplinkPort,
NodeState state,
- Collection<OpenstackPhyInterface> phyIntfs) {
+ Collection<OpenstackPhyInterface> phyIntfs,
+ OpenstackAuth auth) {
this.hostname = hostname;
this.type = type;
this.intgBridge = intgBridge;
@@ -91,6 +95,7 @@
this.uplinkPort = uplinkPort;
this.state = state;
this.phyIntfs = phyIntfs;
+ this.auth = auth;
}
@Override
@@ -229,7 +234,8 @@
Objects.equals(dataIp, that.dataIp) &&
Objects.equals(uplinkPort, that.uplinkPort) &&
Objects.equals(vlanIntf, that.vlanIntf) &&
- Objects.equals(phyIntfs, that.phyIntfs);
+ Objects.equals(phyIntfs, that.phyIntfs) &&
+ Objects.equals(auth, that.auth);
}
return false;
}
@@ -243,7 +249,8 @@
dataIp,
vlanIntf,
uplinkPort,
- phyIntfs);
+ phyIntfs,
+ auth);
}
@Override
@@ -258,6 +265,7 @@
.add("uplinkPort", uplinkPort)
.add("state", state)
.add("phyIntfs", phyIntfs)
+ .add("auth", auth)
.toString();
}
@@ -273,6 +281,7 @@
.uplinkPort(uplinkPort)
.state(newState)
.phyIntfs(phyIntfs)
+ .authentication(auth)
.build();
}
@@ -304,6 +313,12 @@
}
}
+
+ @Override
+ public OpenstackAuth authentication() {
+ return auth;
+ }
+
/**
* Returns new builder instance.
*
@@ -329,7 +344,8 @@
.vlanIntf(osNode.vlanIntf())
.uplinkPort(osNode.uplinkPort())
.state(osNode.state())
- .phyIntfs(osNode.phyIntfs());
+ .phyIntfs(osNode.phyIntfs())
+ .authentication(osNode.authentication());
}
/**
@@ -346,6 +362,7 @@
private String uplinkPort;
private NodeState state;
private Collection<OpenstackPhyInterface> phyIntfs;
+ private OpenstackAuth auth;
// private constructor not intended to use from external
private Builder() {
@@ -355,16 +372,24 @@
public DefaultOpenstackNode build() {
checkArgument(hostname != null, NOT_NULL_MSG, "hostname");
checkArgument(type != null, NOT_NULL_MSG, "type");
- checkArgument(intgBridge != null, NOT_NULL_MSG, "integration bridge");
+
checkArgument(managementIp != null, NOT_NULL_MSG, "management IP");
checkArgument(state != null, NOT_NULL_MSG, "state");
+ if (type != NodeType.CONTROLLER) {
+ checkArgument(intgBridge != null, NOT_NULL_MSG, "integration bridge");
+
+ if (dataIp == null && Strings.isNullOrEmpty(vlanIntf)) {
+ throw new IllegalArgumentException("Either data IP or VLAN interface is required");
+ }
+ } else {
+ // we force controller node to have COMPLETE state for now
+ state = NodeState.COMPLETE;
+ }
+
if (type == NodeType.GATEWAY && uplinkPort == null) {
throw new IllegalArgumentException("Uplink port is required for gateway node");
}
- if (dataIp == null && Strings.isNullOrEmpty(vlanIntf)) {
- throw new IllegalArgumentException("Either data IP or VLAN interface is required");
- }
return new DefaultOpenstackNode(hostname,
type,
@@ -374,7 +399,8 @@
vlanIntf,
uplinkPort,
state,
- phyIntfs);
+ phyIntfs,
+ auth);
}
@Override
@@ -432,6 +458,12 @@
this.phyIntfs = phyIntfs;
return this;
}
+
+ @Override
+ public Builder authentication(OpenstackAuth auth) {
+ this.auth = auth;
+ return this;
+ }
}
}
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 025757e..b9e193a 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
@@ -51,7 +51,6 @@
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.instructions.ExtensionPropertyException;
import org.onosproject.net.flow.instructions.ExtensionTreatment;
-
import org.onosproject.openstacknode.api.NodeState;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackNodeAdminService;
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 d3c2ce4..be49135 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
@@ -50,11 +50,14 @@
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
import static org.onosproject.openstacknode.api.NodeState.INCOMPLETE;
+import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.CONTROLLER;
import static org.onosproject.openstacknode.api.OpenstackNodeEvent.Type.OPENSTACK_NODE_COMPLETE;
import static org.onosproject.openstacknode.api.OpenstackNodeEvent.Type.OPENSTACK_NODE_CREATED;
import static org.onosproject.openstacknode.api.OpenstackNodeEvent.Type.OPENSTACK_NODE_INCOMPLETE;
import static org.onosproject.openstacknode.api.OpenstackNodeEvent.Type.OPENSTACK_NODE_REMOVED;
import static org.onosproject.openstacknode.api.OpenstackNodeEvent.Type.OPENSTACK_NODE_UPDATED;
+import static org.onosproject.store.service.MapEvent.Type.INSERT;
+import static org.onosproject.store.service.MapEvent.Type.UPDATE;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -79,6 +82,9 @@
.register(NodeState.class)
.register(OpenstackPhyInterface.class)
.register(DefaultOpenstackPhyInterface.class)
+ .register(DefaultOpenstackAuth.class)
+ .register(DefaultOpenstackAuth.Perspective.class)
+ .register(DefaultOpenstackAuth.Protocol.class)
.register(Collection.class)
.build();
@@ -159,6 +165,24 @@
@Override
public void event(MapEvent<String, OpenstackNode> event) {
+
+ OpenstackNode node;
+
+ if (event.type() == INSERT || event.type() == UPDATE) {
+ node = event.newValue().value();
+ } else {
+ node = event.oldValue().value();
+ }
+
+ // we do not notify the controller node related event
+ // controller node event should be handled in different way
+ if (node.type() == CONTROLLER) {
+ // TODO: need to find a way to check the controller node availability
+ log.info("node {} is detected", node.hostname());
+
+ return;
+ }
+
switch (event.type()) {
case INSERT:
log.debug("OpenStack node created {}", event.newValue());