rename YANG modules for SRM in serviceutils

rename YANG modules for SRM in serviceutils
which are forked from genius to avoid packaging modules with conflicting names
JIRA: SRVUTILS-1

Change-Id: I395aeea3daac2137641e09dbc595dd5862972388
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/srm/api/src/main/yang/srm-ops.yang b/srm/api/src/main/yang/srm-ops.yang
index ead52d1b987fcee55fb1c310f57dfeae1537a1c5..434ac7025818a3098a116c37953272ac517632cd 100644 (file)
--- a/srm/api/src/main/yang/srm-ops.yang
+++ b/srm/api/src/main/yang/srm-ops.yang
@@ -1,12 +1,12 @@
-module srm-ops {
+module odl-srm-ops {
     namespace "urn:opendaylight:serviceutils:srm:ops";
     prefix "srmops";
 
-    import srm-types {
+    import odl-srm-types {
         prefix srmtype;
     }
 
-    revision "2017-07-11" {
+    revision "2018-06-26" {
         description "ODL Services Recovery Manager Operations Model";
     }
 

diff --git a/srm/api/src/main/yang/srm-rpcs.yang b/srm/api/src/main/yang/srm-rpcs.yang
index ee329f9095b052b3aa781614bcc825c8c7db78ad..c47898c8d5267c63b7b362ba39eb2606fd2e77ab 100644 (file)
--- a/srm/api/src/main/yang/srm-rpcs.yang
+++ b/srm/api/src/main/yang/srm-rpcs.yang
@@ -1,12 +1,12 @@
-module srm-rpcs {
-    namespace "urn:opendaylight:serviceutils:srm:rpcs";
-    prefix "srmrpcs";
+module odl-srm-rpcs {
+    namespace "urn:opendaylight:serviceutils:srm:rpc";
+    prefix "srmrpc";
 
-    import srm-types {
+    import odl-srm-types {
         prefix srmtype;
     }
 
-    revision "2017-07-11" {
+    revision "2018-06-26" {
         description "ODL Services Recovery Manager Rpcs Module";
     }
 

diff --git a/srm/api/src/main/yang/srm-types.yang b/srm/api/src/main/yang/srm-types.yang
index 0a9b08393ebccd88798941e2ef9742cf7a90b47f..afd1f60147bcb6d08d7228c7903b15b894a9a483 100644 (file)
--- a/srm/api/src/main/yang/srm-types.yang
+++ b/srm/api/src/main/yang/srm-types.yang
@@ -1,8 +1,8 @@
-module srm-types {
+module odl-srm-types {
     namespace "urn:opendaylight:serviceutils:srm:types";
     prefix "srmtypes";
 
-    revision "2017-07-11" {
+    revision "2018-06-26" {
         description "ODL Services Recovery Manager Types Module";
     }
 

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryListener.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryListener.java
index 3497a954343aa9c5afa695f49b39992f3e608e37..a8d97c5be3a091f9c64120452e32f525f8692e94 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryListener.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryListener.java
@@ -15,9 +15,9 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredSyncDataTreeChangeListener;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.ServiceOps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.Services;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.services.Operations;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.ServiceOps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.Services;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.services.Operations;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
index 5a09144403ca4b73e7731487a8ecac3dccc53927..64f070fb6fec7cc2d877623943fa855722e46fee 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/ServiceRecoveryManager.java
@@ -10,8 +10,8 @@ package org.opendaylight.serviceutils.srm.impl;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityNameBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityNameBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeBase;
 
 @Singleton
 public final class ServiceRecoveryManager {

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
index 2871f54087d5d24b0aa2419c8e28fbc1eeeb7d13..e2353ce56598b292ac30ac3b397beb5e2b12b773 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcProvider.java
@@ -15,17 +15,17 @@ import javax.inject.Singleton;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.serviceutils.tools.mdsal.rpc.FutureRpcResults;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.SrmRpcsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.OdlSrmRpcsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallOutput;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class SrmRpcProvider implements SrmRpcsService {
+public class SrmRpcProvider implements OdlSrmRpcsService {
 
     private static final Logger LOG = LoggerFactory.getLogger(SrmRpcProvider.class);
 

diff --git a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcUtils.java b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcUtils.java
index 43ecc2b5c477cf90a5c133ec9308c00be76425c6..20cea0fcb270b7e6e345fc4007eaa635bd4b9e73 100644 (file)
--- a/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcUtils.java
+++ b/srm/impl/src/main/java/org/opendaylight/serviceutils/srm/impl/SrmRpcUtils.java
@@ -13,47 +13,47 @@ import java.util.concurrent.ExecutionException;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.ServiceOps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.Services;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.ServicesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.services.Operations;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.service.ops.services.OperationsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RpcFailEntityId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RpcFailEntityName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RpcFailEntityType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RpcFailUnknown;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RpcSuccess;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityNameBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusIfm;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusIfmInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItm;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItmTep;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItmTz;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAclInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAclInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtDhcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtElan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtElanInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gw;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gwConnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gwNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtQos;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtQosPolicyInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtVpn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtVpnInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.Ofplugin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.ServiceOpRecover;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.ServiceOpReinstall;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.ServiceOps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.Services;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.ServicesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.services.Operations;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.service.ops.services.OperationsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RpcFailEntityId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RpcFailEntityName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RpcFailEntityType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RpcFailUnknown;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RpcSuccess;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityNameBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusIfm;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusIfmInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItm;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItmTep;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItmTz;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAclInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAclInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtDhcp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtElan;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtElanInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gw;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gwConnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gwNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtQos;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtQosPolicyInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtVpn;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtVpnInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.Ofplugin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.ServiceOpRecover;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.ServiceOpReinstall;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/RecoverCommand.java b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/RecoverCommand.java
index faf4c76584570f4761207fed6b42d6ea1a6053bd..c8d9c58515a5153f20133a7434d8d3a7bb0d30d3 100644 (file)
--- a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/RecoverCommand.java
+++ b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/RecoverCommand.java
@@ -13,12 +13,12 @@ import javax.annotation.Nullable;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.RecoverOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.SrmRpcsService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityNameBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.OdlSrmRpcsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.RecoverOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityNameBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeBase;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,9 +28,9 @@ public class RecoverCommand extends OsgiCommandSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(RecoverCommand.class);
 
-    private final SrmRpcsService srmRpcService;
+    private final OdlSrmRpcsService srmRpcService;
 
-    public RecoverCommand(SrmRpcsService srmRpcService) {
+    public RecoverCommand(OdlSrmRpcsService srmRpcService) {
         this.srmRpcService = srmRpcService;
     }
 

diff --git a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/ReinstallCommand.java b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/ReinstallCommand.java
index 4f8320bae5bf20bcfec62b8cac5aa1bc4695d84a..c6b5e989d96178a741400cc2e0f3a783aadf4c04 100644 (file)
--- a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/ReinstallCommand.java
+++ b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/ReinstallCommand.java
@@ -13,13 +13,13 @@ import javax.annotation.Nullable;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.ReinstallOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.SrmRpcsService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityNameBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.OdlSrmRpcsService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.ReinstallOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityNameBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeService;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,10 +29,10 @@ public class ReinstallCommand extends OsgiCommandSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(ReinstallCommand.class);
 
-    private final SrmRpcsService srmRpcService;
+    private final OdlSrmRpcsService srmRpcService;
     private final Class<? extends EntityTypeBase> entityType = EntityTypeService.class;
 
-    public ReinstallCommand(SrmRpcsService srmRpcService) {
+    public ReinstallCommand(OdlSrmRpcsService srmRpcService) {
         this.srmRpcService = srmRpcService;
     }
 

diff --git a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmCliUtils.java b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmCliUtils.java
index a1e8aa33bafe2a36f3ff85388bee09eb6483298e..27060356be20d9541968761e54b6e6cce9b94712 100644 (file)
--- a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmCliUtils.java
+++ b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmCliUtils.java
@@ -11,29 +11,29 @@ package org.opendaylight.serviceutils.srm.shell;
 import com.google.common.collect.ImmutableMap;
 import java.util.Locale;
 import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityNameBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.EntityTypeService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusIfm;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusIfmInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItm;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItmTep;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.GeniusItmTz;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAcl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAclInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtAclInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtDhcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtElan;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtElanInterface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gw;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gwConnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtL2gwNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtQos;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtQosPolicyInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtVpn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.NetvirtVpnInstance;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev170711.Ofplugin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityNameBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.EntityTypeService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusIfm;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusIfmInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItm;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItmTep;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.GeniusItmTz;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAcl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAclInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtAclInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtDhcp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtElan;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtElanInterface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gw;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gwConnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtL2gwNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtQos;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtQosPolicyInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtVpn;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.NetvirtVpnInstance;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.types.rev180626.Ofplugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmDebugCommand.java b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmDebugCommand.java
index b16805ad82f7897169b748ada252ac1db18a3aa2..f6513a09d42efd6aeb8ef76a5cc6e5d6a707d69b 100644 (file)
--- a/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmDebugCommand.java
+++ b/srm/shell/src/main/java/org/opendaylight/serviceutils/srm/shell/SrmDebugCommand.java
@@ -15,7 +15,7 @@ import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev170711.ServiceOps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.ops.rev180626.ServiceOps;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/srm/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/srm/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
index 7b80bfbf56af59415b7081d3fae8a4d06edf5ab1..6f6b091241159e96a80176327fa3df8439a61b4e 100644 (file)
--- a/srm/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
+++ b/srm/shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
@@ -13,7 +13,7 @@
                interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
 
     <odl:rpc-service id="srmRpcService"
-             interface="org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpcs.rev170711.SrmRpcsService" />
+             interface="org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.srm.rpc.rev180626.OdlSrmRpcsService" />
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>