Fix for ONOS-5175. GroupId refactoring.
Science DefaultGroupId was deprecated, remove it from ONOS
Change-Id: I82394e58ec1ba10c37492ed77546e233de9f934f
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnel.java b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnel.java
index c533cf9..10a1c2b 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnel.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnel.java
@@ -20,7 +20,7 @@
import java.util.Objects;
import com.google.common.annotations.Beta;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.net.AbstractModel;
import org.onosproject.net.Annotations;
import org.onosproject.net.NetworkResource;
@@ -38,7 +38,7 @@
private final TunnelEndPoint dst; // a destination point of tunnel.
private final State state;
private final Type type; // tunnel type
- private final DefaultGroupId groupId; // represent for a group flow table
+ private final GroupId groupId; // represent for a group flow table
// which a tunnel match up
// tunnel producer
private final TunnelId tunnelId; // tunnel identify generated by
@@ -61,7 +61,7 @@
* @param annotations optional key/value annotations
*/
public DefaultTunnel(ProviderId producerName, TunnelEndPoint src,
- TunnelEndPoint dst, Type type, DefaultGroupId groupId,
+ TunnelEndPoint dst, Type type, GroupId groupId,
TunnelId tunnelId, TunnelName tunnelName, Path path,
Annotations... annotations) {
this(producerName, src, dst, type, Tunnel.State.ACTIVE, groupId,
@@ -84,7 +84,7 @@
*/
public DefaultTunnel(ProviderId producerName, TunnelEndPoint src,
TunnelEndPoint dst, Type type, State state,
- DefaultGroupId groupId, TunnelId tunnelId,
+ GroupId groupId, TunnelId tunnelId,
TunnelName tunnelName, Path path, Annotations... annotations) {
super(producerName, annotations);
this.src = src;
@@ -113,7 +113,7 @@
* @param annotations optional key/value annotations
*/
public DefaultTunnel(ProviderId producerName, TunnelEndPoint src,
- TunnelEndPoint dst, Type type, DefaultGroupId groupId,
+ TunnelEndPoint dst, Type type, GroupId groupId,
TunnelId tunnelId, TunnelName tunnelName, Path path,
NetworkResource networkRes, Annotations... annotations) {
this(producerName, src, dst, type, Tunnel.State.ACTIVE, groupId,
@@ -137,7 +137,7 @@
*/
public DefaultTunnel(ProviderId producerName, TunnelEndPoint src,
TunnelEndPoint dst, Type type, State state,
- DefaultGroupId groupId, TunnelId tunnelId,
+ GroupId groupId, TunnelId tunnelId,
TunnelName tunnelName, Path path, NetworkResource networkRes,
Annotations... annotations) {
super(producerName, annotations);
@@ -183,7 +183,7 @@
}
@Override
- public DefaultGroupId groupId() {
+ public GroupId groupId() {
return groupId;
}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnelDescription.java b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnelDescription.java
index 62f7646..0af06de 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnelDescription.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/DefaultTunnelDescription.java
@@ -16,7 +16,7 @@
package org.onosproject.incubator.net.tunnel;
import com.google.common.annotations.Beta;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.net.AbstractDescription;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.Path;
@@ -36,7 +36,7 @@
private final TunnelEndPoint src;
private final TunnelEndPoint dst;
private final Tunnel.Type type;
- private final DefaultGroupId groupId; // represent for a group flow table
+ private final GroupId groupId; // represent for a group flow table
// which a tunnel match up
// tunnel producer
private final ProviderId producerName; // tunnel producer name
@@ -59,7 +59,7 @@
*/
public DefaultTunnelDescription(TunnelId id, TunnelEndPoint src,
TunnelEndPoint dst, Tunnel.Type type,
- DefaultGroupId groupId,
+ GroupId groupId,
ProviderId producerName,
TunnelName tunnelName,
Path path,
@@ -92,7 +92,7 @@
*/
public DefaultTunnelDescription(TunnelId id, TunnelEndPoint src,
TunnelEndPoint dst, Tunnel.Type type,
- DefaultGroupId groupId,
+ GroupId groupId,
ProviderId producerName,
TunnelName tunnelName,
Path path,
@@ -131,7 +131,7 @@
}
@Override
- public DefaultGroupId groupId() {
+ public GroupId groupId() {
return groupId;
}
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/Tunnel.java b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/Tunnel.java
index 3f6572f..28d2429 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/Tunnel.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/Tunnel.java
@@ -16,7 +16,7 @@
package org.onosproject.incubator.net.tunnel;
import com.google.common.annotations.Beta;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.net.Annotated;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.Path;
@@ -138,7 +138,7 @@
*
* @return OpenFlowGroupId
*/
- DefaultGroupId groupId();
+ GroupId groupId();
/**
* Returns tunnel identify generated by ONOS as primary key.
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelDescription.java b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelDescription.java
index fd73846..0d05494 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelDescription.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/tunnel/TunnelDescription.java
@@ -16,7 +16,7 @@
package org.onosproject.incubator.net.tunnel;
import com.google.common.annotations.Beta;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.incubator.net.tunnel.Tunnel.Type;
import org.onosproject.net.Annotated;
import org.onosproject.net.Description;
@@ -63,7 +63,7 @@
*
* @return OpenFlowGroupId
*/
- DefaultGroupId groupId();
+ GroupId groupId();
/**
* Returns tunnel producer name.
diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/DefaultTunnelTest.java b/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/DefaultTunnelTest.java
index e9aa30c..b0349fd 100644
--- a/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/DefaultTunnelTest.java
+++ b/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/DefaultTunnelTest.java
@@ -19,7 +19,7 @@
import org.junit.Test;
import org.onlab.packet.IpAddress;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.net.provider.ProviderId;
import com.google.common.testing.EqualsTester;
@@ -42,7 +42,7 @@
.valueOf(23423));
TunnelEndPoint dst = IpTunnelEndPoint.ipTunnelPoint(IpAddress
.valueOf(32421));
- DefaultGroupId groupId = new DefaultGroupId(92034);
+ GroupId groupId = new GroupId(92034);
TunnelName tunnelName = TunnelName.tunnelName("TunnelName");
TunnelId tunnelId = TunnelId.valueOf("41654654");
ProviderId producerName1 = new ProviderId("producer1", "13");
diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/TunnelEventTest.java b/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/TunnelEventTest.java
index c38f755..7665188 100644
--- a/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/TunnelEventTest.java
+++ b/incubator/api/src/test/java/org/onosproject/incubator/net/tunnel/TunnelEventTest.java
@@ -22,7 +22,7 @@
import org.junit.Test;
import org.onlab.packet.IpAddress;
-import org.onosproject.core.DefaultGroupId;
+import org.onosproject.core.GroupId;
import org.onosproject.net.provider.ProviderId;
/**
@@ -46,7 +46,7 @@
.valueOf(23423));
TunnelEndPoint dst = IpTunnelEndPoint.ipTunnelPoint(IpAddress
.valueOf(32421));
- DefaultGroupId groupId = new DefaultGroupId(92034);
+ GroupId groupId = new GroupId(92034);
TunnelName tunnelName = TunnelName.tunnelName("TunnelName");
TunnelId tunnelId = TunnelId.valueOf("41654654");
ProviderId producerName1 = new ProviderId("producer1", "13");
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkGroupManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkGroupManagerTest.java
index 7034358..757efe4 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkGroupManagerTest.java
+++ b/incubator/net/src/test/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkGroupManagerTest.java
@@ -29,7 +29,6 @@
import org.onosproject.common.event.impl.TestEventDispatcher;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
-import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.event.EventDeliveryService;
import org.onosproject.incubator.net.virtual.NetworkId;
@@ -353,11 +352,11 @@
PortNumber.portNumber(32)};
PortNumber[] ports2 = {PortNumber.portNumber(41),
PortNumber.portNumber(42)};
- GroupId gId1 = new DefaultGroupId(1);
+ GroupId gId1 = new GroupId(1);
Group group1 = createSouthboundGroupEntry(gId1,
Arrays.asList(ports1),
0, deviceId);
- GroupId gId2 = new DefaultGroupId(2);
+ GroupId gId2 = new GroupId(2);
// Non zero reference count will make the group manager to queue
// the extraneous groups until reference count is zero.
Group group2 = createSouthboundGroupEntry(gId2,
@@ -402,11 +401,11 @@
PortNumber.portNumber(32)};
PortNumber[] ports2 = {PortNumber.portNumber(41),
PortNumber.portNumber(42)};
- GroupId gId1 = new DefaultGroupId(1);
+ GroupId gId1 = new GroupId(1);
Group group1 = createSouthboundGroupEntry(gId1,
Arrays.asList(ports1),
0, deviceId);
- GroupId gId2 = new DefaultGroupId(2);
+ GroupId gId2 = new GroupId(2);
Group group2 = createSouthboundGroupEntry(gId2,
Arrays.asList(ports2),
0, deviceId);
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualGroupStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualGroupStore.java
index d1ba607..b6be85d 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualGroupStore.java
+++ b/incubator/store/src/main/java/org/onosproject/incubator/store/virtual/impl/SimpleVirtualGroupStore.java
@@ -22,7 +22,6 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onosproject.core.DefaultGroupId;
import org.onosproject.core.GroupId;
import org.onosproject.incubator.net.virtual.NetworkId;
import org.onosproject.incubator.net.virtual.VirtualNetworkGroupStore;
@@ -67,7 +66,7 @@
private final Logger log = getLogger(getClass());
private final int dummyId = 0xffffffff;
- private final GroupId dummyGroupId = new DefaultGroupId(dummyId);
+ private final GroupId dummyGroupId = new GroupId(dummyId);
// inner Map is per device group table
private final ConcurrentMap<NetworkId,
@@ -198,14 +197,14 @@
if (groupEntriesById.get(networkId) != null &&
groupEntriesById.get(networkId).get(deviceId) != null) {
existing = groupEntriesById.get(networkId).get(deviceId)
- .get(new DefaultGroupId(freeId));
+ .get(new GroupId(freeId));
}
if (existing == null) {
if (extraneousGroupEntriesById.get(networkId) != null &&
extraneousGroupEntriesById.get(networkId).get(deviceId) != null) {
existing = extraneousGroupEntriesById.get(networkId).get(deviceId)
- .get(new DefaultGroupId(freeId));
+ .get(new GroupId(freeId));
}
}
@@ -251,9 +250,9 @@
GroupId id = null;
if (groupDesc.givenGroupId() == null) {
// Get a new group identifier
- id = new DefaultGroupId(getFreeGroupIdValue(networkId, groupDesc.deviceId()));
+ id = new GroupId(getFreeGroupIdValue(networkId, groupDesc.deviceId()));
} else {
- id = new DefaultGroupId(groupDesc.givenGroupId());
+ id = new GroupId(groupDesc.givenGroupId());
}
// Create a group entry object
StoredGroupEntry group = new DefaultGroup(id, groupDesc);