[ONOS-5712] fix two bugs in onos-app-openstackinterface
1. fix equals method to check "o" not "this" (line 192 in OpenstackSecurityGroupRule.java)
2. change 6th parameter of OpenstackPort constructor to tenantId from networkId in Builder.build method (line 356 in OpenstackPort.java)
Change-Id: I0a46c113547170404d08e40da53985931483a1b5
diff --git a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
index 6594e61..58ac583 100644
--- a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
+++ b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackPort.java
@@ -353,7 +353,7 @@
*/
public OpenstackPort build() {
return new OpenstackPort(status, name, allowedAddressPairs, adminStateUp,
- networkId, networkId, deviceOwner, macAddress, fixedIps,
+ networkId, tenantId, deviceOwner, macAddress, fixedIps,
id, securityGroups, deviceId);
}
}
diff --git a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
index 15fdcd9..8436750 100644
--- a/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
+++ b/apps/openstackinterface/api/src/main/java/org/onosproject/openstackinterface/OpenstackSecurityGroupRule.java
@@ -189,7 +189,7 @@
return true;
}
- if (this instanceof OpenstackSecurityGroupRule) {
+ if (o instanceof OpenstackSecurityGroupRule) {
OpenstackSecurityGroupRule that = (OpenstackSecurityGroupRule) o;
return this.direction.equals(that.direction) &&
this.ethertype.equals(that.ethertype) &&