Adds ssh authentication information in OpenstackNode class.
Change-Id: I46552bc580d1ac82d4236b03589c005622170ffe
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackAuthJsonMatcher.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackAuthJsonMatcher.java
index 055fbe6..2f165f9 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackAuthJsonMatcher.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackAuthJsonMatcher.java
@@ -21,7 +21,7 @@
import org.onosproject.openstacknode.api.OpenstackAuth;
/**
- * Hamcrest matcher for opensatck auth.
+ * Hamcrest matcher for openstack auth.
*/
public final class OpenstackAuthJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> {
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeCodecTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeCodecTest.java
index 7d504d3..a42bfcd 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeCodecTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeCodecTest.java
@@ -33,9 +33,11 @@
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
+import org.onosproject.openstacknode.api.OpenstackSshAuth;
import org.onosproject.openstacknode.impl.DefaultOpenstackAuth;
import org.onosproject.openstacknode.api.DefaultOpenstackNode;
import org.onosproject.openstacknode.impl.DefaultOpenstackPhyInterface;
+import org.onosproject.openstacknode.impl.DefaultOpenstackSshAuth;
import java.io.IOException;
import java.io.InputStream;
@@ -60,6 +62,8 @@
JsonCodec<OpenstackPhyInterface> openstackPhyIntfJsonCodec;
JsonCodec<ControllerInfo> openstackControllerJsonCodec;
JsonCodec<OpenstackAuth> openstackAuthJsonCodec;
+ JsonCodec<OpenstackSshAuth> openstackSshAuthJsonCodec;
+
final CoreService mockCoreService = createMock(CoreService.class);
private static final String REST_APP_ID = "org.onosproject.rest";
@@ -70,11 +74,13 @@
openstackPhyIntfJsonCodec = new OpenstackPhyInterfaceCodec();
openstackControllerJsonCodec = new OpenstackControllerCodec();
openstackAuthJsonCodec = new OpenstackAuthCodec();
+ openstackSshAuthJsonCodec = new OpenstackSshAuthCodec();
assertThat(openstackNodeCodec, notNullValue());
assertThat(openstackPhyIntfJsonCodec, notNullValue());
assertThat(openstackControllerJsonCodec, notNullValue());
assertThat(openstackAuthJsonCodec, notNullValue());
+ assertThat(openstackSshAuthJsonCodec, notNullValue());
expect(mockCoreService.registerApplication(REST_APP_ID))
.andReturn(APP_ID).anyTimes();
@@ -97,6 +103,11 @@
.intf("eth4")
.build();
+ OpenstackSshAuth sshAuth = DefaultOpenstackSshAuth.builder()
+ .id("sdn")
+ .password("sdn")
+ .build();
+
ControllerInfo controller1 =
new ControllerInfo(IpAddress.valueOf("10.10.10.2"), 6653, "tcp");
ControllerInfo controller2 =
@@ -112,6 +123,7 @@
.dataIp(IpAddress.valueOf("20.20.20.2"))
.phyIntfs(ImmutableList.of(phyIntf1, phyIntf2))
.controllers(ImmutableList.of(controller1, controller2))
+ .sshAuthInfo(sshAuth)
.build();
ObjectNode nodeJson = openstackNodeCodec.encode(node, context);
@@ -135,6 +147,8 @@
assertThat(node.vlanIntf(), is("eth2"));
assertThat(node.phyIntfs().size(), is(2));
assertThat(node.controllers().size(), is(2));
+ assertThat(node.sshAuthInfo().id(), is("sdn"));
+ assertThat(node.sshAuthInfo().password(), is("sdn"));
node.phyIntfs().forEach(intf -> {
if (intf.network().equals("mgmtnetwork")) {
@@ -254,6 +268,9 @@
if (entityClass == OpenstackAuth.class) {
return (JsonCodec<T>) openstackAuthJsonCodec;
}
+ if (entityClass == OpenstackSshAuth.class) {
+ return (JsonCodec<T>) openstackSshAuthJsonCodec;
+ }
return manager.getCodec(entityClass);
}
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeJsonMatcher.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeJsonMatcher.java
index d715865..e8b6d07 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeJsonMatcher.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackNodeJsonMatcher.java
@@ -23,6 +23,7 @@
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
+import org.onosproject.openstacknode.api.OpenstackSshAuth;
import static org.onosproject.openstacknode.api.Constants.DATA_IP;
import static org.onosproject.openstacknode.api.Constants.MANAGEMENT_IP;
@@ -40,6 +41,7 @@
private static final String CONTROLLERS = "controllers";
private static final String AUTHENTICATION = "authentication";
private static final String END_POINT = "endPoint";
+ private static final String SSH_AUTH = "sshAuth";
private OpenstackNodeJsonMatcher(OpenstackNode node) {
this.node = node;
@@ -120,6 +122,17 @@
}
}
+ // check openstack ssh auth
+ JsonNode jsonSshAuth = jsonNode.get(SSH_AUTH);
+ if (jsonSshAuth != null) {
+ OpenstackSshAuth sshAuth = node.sshAuthInfo();
+ OpenstackSshAuthJsonMatcher sshAuthJsonMatcher =
+ OpenstackSshAuthJsonMatcher.matchOpenstackSshAuth(sshAuth);
+ if (!sshAuthJsonMatcher.matches(jsonSshAuth)) {
+ return false;
+ }
+ }
+
// check endpoint URL
JsonNode jsonEndPoint = jsonNode.get(END_POINT);
if (jsonEndPoint != null) {
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackSshAuthJsonMatcher.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackSshAuthJsonMatcher.java
new file mode 100644
index 0000000..9108885
--- /dev/null
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/OpenstackSshAuthJsonMatcher.java
@@ -0,0 +1,73 @@
+/*
+ * 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.JsonNode;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.onosproject.openstacknode.api.OpenstackSshAuth;
+
+/**
+ * Hamcrest matcher for openstack SSH auth.
+ */
+public final class OpenstackSshAuthJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> {
+
+ private final OpenstackSshAuth sshAuth;
+
+ private static final String ID = "id";
+ private static final String PASSWORD = "password";
+
+ private OpenstackSshAuthJsonMatcher(OpenstackSshAuth sshAuth) {
+ this.sshAuth = sshAuth;
+ }
+
+ @Override
+ protected boolean matchesSafely(JsonNode jsonNode, Description description) {
+
+ // check id
+ String jsonId = jsonNode.get(ID).asText();
+ String id = sshAuth.id();
+ if (!jsonId.equals(id)) {
+ description.appendText("id was " + jsonId);
+ return false;
+ }
+
+ // check password
+ String jsonPassword = jsonNode.get(PASSWORD).asText();
+ String password = sshAuth.id();
+ if (!jsonPassword.equals(password)) {
+ description.appendText("password was " + jsonId);
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText(sshAuth.toString());
+ }
+
+ /**
+ * Factory to allocate an openstack SSH auth matcher.
+ *
+ * @param sshAuth openstack SSH auth object we are looking for
+ * @return matcher
+ */
+ public static OpenstackSshAuthJsonMatcher matchOpenstackSshAuth(OpenstackSshAuth sshAuth) {
+ return new OpenstackSshAuthJsonMatcher(sshAuth);
+ }
+}
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 92c7615..ee5e478 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
@@ -74,6 +74,7 @@
import org.onosproject.openstacknode.api.OpenstackAuth;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
+import org.onosproject.openstacknode.api.OpenstackSshAuth;
import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbController;
@@ -422,7 +423,7 @@
intgBridge.id(),
ipAddr,
ipAddr,
- null, null, state, phyIntfs, controllers, null, null);
+ null, null, state, phyIntfs, controllers, null, null, null);
}
private static OpenstackNode createGatewayNode(String hostname,
@@ -437,7 +438,8 @@
intgBridge.id(),
ipAddr,
ipAddr,
- null, uplinkPort, state, null, null, null, null);
+ null, uplinkPort, state,
+ null, null, null, null, null);
}
private static final class TestDevice extends DefaultDevice {
@@ -498,7 +500,8 @@
Set<OpenstackPhyInterface> phyIntfs,
Set<ControllerInfo> controllers,
OpenstackAuth auth,
- String endPoint) {
+ String endPoint,
+ OpenstackSshAuth sshAuth) {
super(hostname,
type,
intgBridge,
@@ -510,7 +513,8 @@
phyIntfs,
controllers,
auth,
- endPoint);
+ endPoint,
+ sshAuth);
}
@Override
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackSshAuthTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackSshAuthTest.java
new file mode 100644
index 0000000..bdba45c
--- /dev/null
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/DefaultOpenstackSshAuthTest.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.impl;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Test;
+import org.onosproject.openstacknode.api.OpenstackSshAuth;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+/**
+ * Unit tests for DefaultOpenstackSshAuth.
+ */
+public class DefaultOpenstackSshAuthTest {
+
+ private static final String ID_1 = "sdn1";
+ private static final String ID_2 = "sdn2";
+ private static final String PASSWORD_1 = "password1";
+ private static final String PASSWORD_2 = "password2";
+
+ private static final OpenstackSshAuth OS_SSH_AUTH_1 =
+ createOpenstackSshAuth(ID_1, PASSWORD_1);
+ private static final OpenstackSshAuth OS_SSH_AUTH_2 =
+ createOpenstackSshAuth(ID_2, PASSWORD_2);
+ private static final OpenstackSshAuth OS_SSH_AUTH_3 =
+ createOpenstackSshAuth(ID_1, PASSWORD_1);
+
+
+ private static OpenstackSshAuth createOpenstackSshAuth(String id, String password) {
+ return DefaultOpenstackSshAuth.builder()
+ .id(id)
+ .password(password)
+ .build();
+ }
+
+ @Test
+ public void testEquality() {
+ new EqualsTester().addEqualityGroup(OS_SSH_AUTH_1, OS_SSH_AUTH_3)
+ .addEqualityGroup(OS_SSH_AUTH_2)
+ .testEquals();
+ }
+
+ @Test
+ public void testConstruction() {
+ OpenstackSshAuth auth = OS_SSH_AUTH_1;
+
+ assertThat(auth.id(), is("sdn1"));
+ assertThat(auth.password(), is("password1"));
+ }
+}