Service-Recovery: support for elan-interface entity type

instead of elan-instance entity type

Change-Id: I723bd2ac707bf8b34d869b9b7abfdea4b616c47a
Signed-off-by: eswanit <swati.udhavrao.niture@ericsson.com>

diff --git a/api/src/main/yang/srm-types.yang b/api/src/main/yang/srm-types.yang
index 92942293c19c505b63842af776881a835b546d7d..88dee564cdc481624cf7a7ab4e6d47487b96c1fe 100644 (file)
--- a/api/src/main/yang/srm-types.yang
+++ b/api/src/main/yang/srm-types.yang
@@ -80,8 +80,8 @@ module srm-types {
         base entity-name-base;
     }
 
-    identity netvirt-elan-instance {
-        description "SRM Entity name for ELAN instance";
+    identity netvirt-elan-interface {
+        description "SRM Entity name for ELAN interface";
         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 b3c8755954b9efe18636971100bccfdf7b3d0953..10986e086c0d8fefdaef19798c889266f15d4d40 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
@@ -42,7 +42,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 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.NetvirtElan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElanInstance;
+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.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;
@@ -81,7 +81,7 @@ public final class SrmRpcUtils {
             .put(GeniusItmTz.class, EntityTypeInstance.class)
             .put(GeniusIfmInterface.class, EntityTypeInstance.class)
             .put(NetvirtVpnInstance.class, EntityTypeInstance.class)
-            .put(NetvirtElanInstance.class, EntityTypeInstance.class)
+            .put(NetvirtElanInterface.class, EntityTypeInstance.class)
             .put(NetvirtQos.class, EntityTypeService.class)
             .put(NetvirtQosPolicyInstance.class, EntityTypeInstance.class)
             .put(NetvirtAclInterface.class, EntityTypeInstance.class)
@@ -99,7 +99,7 @@ public final class SrmRpcUtils {
             .put(NetvirtVpn.class, NetvirtVpn.class)
             .put(NetvirtVpnInstance.class, NetvirtVpn.class)
             .put(NetvirtElan.class, NetvirtElan.class)
-            .put(NetvirtElanInstance.class, NetvirtElan.class)
+            .put(NetvirtElanInterface.class, NetvirtElan.class)
             .put(NetvirtAcl.class, NetvirtAcl.class)
             .put(NetvirtAclInterface.class, NetvirtAcl.class)
             .put(NetvirtAclInstance.class, NetvirtAcl.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 0beeb0a3e34acfe8f8e7a4c76b7318414fd595ae..bb5f9a68520f11db0b897ee65bc0f839860aa5b6 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
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 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.NetvirtElan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtElanInstance;
+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.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;
@@ -64,7 +64,7 @@ public final class SrmCliUtils {
             .put("ITM-TZ", GeniusItmTz.class)
             .put("IFM-IFACE", GeniusIfmInterface.class)
             .put("VPN-INSTANCE", NetvirtVpnInstance.class)
-            .put("ELAN-INSTANCE", NetvirtElanInstance.class)
+            .put("ELAN-INTERFACE", NetvirtElanInterface.class)
             .put("QOS-POLICY-INSTANCE", NetvirtQosPolicyInstance.class)
             .put("ACL-INTERFACE", NetvirtAclInterface.class)
             .put("ACL-INSTANCE", NetvirtAclInstance.class)