CORD-471 Added physical port and data plane IP as node attribtes
Change-Id: I4c28053151e61feb4b9b0ca60e98f7e0e4af0207
diff --git a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfig.java b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfig.java
index 827ce05..57842dc 100644
--- a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfig.java
+++ b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtnConfig.java
@@ -37,6 +37,8 @@
public static final String OVSDB_IP = "ovsdbIp";
public static final String OVSDB_PORT = "ovsdbPort";
public static final String BRIDGE_ID = "bridgeId";
+ public static final String PHYSICAL_PORT_NAME = "phyPortName";
+ public static final String LOCAL_IP = "localIp";
/**
* Returns the set of nodes read from network config.
@@ -54,7 +56,9 @@
jsonNode.path(HOSTNAME).asText(),
IpAddress.valueOf(jsonNode.path(OVSDB_IP).asText()),
TpPort.tpPort(jsonNode.path(OVSDB_PORT).asInt()),
- DeviceId.deviceId(jsonNode.path(BRIDGE_ID).asText()))));
+ DeviceId.deviceId(jsonNode.path(BRIDGE_ID).asText()),
+ jsonNode.path(PHYSICAL_PORT_NAME).asText(),
+ IpAddress.valueOf(jsonNode.path(LOCAL_IP).asText()))));
return nodes;
}
@@ -68,12 +72,17 @@
private final IpAddress ovsdbIp;
private final TpPort ovsdbPort;
private final DeviceId bridgeId;
+ private final String phyPortName;
+ private final IpAddress localIp;
- public CordVtnNodeConfig(String hostname, IpAddress ovsdbIp, TpPort ovsdbPort, DeviceId bridgeId) {
+ public CordVtnNodeConfig(String hostname, IpAddress ovsdbIp, TpPort ovsdbPort,
+ DeviceId bridgeId, String phyPortName, IpAddress localIp) {
this.hostname = checkNotNull(hostname);
this.ovsdbIp = checkNotNull(ovsdbIp);
this.ovsdbPort = checkNotNull(ovsdbPort);
this.bridgeId = checkNotNull(bridgeId);
+ this.phyPortName = checkNotNull(phyPortName);
+ this.localIp = checkNotNull(localIp);
}
/**
@@ -111,5 +120,23 @@
public DeviceId bridgeId() {
return this.bridgeId;
}
+
+ /**
+ * Returns physical port name.
+ *
+ * @return physical port name
+ */
+ public String phyPortName() {
+ return this.phyPortName;
+ }
+
+ /**
+ * Returns local IP address.
+ *
+ * @return ip address
+ */
+ public IpAddress localIp() {
+ return this.localIp;
+ }
}
}