add l2gw and dhcp for service recovery

Change-Id: Ia01f6c99016573802efce726396856dda2326138
Signed-off-by: K.V Suneelu Verma <k.v.suneelu.verma@ericsson.com>

diff --git a/api/src/main/yang/srm-types.yang b/api/src/main/yang/srm-types.yang
index 88dee564cdc481624cf7a7ab4e6d47487b96c1fe..7df457f1edfa49c9ed32f24acb958e7cdf62094c 100644 (file)
--- a/api/src/main/yang/srm-types.yang
+++ b/api/src/main/yang/srm-types.yang
@@ -43,6 +43,14 @@ module srm-types {
         description "SRM Entity name for elan service";
         base entity-name-base;
     }
+    identity netvirt-l2gw {
+        description "SRM Entity name for l2gw service";
+        base entity-name-base;
+    }
+    identity netvirt-dhcp {
+        description "SRM Entity name for dhcp service";
+        base entity-name-base;
+    }
     identity netvirt-acl {
         description "SRM Entity name for ACL service";
         base entity-name-base;
@@ -85,6 +93,16 @@ module srm-types {
         base entity-name-base;
     }
 
+    identity netvirt-l2gw-connection {
+        description "SRM Entity name for l2gw connection";
+        base entity-name-base;
+    }
+
+    identity netvirt-l2gw-node {
+        description "SRM Entity name for l2gw device name";
+        base entity-name-base;
+    }
+
     identity netvirt-qos-policy-instance {
         description "SRM Entity name for QoS Policy instance";
         base entity-name-base;

diff --git a/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcUtils.java b/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcUtils.java
index 10986e086c0d8fefdaef19798c889266f15d4d40..9df3cf5965c29b57418a41d30bbce8a5cfc87cd6 100644 (file)
--- a/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcUtils.java
+++ b/impl/src/main/java/org/opendaylight/genius/srm/impl/SrmRpcUtils.java
@@ -41,8 +41,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAcl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAclInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAclInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtDhcp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElanInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gw;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gwConnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gwNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtQos;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtQosPolicyInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtVpn;
@@ -75,6 +79,8 @@ public final class SrmRpcUtils {
             .put(GeniusIfm.class, EntityTypeService.class)
             .put(NetvirtVpn.class, EntityTypeService.class)
             .put(NetvirtElan.class, EntityTypeService.class)
+            .put(NetvirtL2gw.class, EntityTypeService.class)
+            .put(NetvirtDhcp.class, EntityTypeService.class)
             .put(NetvirtAcl.class, EntityTypeService.class)
             .put(Ofplugin.class, EntityTypeService.class)
             .put(GeniusItmTep.class, EntityTypeInstance.class)
@@ -82,6 +88,8 @@ public final class SrmRpcUtils {
             .put(GeniusIfmInterface.class, EntityTypeInstance.class)
             .put(NetvirtVpnInstance.class, EntityTypeInstance.class)
             .put(NetvirtElanInterface.class, EntityTypeInstance.class)
+            .put(NetvirtL2gwConnection.class, EntityTypeInstance.class)
+            .put(NetvirtL2gwNode.class, EntityTypeInstance.class)
             .put(NetvirtQos.class, EntityTypeService.class)
             .put(NetvirtQosPolicyInstance.class, EntityTypeInstance.class)
             .put(NetvirtAclInterface.class, EntityTypeInstance.class)
@@ -103,6 +111,10 @@ public final class SrmRpcUtils {
             .put(NetvirtAcl.class, NetvirtAcl.class)
             .put(NetvirtAclInterface.class, NetvirtAcl.class)
             .put(NetvirtAclInstance.class, NetvirtAcl.class)
+            .put(NetvirtL2gwConnection.class, NetvirtL2gw.class)
+            .put(NetvirtL2gwNode.class, NetvirtL2gw.class)
+            .put(NetvirtL2gw.class, NetvirtL2gw.class)
+            .put(NetvirtDhcp.class, NetvirtDhcp.class)
             .put(Ofplugin.class, Ofplugin.class)
             .put(NetvirtQos.class, NetvirtQos.class)
             .put(NetvirtQosPolicyInstance.class, NetvirtQos.class)

diff --git a/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmCliUtils.java b/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmCliUtils.java
index bb5f9a68520f11db0b897ee65bc0f839860aa5b6..5596b8279bdbea16501c3b0905694db97fa40b1b 100644 (file)
--- a/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmCliUtils.java
+++ b/shell/src/main/java/org/opendaylight/genius/srm/shell/SrmCliUtils.java
@@ -22,8 +22,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAcl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAclInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtAclInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtDhcp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElanInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gw;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gwConnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtL2gwNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtQos;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtQosPolicyInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtVpn;
@@ -53,6 +57,8 @@ public final class SrmCliUtils {
             .put("IFM", GeniusIfm.class)
             .put("VPN", NetvirtVpn.class)
             .put("ELAN", NetvirtElan.class)
+            .put("DHCP", NetvirtDhcp.class)
+            .put("L2GW", NetvirtL2gw.class)
             .put("ACL", NetvirtAcl.class)
             .put("OFPLUGIN", Ofplugin.class)
             .put("QOS", NetvirtQos.class)
@@ -65,6 +71,8 @@ public final class SrmCliUtils {
             .put("IFM-IFACE", GeniusIfmInterface.class)
             .put("VPN-INSTANCE", NetvirtVpnInstance.class)
             .put("ELAN-INTERFACE", NetvirtElanInterface.class)
+            .put("L2GW-NODE", NetvirtL2gwNode.class)
+            .put("L2GW-CONNECTION", NetvirtL2gwConnection.class)
             .put("QOS-POLICY-INSTANCE", NetvirtQosPolicyInstance.class)
             .put("ACL-INTERFACE", NetvirtAclInterface.class)
             .put("ACL-INSTANCE", NetvirtAclInstance.class)