X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutron-vpp-mapper%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fvpp%2Fmapper%2Fprocessors%2FPortHandler.java;h=3ca0883ea42a8b8699cacf92a545359e07c2d1b4;hb=b70922c0cbe89ebcc9735fdaa18c5b3219f3353e;hp=11d7df4f8f67b7e462fb70248c68f768e5ebe848;hpb=341bce305ea03daae26130bc3df46d47637949a7;p=groupbasedpolicy.git

diff --git a/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/PortHandler.java b/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/PortHandler.java
index 11d7df4f8..3ca0883ea 100644
--- a/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/PortHandler.java
+++ b/neutron-vpp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/vpp/mapper/processors/PortHandler.java
@@ -365,10 +365,17 @@ public class PortHandler implements TransactionChainListener {
         if (Strings.isNullOrEmpty(port.getDeviceId())) {
             return Optional.absent();
         }
+        RouterKey routerKey = null;
+        try {
+            routerKey = new RouterKey(new Uuid(port.getDeviceId()));
+        } catch (IllegalArgumentException e) {
+            // port.getDeviceId() may not match Uuid.PATTERN_CONSTANTS
+            return Optional.absent();
+        }
         ReadOnlyTransaction rTx = transactionChain.newReadOnlyTransaction();
         InstanceIdentifier<Router> routerIid = InstanceIdentifier.builder(Neutron.class)
             .child(Routers.class)
-            .child(Router.class, new RouterKey(new Uuid(port.getDeviceId())))
+            .child(Router.class, routerKey)
             .build();
         Optional<Router> optRouter = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION, routerIid, rTx);
         rTx.close();