BUG-2485: This is to fix unit test failure for auto-release.

It mainly clone the change https://git.opendaylight.org/gerrit/#/c/13214/3 from master branch to stable/helium.

Change-Id: I34d23a0c1b0afdc51d1f2d141b52d99e9581690e
Signed-off-by: George Zhao <george.y.zhao@huawei.com>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
index e1e527276479abf76266debfcd226ddb33279cae..1d8c9bf93fd239f4986ccfc5164e1caf18d30165 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/DestinationMapper.java
@@ -208,7 +208,7 @@ public class DestinationMapper extends FlowTable {
                         .setEthernetMatch(ethernetMatch(null, null, ARP))
                         .setLayer3Match(new ArpMatchBuilder()
                             .setArpOp(Integer.valueOf(1))
-                            .setArpTargetTransportAddress(new Ipv4Prefix(ikey))
+                            .setArpTargetTransportAddress(new Ipv4Prefix(ikey+"/32"))
                             .build());
                     addNxRegMatch(mb, RegMatch.of(NxmNxReg6.class,
                                                   Long.valueOf(l3Id)));
@@ -411,13 +411,13 @@ public class DestinationMapper extends FlowTable {
             Long etherType = null;
             String ikey = null;
             if (l3a.getIpAddress().getIpv4Address() != null) {
-                ikey = l3a.getIpAddress().getIpv4Address().getValue();
+                ikey = l3a.getIpAddress().getIpv4Address().getValue() + "/32";
                 etherType = IPv4;
                 m = new Ipv4MatchBuilder()
                     .setIpv4Destination(new Ipv4Prefix(ikey))
                     .build();
             } else if (l3a.getIpAddress().getIpv6Address() != null) {
-                ikey = l3a.getIpAddress().getIpv6Address().getValue();
+                ikey = l3a.getIpAddress().getIpv6Address().getValue() + "/128";
                 etherType = IPv6;
                 m = new Ipv6MatchBuilder()
                     .setIpv6Destination(new Ipv6Prefix(ikey))

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurity.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurity.java
index b2c37676af91f62c33d30cf25961a3ed96e02ec8..9a55c11ec93166ce848f72e751caccc199cf3e49 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurity.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurity.java
@@ -155,7 +155,7 @@ public class PortSecurity extends FlowTable {
             Long etherType = null;
             String ikey = null;
             if (l3.getIpAddress().getIpv4Address() != null) {
-                ikey = l3.getIpAddress().getIpv4Address().getValue();
+                ikey = l3.getIpAddress().getIpv4Address().getValue() + "/32";
                 if (arp) {
                     m = new ArpMatchBuilder()
                         .setArpSourceTransportAddress(new Ipv4Prefix(ikey))
@@ -169,7 +169,7 @@ public class PortSecurity extends FlowTable {
                 }
             } else if (l3.getIpAddress().getIpv6Address() != null) {
                 if (arp) continue;
-                ikey = l3.getIpAddress().getIpv6Address().getValue();
+                ikey = l3.getIpAddress().getIpv6Address().getValue() + "/128";
                 m = new Ipv6MatchBuilder()
                     .setIpv6Source(new Ipv6Prefix(ikey))
                     .build();

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
index de066cda3a022704b0abadd4b42536a9f824f367..2c35f17076fc56ac4b11d92d6fa9350a97607725 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/flow/PortSecurityTest.java
@@ -193,15 +193,15 @@ public class PortSecurityTest extends FlowTableTest {
                 ((f.getMatch().getLayer3Match() != null &&
                   f.getMatch().getLayer3Match() instanceof Ipv4Match &&
                   Objects.equals(ep.getL3Address().get(0).getIpAddress().getIpv4Address().getValue(),
-                                 ((Ipv4Match)f.getMatch().getLayer3Match()).getIpv4Source().getValue())) ||
+                      ((Ipv4Match)f.getMatch().getLayer3Match()).getIpv4Source().getValue().split("/")[0])) ||
                  (f.getMatch().getLayer3Match() != null &&
                   f.getMatch().getLayer3Match() instanceof ArpMatch &&
                   Objects.equals(ep.getL3Address().get(0).getIpAddress().getIpv4Address().getValue(),
-                                 ((ArpMatch)f.getMatch().getLayer3Match()).getArpSourceTransportAddress().getValue())) ||
+                      ((ArpMatch)f.getMatch().getLayer3Match()).getArpSourceTransportAddress().getValue().split("/")[0])) ||
                  (f.getMatch().getLayer3Match() != null &&
                   f.getMatch().getLayer3Match() instanceof Ipv6Match &&
                   Objects.equals(ep.getL3Address().get(1).getIpAddress().getIpv6Address().getValue(),
-                                 ((Ipv6Match)f.getMatch().getLayer3Match()).getIpv6Source().getValue())))) {
+                      ((Ipv6Match)f.getMatch().getLayer3Match()).getIpv6Source().getValue().split("/")[0])))) {
                 count += 1;
                 assertEquals(FlowUtils.gotoTableInstructions((short)(table.getTableId()+1)),
                              f.getInstructions());

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/IdentityTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/IdentityTest.java
index e9bbafc75991cb17111f0ad65929c88c66fcefcd..3b4793f5651a09da9aebff619f85ad8d0545d4a9 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/IdentityTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/IdentityTest.java
@@ -45,7 +45,7 @@ public class IdentityTest {
     private static final String TEST_MAC6 = "0xaa-0xBB-0xCC-0xdd-0xEE-0xFF";
     private static final String TEST_MAC7 = "1:22:3:44:5:66";
     private static final String TEST_MAC8 = "1-22-3-44-5-66";
-    private static final String TEST_CONTEXT = "foo";
+    private static final String TEST_CONTEXT = "9AC3DB0E-C47A-4409-B1AD-BDE647A29440";
 
     @Test
     public void testL3Identity() throws Exception {
@@ -65,46 +65,10 @@ public class IdentityTest {
 
     @Test
     public void testL2Identity() throws Exception {
-        id = new Identity(TEST_MAC1);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC1));
-        assertTrue(id.getL2Context().getValue().equals(TEST_CONTEXT));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC1));
-        
         id = new Identity(TEST_MAC2);
         id.setContext(TEST_CONTEXT);
         assertTrue(id.identityAsString().equals(TEST_MAC2));
         assertTrue(id.getL2Identity().getValue().equals(TEST_MAC2));
-        
-        id = new Identity(TEST_MAC3);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC3));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC3));
-        
-        id = new Identity(TEST_MAC4);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC4));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC4));
-
-        id = new Identity(TEST_MAC5);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC5));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC5));
-
-        id = new Identity(TEST_MAC6);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC6));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC6));
-
-        id = new Identity(TEST_MAC7);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC7));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC7));
-
-        id = new Identity(TEST_MAC8);
-        id.setContext(TEST_CONTEXT);
-        assertTrue(id.identityAsString().equals(TEST_MAC8));
-        assertTrue(id.getL2Identity().getValue().equals(TEST_MAC8));
     }
     
 }

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L2EprContextTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L2EprContextTest.java
index a2a72df80b67d111aef21831caa37e2bee0c1f2c..a62b75988de2fb366cc3ef4e2f41e6a7ad382233 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L2EprContextTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/opflex/L2EprContextTest.java
@@ -89,8 +89,8 @@ public class L2EprContextTest implements L2EprContext.Callback {
         callbacks++;
     }
 
