FDS-242 - Clearing intf ref prior to removing ACL itself

[groupbasedpolicy.git] / renderers / vpp / src / main / java / org / opendaylight / groupbasedpolicy / renderer / vpp / util / VppIidFactory.java

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/VppIidFactory.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/VppIidFactory.java
index 50426de3ae3caaf1a4f099a1bddcbe4fd5701d0d..d6861e798fa32880bbb9d33e3ee3b97f27098d8b 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/VppIidFactory.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/VppIidFactory.java
@@ -9,16 +9,33 @@
 package org.opendaylight.groupbasedpolicy.renderer.vpp.util;
 
 import org.opendaylight.controller.config.yang.config.vpp_provider.impl.VppRenderer;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.AccessLists;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.Acl;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160708.access.lists.AclKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.NatConfig;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.NatInstances;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstance;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev150908.nat.config.nat.instances.NatInstanceKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.Renderers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.Renderer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.RendererKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererNodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.nodes.RendererNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.nodes.RendererNodeKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214.VppAclInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.L2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.BridgeDomains;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.bridge.domains.BridgeDomain;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.bridge.domains.BridgeDomainKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.acl.rev161214.VppAcl;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
@@ -27,10 +44,19 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class VppIidFactory {
 
+    private static final TopologyKey TOPOLOGY_NETCONF = new TopologyKey(new TopologyId("topology-netconf"));
+
     public static InstanceIdentifier<Interface> getInterfaceIID(InterfaceKey interfaceKey) {
         return InstanceIdentifier.create(Interfaces.class).child(Interface.class, interfaceKey);
     }
 
+    public static InstanceIdentifier<L2> getL2ForInterfaceIid(InterfaceKey interfaceKey) {
+        return getInterfaceIID(interfaceKey).builder()
+            .augmentation(VppInterfaceAugmentation.class)
+            .child(L2.class)
+            .build();
+    }
+
     public static InstanceIdentifier<Renderer> getRendererIID(RendererKey rendererKey) {
         return InstanceIdentifier.create(Renderers.class).child(Renderer.class, rendererKey);
     }
@@ -57,8 +83,40 @@ public class VppIidFactory {
             .build();
     }
 
-    public static InstanceIdentifier<Topology> getTopologyIid(TopologyKey bridgeDomainKey) {
+    public static InstanceIdentifier<Node> getNetconfNodeIid(NodeId nodeId) {
         return InstanceIdentifier.builder(NetworkTopology.class)
-                .child(Topology.class, bridgeDomainKey).build();
+            .child(Topology.class, TOPOLOGY_NETCONF)
+            .child(Node.class, new NodeKey(nodeId))
+            .build();
+    }
+
+    public static InstanceIdentifier<Topology> getTopologyIid(TopologyKey bridgeDomainKey) {
+        return InstanceIdentifier.builder(NetworkTopology.class).child(Topology.class, bridgeDomainKey).build();
+    }
+
+    public static InstanceIdentifier<BridgeDomain> getBridgeDomainStateIid(final BridgeDomainKey bridgeDomainStateKey) {
+        return InstanceIdentifier.builder(VppState.class)
+            .child(BridgeDomains.class)
+            .child(BridgeDomain.class, bridgeDomainStateKey)
+            .build();
+    }
+
+    public static InstanceIdentifier<Acl> getVppAcl(String aclName) {
+        return InstanceIdentifier.builder(AccessLists.class)
+            .child(Acl.class, new AclKey(aclName, VppAcl.class))
+            .build();
+    }
+
+    public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.Acl> getAclInterfaceRef(
+            InstanceIdentifier<Interface> ifaceIid) {
+        return ifaceIid.augmentation(VppAclInterfaceAugmentation.class).child(
+                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.acl.rev161214._interface.acl.attributes.Acl.class);
+    }
+
+    public static InstanceIdentifier<NatInstance> getNatInstanceIid(Long natInstance) {
+        return InstanceIdentifier.builder(NatConfig.class)
+                .child(NatInstances.class)
+                .child(NatInstance.class, new NatInstanceKey(natInstance))
+                .build();
     }
 }