Fix: do not append identity path into V3 keystone authentication
Change-Id: Ibe68d2393658daa9a8778cfae6aa20aded3889b9
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 35e806d..d3ddabb 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 @@
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 @@
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 @@
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 @@
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 ef7b341..66a3f8b 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 @@
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 @@
}
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 @@
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 e970b2b..4d8167b 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 @@
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();
}