-    private static final String TEST_CONTEXT = "foo";
-    private static final String TEST_ID = "bar";
+    private static final String TEST_CONTEXT = "BD27A352-53D4-4D42-9862-F333D86E922D";
+    private static final String TEST_MAC = "00:11:22:33:44:55";
     
     @Test
     public void testEpCreate() throws Exception {
@@ -108,7 +108,7 @@ public class L2EprContextTest implements L2EprContext.Callback {
         when(mockProvider.newReadOnlyTransaction()).thenReturn(mockReader);
         when(mockReader.read(eq(LogicalDatastoreType.OPERATIONAL),
                 Matchers.<InstanceIdentifier<Endpoint>>any())).thenReturn(mockFuture);
-        ctx.lookupEndpoint(TEST_CONTEXT, TEST_ID);
+        ctx.lookupEndpoint(TEST_CONTEXT, TEST_MAC);
         verify(mockProvider).newReadOnlyTransaction();
     }
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/resolver/PolicyResolverTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/resolver/PolicyResolverTest.java
index eb9267ea0c802abab0aaa270d6c95247c18f7a25..18385c6c2fcd46ef88710ab8efba6f8e696e89b1 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/resolver/PolicyResolverTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/resolver/PolicyResolverTest.java
@@ -156,7 +156,7 @@ public class PolicyResolverTest {
         .setOrder(Integer.valueOf(3))
         .build();
     Subject s3 = new SubjectBuilder()
-        .setName(new SubjectName("3"))
+        .setName(new SubjectName("s3"))
         .setRule(ImmutableList.of(rule3))
         .setOrder(Integer.valueOf(3))
         .build();