Genius Specific Changes to support QoS with SRM

Adding QOS option as recoverable service & Qos policy as recoverable
instance.

Change-Id: I0e123bec31f663d8b6673b37c5858fbcc85b8b46
Signed-off-by: Naveen Kumar Verma <naveen.kumar.verma@ericsson.com>

diff --git a/api/src/main/yang/srm-types.yang b/api/src/main/yang/srm-types.yang
index 24c91c2d033addc15f5e2051a196aa5993782398..c75a056f746d255723817fcc0efbd5f7777676f0 100644 (file)
--- a/api/src/main/yang/srm-types.yang
+++ b/api/src/main/yang/srm-types.yang
@@ -47,6 +47,10 @@ module srm-types {
         description "SRM Entity name for openflowplugin service";
         base entity-name-base;
     }
+    identity netvirt-qos {
+        description "SRM Entity name for QoS service";
+        base entity-name-base;
+    }
 
 
     /* Entity Type INSTANCE Names */
@@ -77,6 +81,11 @@ module srm-types {
         base entity-name-base;
     }
 
+    identity netvirt-qos-policy-instance {
+        description "SRM Entity name for QoS Policy instance";
+        base entity-name-base;
+    }
+
 
     /* Service operations */
     identity service-op-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 ff159ca2ce0fbfa4b1f3d30a76ab539f8f48a450..1a475f0009925fedda1b38a04a41faf5bbbba8b9 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
@@ -40,6 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.GeniusItmTz;
 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.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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtVpnInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.Ofplugin;
@@ -76,6 +78,8 @@ public final class SrmRpcUtils {
             .put(GeniusIfmInterface.class, EntityTypeInstance.class)
             .put(NetvirtVpnInstance.class, EntityTypeInstance.class)
             .put(NetvirtElanInstance.class, EntityTypeInstance.class)
+            .put(NetvirtQos.class, EntityTypeService.class)
+            .put(NetvirtQosPolicyInstance.class, EntityTypeInstance.class)
             .build();
 
     private static final ImmutableMap<Class<? extends EntityNameBase>, Class<? extends EntityNameBase>>
@@ -91,6 +95,8 @@ public final class SrmRpcUtils {
             .put(NetvirtElan.class, NetvirtElan.class)
             .put(NetvirtElanInstance.class, NetvirtElan.class)
             .put(Ofplugin.class, Ofplugin.class)
+            .put(NetvirtQos.class, NetvirtQos.class)
+            .put(NetvirtQosPolicyInstance.class, NetvirtQos.class)
             .build();
 
 

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 843797468173540310f475719df52fbdba8a75b1..28ea837e3633c5d73b7057eb8f3086ef441b7f68 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
@@ -21,6 +21,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.GeniusItmTz;
 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.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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.NetvirtVpnInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.srm.types.rev170711.Ofplugin;
@@ -49,6 +51,7 @@ public final class SrmCliUtils {
             .put("VPN", NetvirtVpn.class)
             .put("ELAN", NetvirtElan.class)
             .put("OFPLUGIN", Ofplugin.class)
+            .put("QOS", NetvirtQos.class)
             .build();
 
     private static final ImmutableMap<String, Class<? extends EntityNameBase>> INSTANCE_NAME_MAP =
@@ -58,6 +61,7 @@ public final class SrmCliUtils {
             .put("IFM-IFACE", GeniusIfmInterface.class)
             .put("VPN-INSTANCE", NetvirtVpnInstance.class)
             .put("ELAN-INSTANCE", NetvirtElanInstance.class)
+            .put("QOS-POLICY-INSTANCE", NetvirtQosPolicyInstance.class)
             .build();
 
     /**