HC2VPP-31: fix vpp-ace translation with no protocol set

Change-Id: I9d319ae3d04d90c7652828b0cb382ad142f9d2b6
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
(cherry picked from commit 1b7a019ae9ceeddee496b20f83c095ffcb87b6c2)

1 files changed, 14 insertions, 1 deletions

diff --git a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java
index c1f9a40ff..f5de7e393 100644
--- a/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java
+++ b/acl/acl-impl/src/main/java/io/fd/hc2vpp/acl/util/protocol/ProtoPreBindRuleProducer.java
@@ -172,10 +172,23 @@ public interface ProtoPreBindRuleProducer {
         return portNumber.getValue().shortValue();
     }
 
+    /**
+     * Pre-bind rule with protocol based attributes (if present).
+     *
+     * @param vppAce rule to be processed
+     * @return AclRule with protocol filled protocol fields
+     */
     default AclRule createPreBindRule(@Nonnull final VppAce vppAce) {
         AclRule rule = new AclRule();
 
-        rule.proto = protocol(vppAce.getVppAceNodes().getIpProtocol());
+
+        final IpProtocol ipProtocol = vppAce.getVppAceNodes().getIpProtocol();
+        if (ipProtocol == null) {
+            // returns AclRule with rule.proto set to 0 (protocol fields will be ignored by vpp)
+            return rule;
+        }
+
+        rule.proto = protocol(ipProtocol);
 
         switch (rule.proto) {
             case ICMP_INDEX: {