Support injecting novaMetadataIp and novaMetadataPort through cfg
Change-Id: Ida449424235b70a791e8ed1d423f021f6d6726f7
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/NeutronConfigJsonMatcher.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/NeutronConfigJsonMatcher.java
index 185c7b6..de06f6b 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/NeutronConfigJsonMatcher.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/codec/NeutronConfigJsonMatcher.java
@@ -29,6 +29,8 @@
private static final String USE_METADATA_PROXY = "useMetadataProxy";
private static final String METADATA_PROXY_SECRET = "metadataProxySecret";
+ private static final String NOVA_METADATA_IP = "novaMetadataIp";
+ private static final String NOVA_METADATA_PORT = "novaMetadataPort";
private NeutronConfigJsonMatcher(NeutronConfig neutronConfig) {
this.neutronConfig = neutronConfig;
@@ -57,6 +59,26 @@
}
}
+ // check NOVA metadata IP
+ JsonNode jsonNovaMetadataIp = jsonNode.get(NOVA_METADATA_IP);
+ if (jsonNovaMetadataIp != null) {
+ String novaMetadataIp = neutronConfig.novaMetadataIp();
+ if (!jsonNovaMetadataIp.asText().equals(novaMetadataIp)) {
+ description.appendText("novaMetadataIp was " + jsonNovaMetadataIp);
+ return false;
+ }
+ }
+
+ // check NOVA metadata port
+ JsonNode jsonNovaMetadataPort = jsonNode.get(NOVA_METADATA_PORT);
+ if (jsonNovaMetadataPort != null) {
+ Integer novaMetadataPort = neutronConfig.novaMetadataPort();
+ if (jsonNovaMetadataPort.asInt() != novaMetadataPort) {
+ description.appendText("novaMetadataPort was " + jsonNovaMetadataIp);
+ return false;
+ }
+ }
+
return true;
}