[ONOS-7621] Support injecting keystone auth info through network-cfg
Change-Id: I2439e257f0f576c46b68322b8c8f1c87fa2cc9ae
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuthTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuthTest.java
new file mode 100644
index 0000000..6442aa0
--- /dev/null
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackAuthTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.testing.EqualsTester;
+import org.junit.Test;
+import org.onosproject.openstacknode.api.OpenstackAuth;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit tests for DefaultOpenstackAuth.
+ */
+public class DefaultOpenstackAuthTest {
+
+ private static final String USERNAME = "admin";
+ private static final String PASSWORD = "nova";
+ private static final String PROJECT = "admin";
+ private static final String VERSION_1 = "v2.0";
+ private static final String VERSION_2 = "v3";
+ private static final Integer PORT_1 = 35357;
+ private static final Integer PORT_2 = 5000;
+ private static final OpenstackAuth.Protocol PROTOCOL_1 = OpenstackAuth.Protocol.HTTP;
+ private static final OpenstackAuth.Protocol PROTOCOL_2 = OpenstackAuth.Protocol.HTTPS;
+
+ private static final OpenstackAuth OS_AUTH_1 =
+ createOpenstackAuth(VERSION_1, PORT_1, PROTOCOL_1);
+ private static final OpenstackAuth OS_AUTH_2 =
+ createOpenstackAuth(VERSION_2, PORT_2, PROTOCOL_2);
+ private static final OpenstackAuth OS_AUTH_3 =
+ createOpenstackAuth(VERSION_1, PORT_1, PROTOCOL_1);
+
+ private static OpenstackAuth createOpenstackAuth(String version,
+ Integer port,
+ OpenstackAuth.Protocol protocol) {
+ return DefaultOpenstackAuth.builder()
+ .version(version)
+ .port(port)
+ .protocol(protocol)
+ .username(USERNAME)
+ .password(PASSWORD)
+ .project(PROJECT)
+ .perspective(OpenstackAuth.Perspective.PUBLIC)
+ .build();
+ }
+
+ @Test
+ public void testEquality() {
+ new EqualsTester().addEqualityGroup(OS_AUTH_1, OS_AUTH_3)
+ .addEqualityGroup(OS_AUTH_2)
+ .testEquals();
+ }
+
+ @Test
+ public void testConstruction() {
+ OpenstackAuth auth = OS_AUTH_1;
+
+ assertThat(auth.version(), is("v2.0"));
+ assertThat(auth.port(), is(35357));
+ assertThat(auth.protocol(), is(OpenstackAuth.Protocol.HTTP));
+ assertThat(auth.username(), is("admin"));
+ assertThat(auth.password(), is("nova"));
+ assertThat(auth.project(), is("admin"));
+ assertThat(auth.perspective(), is(OpenstackAuth.Perspective.PUBLIC));
+ }
+}
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
index fccfd1b..ff59237 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandlerTest.java
@@ -69,6 +69,7 @@
import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
import org.onosproject.net.provider.ProviderId;
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.ovsdb.controller.OvsdbClientService;
@@ -407,7 +408,7 @@
intgBridge.id(),
ipAddr,
ipAddr,
- null, null, state, phyIntfs);
+ null, null, state, phyIntfs, null);
}
private static OpenstackNode createGatewayNode(String hostname,
@@ -422,7 +423,7 @@
intgBridge.id(),
ipAddr,
ipAddr,
- null, uplinkPort, state, null);
+ null, uplinkPort, state, null, null);
}
private static final class TestDevice extends DefaultDevice {
@@ -480,7 +481,8 @@
String vlanIntf,
String uplinkPort,
NodeState state,
- Set<OpenstackPhyInterface> phyIntfs) {
+ Set<OpenstackPhyInterface> phyIntfs,
+ OpenstackAuth auth) {
super(hostname,
type,
intgBridge,
@@ -489,7 +491,8 @@
vlanIntf,
uplinkPort,
state,
- phyIntfs);
+ phyIntfs,
+ auth);
}
@Override
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeTest.java
index 47ce53d..505b907 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeTest.java
@@ -91,21 +91,6 @@
}
/**
- * Checks building a node without integration bridge ID fails with
- * proper exception.
- */
- @Test(expected = IllegalArgumentException.class)
- public void testBuildWithoutIntegrationBridgeId() {
- DefaultOpenstackNode.builder()
- .hostname(HOSTNAME_1)
- .type(OpenstackNode.NodeType.COMPUTE)
- .managementIp(TEST_IP)
- .dataIp(TEST_IP)
- .state(NodeState.INIT)
- .build();
- }
-
- /**
* Checks building a node without management IP address fails with
* proper exception.
*/