diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java index d0fbe64334..ca9647fe9f 100644 --- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java +++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java @@ -480,17 +480,7 @@ public final class OpenstackNetworkingUtil { StringBuilder endpointSb = new StringBuilder(); endpointSb.append(auth.protocol().name().toLowerCase()); endpointSb.append("://"); - endpointSb.append(node.endPoint()); - endpointSb.append(":"); - endpointSb.append(auth.port()); - endpointSb.append("/"); - - // in case the version is v3, we need to append identity path into endpoint - if (auth.version().equals(KEYSTONE_V3)) { - endpointSb.append(IDENTITY_PATH); - } - - endpointSb.append(auth.version()); + endpointSb.append(node.endpoint()); return endpointSb.toString(); } diff --git a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java index eb323ef187..0e291f86d4 100644 --- a/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java +++ b/apps/openstacknetworking/app/src/test/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtilTest.java @@ -397,12 +397,11 @@ public final class OpenstackNetworkingUtilTest { /** * Tests the getConnectedClient method. */ - @Test(expected = Exception.class) + @Test public void testGetConnectedClient() { OpenstackNode.Builder osNodeBuilderV2 = DefaultOpenstackNode.builder(); OpenstackAuth.Builder osNodeAuthBuilderV2 = DefaultOpenstackAuth.builder() .version("v2.0") - .port(35357) .protocol(OpenstackAuth.Protocol.HTTP) .project("admin") .username("admin") @@ -412,16 +411,14 @@ public final class OpenstackNetworkingUtilTest { openstackControlNodeV2 = osNodeBuilderV2.hostname("controllerv2") .type(OpenstackNode.NodeType.CONTROLLER) .managementIp(IpAddress.valueOf("1.1.1.1")) - .endPoint("1.1.1.1") + .endpoint("1.1.1.1") .authentication(osNodeAuthBuilderV2.build()) .state(NodeState.COMPLETE) .build(); - OpenstackNode.Builder osNodeBuilderV3 = DefaultOpenstackNode.builder(); OpenstackAuth.Builder osNodeAuthBuilderV3 = DefaultOpenstackAuth.builder() .version("v2") - .port(80) .protocol(OpenstackAuth.Protocol.HTTP) .project("admin") .username("admin") @@ -431,7 +428,7 @@ public final class OpenstackNetworkingUtilTest { openstackControlNodeV3 = osNodeBuilderV3.hostname("controllerv3") .type(OpenstackNode.NodeType.CONTROLLER) .managementIp(IpAddress.valueOf("2.2.2.2")) - .endPoint("2.2.2.2") + .endpoint("2.2.2.2") .authentication(osNodeAuthBuilderV3.build()) .state(NodeState.COMPLETE) .build(); diff --git a/apps/openstacknetworking/network-cfg.json b/apps/openstacknetworking/network-cfg.json index 76c5c09830..38adbc7bbf 100644 --- a/apps/openstacknetworking/network-cfg.json +++ b/apps/openstacknetworking/network-cfg.json @@ -57,7 +57,7 @@ "hostname" : "controller", "type" : "CONTROLLER", "managementIp" : "172.16.130.10", - "endPoint" : "keystone-endpoint-url", + "endpoint" : "keystone-endpoint-url", "authentication" : { "version" : "v2.0", "port" : 35357, diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackAuth.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackAuth.java index fb6f53b7a3..ae0af8f28c 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackAuth.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackAuth.java @@ -27,7 +27,6 @@ import static com.google.common.base.Preconditions.checkArgument; public final class DefaultOpenstackAuth implements OpenstackAuth { private final String version; - private final Integer port; private final Protocol protocol; private final String username; private final String password; @@ -40,19 +39,17 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { * 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 */ - private DefaultOpenstackAuth(String version, Integer port, Protocol protocol, + private DefaultOpenstackAuth(String version, 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; @@ -65,11 +62,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { return version; } - @Override - public Integer port() { - return port; - } - @Override public Protocol protocol() { return protocol; @@ -104,7 +96,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { 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) && @@ -117,7 +108,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { @Override public int hashCode() { return Objects.hash(version, - port, protocol, username, password, @@ -129,7 +119,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { public String toString() { return MoreObjects.toStringHelper(getClass()) .add("version", version) - .add("port", port) .add("protocol", protocol) .add("username", username) .add("password", password) @@ -153,7 +142,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { public static final class Builder implements OpenstackAuth.Builder { private String version; - private Integer port; private Protocol protocol; private String username; private String password; @@ -167,14 +155,12 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { @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, @@ -188,12 +174,6 @@ public final class DefaultOpenstackAuth implements OpenstackAuth { return this; } - @Override - public Builder port(Integer port) { - this.port = port; - return this; - } - @Override public Builder protocol(Protocol protocol) { this.protocol = protocol; diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java index a7ee99955b..43a4535e89 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/DefaultOpenstackNode.java @@ -56,7 +56,7 @@ public class DefaultOpenstackNode implements OpenstackNode { private final Collection phyIntfs; private final Collection controllers; private final OpenstackAuth auth; - private final String endPoint; + private final String endpoint; private final OpenstackSshAuth sshAuth; private final DatapathType datapathType; @@ -78,7 +78,7 @@ public class DefaultOpenstackNode implements OpenstackNode { * @param phyIntfs physical interfaces * @param controllers customized controllers * @param auth keystone authentication info - * @param endPoint openstack endpoint URL + * @param endpoint openstack endpoint URL * @param sshAuth ssh authentication info * @param datapathType data path type */ @@ -92,7 +92,7 @@ public class DefaultOpenstackNode implements OpenstackNode { Collection phyIntfs, Collection controllers, OpenstackAuth auth, - String endPoint, + String endpoint, OpenstackSshAuth sshAuth, DatapathType datapathType) { this.hostname = hostname; @@ -106,7 +106,7 @@ public class DefaultOpenstackNode implements OpenstackNode { this.phyIntfs = phyIntfs; this.controllers = controllers; this.auth = auth; - this.endPoint = endPoint; + this.endpoint = endpoint; this.sshAuth = sshAuth; this.datapathType = datapathType; } @@ -255,7 +255,7 @@ public class DefaultOpenstackNode implements OpenstackNode { Objects.equals(phyIntfs, that.phyIntfs) && Objects.equals(controllers, that.controllers) && Objects.equals(auth, that.auth) && - Objects.equals(endPoint, that.endPoint) && + Objects.equals(endpoint, that.endpoint) && Objects.equals(sshAuth, that.sshAuth) && Objects.equals(datapathType, that.datapathType); } @@ -274,7 +274,7 @@ public class DefaultOpenstackNode implements OpenstackNode { phyIntfs, controllers, auth, - endPoint, + endpoint, sshAuth, datapathType); } @@ -293,7 +293,7 @@ public class DefaultOpenstackNode implements OpenstackNode { .add("phyIntfs", phyIntfs) .add("controllers", controllers) .add("auth", auth) - .add("endpoint", endPoint) + .add("endpoint", endpoint) .add("sshAuth", sshAuth) .add("datapathType", datapathType) .toString(); @@ -313,7 +313,7 @@ public class DefaultOpenstackNode implements OpenstackNode { .phyIntfs(phyIntfs) .controllers(controllers) .authentication(auth) - .endPoint(endPoint) + .endpoint(endpoint) .sshAuthInfo(sshAuth) .datapathType(datapathType) .build(); @@ -333,7 +333,7 @@ public class DefaultOpenstackNode implements OpenstackNode { .phyIntfs(phyIntfs) .controllers(controllers) .authentication(auth) - .endPoint(endPoint) + .endpoint(endpoint) .sshAuthInfo(sshAuth) .datapathType(datapathType) .build(); @@ -389,8 +389,8 @@ public class DefaultOpenstackNode implements OpenstackNode { } @Override - public String endPoint() { - return endPoint; + public String endpoint() { + return endpoint; } /** @@ -421,7 +421,7 @@ public class DefaultOpenstackNode implements OpenstackNode { .phyIntfs(osNode.phyIntfs()) .controllers(osNode.controllers()) .authentication(osNode.authentication()) - .endPoint(osNode.endPoint()) + .endpoint(osNode.endpoint()) .sshAuthInfo(osNode.sshAuthInfo()) .datapathType(osNode.datapathType()); } @@ -442,7 +442,7 @@ public class DefaultOpenstackNode implements OpenstackNode { private Collection phyIntfs; private Collection controllers; private OpenstackAuth auth; - private String endPoint; + private String endpoint; private OpenstackSshAuth sshAuth; private DatapathType datapathType = DatapathType.NORMAL; @@ -462,7 +462,7 @@ public class DefaultOpenstackNode implements OpenstackNode { throw new IllegalArgumentException("Either data IP or VLAN interface is required"); } } else { - checkArgument(endPoint != null, NOT_NULL_MSG, "endpoint URL"); + checkArgument(endpoint != null, NOT_NULL_MSG, "endpoint URL"); } if (type == NodeType.GATEWAY && uplinkPort == null) { @@ -480,7 +480,7 @@ public class DefaultOpenstackNode implements OpenstackNode { phyIntfs, controllers, auth, - endPoint, + endpoint, sshAuth, datapathType); } @@ -554,8 +554,8 @@ public class DefaultOpenstackNode implements OpenstackNode { } @Override - public Builder endPoint(String endPoint) { - this.endPoint = endPoint; + public Builder endpoint(String endpoint) { + this.endpoint = endpoint; return this; } diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackAuth.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackAuth.java index e7e04cba5d..7704efe92f 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackAuth.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackAuth.java @@ -44,13 +44,6 @@ public interface OpenstackAuth { */ String version(); - /** - * Returns the keystone authentication port number. - * - * @return keystone authentication port number - */ - Integer port(); - /** * Returns the keystone authentication protocol type. * @@ -106,14 +99,6 @@ public interface OpenstackAuth { */ Builder version(String version); - /** - * Returns keystone authentication builder with supplied port number. - * - * @param port port number - * @return keystone authentication builder - */ - Builder port(Integer port); - /** * Returns keystone authentication builder with supplied protocol. * diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java index 3a56593948..7fbbf9a2c1 100644 --- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java +++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNode.java @@ -221,7 +221,7 @@ public interface OpenstackNode { * * @return keystone authentication info */ - String endPoint(); + String endpoint(); /** * Returns a collection of customized controllers. @@ -340,10 +340,10 @@ public interface OpenstackNode { /** * Returns openstack node builder with supplied endpoint info. * - * @param endPoint endpoint info + * @param endpoint endpoint info * @return openstack node builder */ - Builder endPoint(String endPoint); + Builder endpoint(String endpoint); /** * Returns openstack node builder with supplied ssh authentication info. diff --git a/apps/openstacknode/api/src/test/java/org/onosproject/openstacknode/api/OpenstackNodeAdapter.java b/apps/openstacknode/api/src/test/java/org/onosproject/openstacknode/api/OpenstackNodeAdapter.java index e83f198ceb..333edb0800 100644 --- a/apps/openstacknode/api/src/test/java/org/onosproject/openstacknode/api/OpenstackNodeAdapter.java +++ b/apps/openstacknode/api/src/test/java/org/onosproject/openstacknode/api/OpenstackNodeAdapter.java @@ -140,7 +140,7 @@ public class OpenstackNodeAdapter implements OpenstackNode { } @Override - public String endPoint() { + public String endpoint() { return null; } diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackAuthCodec.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackAuthCodec.java index 35e806d577..d3ddabb468 100644 --- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackAuthCodec.java +++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/codec/OpenstackAuthCodec.java @@ -35,7 +35,6 @@ public class OpenstackAuthCodec extends JsonCodec { private final Logger log = getLogger(getClass()); private static final String VERSION = "version"; - private static final String PORT = "port"; private static final String PROTOCOL = "protocol"; private static final String USERNAME = "username"; private static final String PASSWORD = "password"; @@ -50,7 +49,6 @@ public class OpenstackAuthCodec extends JsonCodec { ObjectNode result = context.mapper().createObjectNode() .put(VERSION, auth.version()) - .put(PORT, auth.port()) .put(PROTOCOL, auth.protocol().name()) .put(USERNAME, auth.username()) .put(PASSWORD, auth.password()) @@ -71,8 +69,6 @@ public class OpenstackAuthCodec extends JsonCodec { String version = nullIsIllegal(json.get(VERSION).asText(), VERSION + MISSING_MESSAGE); - Integer port = nullIsIllegal(json.get(PORT).asInt(), - PORT + MISSING_MESSAGE); String protocol = nullIsIllegal(json.get(PROTOCOL).asText(), PROTOCOL + MISSING_MESSAGE); String username = nullIsIllegal(json.get(USERNAME).asText(), @@ -84,7 +80,6 @@ public class OpenstackAuthCodec extends JsonCodec { DefaultOpenstackAuth.Builder authBuilder = DefaultOpenstackAuth.builder() .version(version) - .port(port) .protocol(OpenstackAuth.Protocol.valueOf(protocol)) .username(username) .password(password) 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 ef7b341658..66a3f8b115 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 @@ -59,7 +59,7 @@ public final class OpenstackNodeCodec extends JsonCodec { 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"; + private static final String END_POINT = "endpoint"; private static final String SSH_AUTH = "sshAuth"; private static final String DATA_PATH_TYPE = "datapathType"; @@ -84,7 +84,7 @@ public final class OpenstackNodeCodec extends JsonCodec { } if (type == OpenstackNode.NodeType.CONTROLLER) { - result.put(END_POINT, node.endPoint()); + result.put(END_POINT, node.endpoint()); } if (node.intgBridge() != null) { @@ -156,7 +156,7 @@ public final class OpenstackNodeCodec extends JsonCodec { if (type.equals(CONTROLLER)) { String endPoint = nullIsIllegal(json.get(END_POINT).asText(), END_POINT + MISSING_MESSAGE); - nodeBuilder.endPoint(endPoint); + nodeBuilder.endpoint(endPoint); } if (json.get(VLAN_INTF_NAME) != null) { nodeBuilder.vlanIntf(json.get(VLAN_INTF_NAME).asText()); diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java index e970b2b5ff..4d8167b4ae 100644 --- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java +++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java @@ -212,17 +212,7 @@ public final class OpenstackNodeUtil { StringBuilder endpointSb = new StringBuilder(); endpointSb.append(auth.protocol().name().toLowerCase()); endpointSb.append("://"); - endpointSb.append(node.endPoint()); - endpointSb.append(":"); - endpointSb.append(auth.port()); - endpointSb.append("/"); - - // in case the version is v3, we need to append identity path into endpoint - if (auth.version().equals(KEYSTONE_V3)) { - endpointSb.append(IDENTITY_PATH); - } - - endpointSb.append(auth.version()); + endpointSb.append(node.endpoint()); return endpointSb.toString(); } 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 2f165f9b26..bed83ad09b 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 @@ -50,14 +50,6 @@ public final class OpenstackAuthJsonMatcher extends TypeSafeDiagnosingMatcher phyIntfs, Set controllers, OpenstackAuth auth, - String endPoint, + String endpoint, OpenstackSshAuth sshAuth, DatapathType datapathType) { super(hostname, @@ -515,7 +515,7 @@ public class DefaultOpenstackNodeHandlerTest { phyIntfs, controllers, auth, - endPoint, + endpoint, sshAuth, datapathType); } diff --git a/apps/openstacknode/app/src/test/resources/org/onosproject/openstacknode/codec/OpenstackControllerNode.json b/apps/openstacknode/app/src/test/resources/org/onosproject/openstacknode/codec/OpenstackControllerNode.json index 705a977fa9..c60baad030 100644 --- a/apps/openstacknode/app/src/test/resources/org/onosproject/openstacknode/codec/OpenstackControllerNode.json +++ b/apps/openstacknode/app/src/test/resources/org/onosproject/openstacknode/codec/OpenstackControllerNode.json @@ -2,7 +2,7 @@ "hostname": "controller", "type": "CONTROLLER", "managementIp": "172.16.130.10", - "endPoint": "keystone-end-point-url", + "endpoint": "keystone-end-point-url", "authentication": { "version": "v2.0", "port": 35357, diff --git a/apps/openstacknode/network-cfg.json b/apps/openstacknode/network-cfg.json index 6de0cf36fc..b173147787 100644 --- a/apps/openstacknode/network-cfg.json +++ b/apps/openstacknode/network-cfg.json @@ -62,7 +62,7 @@ "hostname" : "controller", "type" : "CONTROLLER", "managementIp" : "172.16.130.10", - "endPoint" : "keystone-endpoint-url", + "endpoint" : "keystone-endpoint-url", "authentication" : { "version" : "v2.0", "port" : 35357,