Restore creation of hosts with ASG and OLT location
Partial revert of #17891.
Also, bump ONOS dependecy to 2.2.2
Change-Id: Ic80377bb5a7c4931f79e5d89edc69fc2202eef40
diff --git a/app/src/main/java/org/opencord/bng/impl/BngManager.java b/app/src/main/java/org/opencord/bng/impl/BngManager.java
index 3a76aaa..981712e 100644
--- a/app/src/main/java/org/opencord/bng/impl/BngManager.java
+++ b/app/src/main/java/org/opencord/bng/impl/BngManager.java
@@ -253,26 +253,19 @@
ConnectPoint asgConnectPoint,
ConnectPoint oltConnectPoint,
String onuSerialNumber) {
-// FIXME: use auxLocation when ONOS bug is fixed.
-// Set<HostLocation> auxLocation = Set.of(new HostLocation(asgConnectPoint.deviceId(),
-// asgConnectPoint.port(),
-// System.currentTimeMillis()));
-// Set<HostLocation> hostLocation = Set.of(new HostLocation(oltConnectPoint.deviceId(),
-// oltConnectPoint.port(),
-// System.currentTimeMillis()));
-
- Set<HostLocation> hostLocation = Set.of(new HostLocation(asgConnectPoint.deviceId(),
- asgConnectPoint.port(),
- System.currentTimeMillis()));
-
+ Set<HostLocation> hostLocation = Set.of(new HostLocation(oltConnectPoint.deviceId(),
+ oltConnectPoint.port(),
+ System.currentTimeMillis()));
+ Set<HostLocation> auxLocation = Set.of(new HostLocation(asgConnectPoint.deviceId(),
+ asgConnectPoint.port(),
+ System.currentTimeMillis()));
var annotations = DefaultAnnotations.builder()
.set(ONU_ANNOTATION, onuSerialNumber)
.build();
Set<IpAddress> ips = hostIp != null
? ImmutableSet.of(hostIp) : ImmutableSet.of();
return new DefaultHostDescription(hostMac, sTag,
- hostLocation,
-// auxLocation,
+ hostLocation, auxLocation,
ips, cTag, EthType.EtherType.QINQ.ethType(),
false, annotations);
}
diff --git a/pom.xml b/pom.xml
index c45f586..ad383b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</parent>
<groupId>org.opencord</groupId>