Networkmodel class renaming

Rename NetworkModelWavelengthService, NetworkModelWavelengthServiceImpl
and NetworkModelWavelengthServiceTest to FrequenciesService,
FrequenciesServiceImpl and FrequenciesServiceTest as now we manage
frequencies. Update reference in blueprint file and classes using one of
those classes.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I78090ebab0b850ce78d4d8bf7a3ba43887a786bc

diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
index 8dc1881cc11d648b7a44e33e12c611b903ae179e..0a5b6c339db3257782b98988e76c739d73709369 100644 (file)
--- a/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
+++ b/lighty/src/main/java/io/lighty/controllers/tpce/module/TransportPCEImpl.java
@@ -35,10 +35,10 @@ import org.opendaylight.transportpce.networkmodel.NetConfTopologyListener;
 import org.opendaylight.transportpce.networkmodel.NetworkModelProvider;
 import org.opendaylight.transportpce.networkmodel.NetworkUtilsImpl;
 import org.opendaylight.transportpce.networkmodel.R2RLinkDiscovery;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl;
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelServiceImpl;
-import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService;
-import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthServiceImpl;
 import org.opendaylight.transportpce.olm.OlmPowerServiceRpcImpl;
 import org.opendaylight.transportpce.olm.OlmProvider;
 import org.opendaylight.transportpce.olm.power.PowerMgmt;
@@ -123,8 +123,8 @@ public class TransportPCEImpl extends AbstractLightyModule implements TransportP
         PortMapping portMapping = initPortMapping(lightyServices, openRoadmInterfaces);
         NetworkModelService networkModelService = new NetworkModelServiceImpl(networkTransaction, linkDiscoveryImpl,
                 portMapping);
-        NetworkModelWavelengthService networkModelWavelengthService =
-                new NetworkModelWavelengthServiceImpl(lightyServices.getBindingDataBroker());
+        FrequenciesService networkModelWavelengthService =
+                new FrequenciesServiceImpl(lightyServices.getBindingDataBroker());
         NetConfTopologyListener netConfTopologyListener = new NetConfTopologyListener(networkModelService,
                 lightyServices.getBindingDataBroker(), deviceTransactionManager);
         networkModelProvider = new NetworkModelProvider(networkTransaction, lightyServices.getBindingDataBroker(),

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java
index 23c8a8df155dffbe2257e14864daedd41c72c399..bbe34802b7e8068e45e5262f02cb98787b094b81 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkModelProvider.java
@@ -16,7 +16,7 @@ import org.opendaylight.transportpce.common.InstanceIdentifiers;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.listeners.ServiceHandlerListener;
-import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
 import org.opendaylight.transportpce.networkmodel.util.TpceNetwork;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.TransportpceServicehandlerListener;
@@ -39,12 +39,12 @@ public class NetworkModelProvider {
     private TpceNetwork tpceNetwork;
     private ListenerRegistration<TransportpceServicehandlerListener> serviceHandlerListenerRegistration;
     private NotificationService notificationService;
-    private NetworkModelWavelengthService networkModelWavelengthService;
+    private FrequenciesService networkModelWavelengthService;
 
     public NetworkModelProvider(NetworkTransactionService networkTransactionService, final DataBroker dataBroker,
         final RpcProviderService rpcProviderService, final TransportpceNetworkutilsService networkutilsService,
         final NetConfTopologyListener topologyListener, NotificationService notificationService,
-        NetworkModelWavelengthService networkModelWavelengthService) {
+        FrequenciesService networkModelWavelengthService) {
         this.dataBroker = dataBroker;
         this.rpcProviderService = rpcProviderService;
         this.networkutilsService = networkutilsService;

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java
index 5f588a09de9c6afb85297e458bc1c42671493015..ec7ad7f0c61c9333231ad0f162a197e891bc1e84 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/ServiceHandlerListener.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.transportpce.networkmodel.listeners;
 
-import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.ServiceRpcResultSh;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.servicehandler.rev201125.TransportpceServicehandlerListener;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.ServiceNotificationTypes;
@@ -18,9 +18,9 @@ import org.slf4j.LoggerFactory;
 
 public class ServiceHandlerListener implements TransportpceServicehandlerListener {
     private static final Logger LOG = LoggerFactory.getLogger(ServiceHandlerListener.class);
-    private final NetworkModelWavelengthService service;
+    private final FrequenciesService service;
 
-    public ServiceHandlerListener(NetworkModelWavelengthService service) {
+    public ServiceHandlerListener(FrequenciesService service) {
         LOG.info("Init service handler listener for network");
         this.service = service;
     }

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthService.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesService.java
similarity index 95%
rename from networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthService.java
rename to networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesService.java
index e7d42fd9cb7563b81acfd71e7d18493e1ed712b9..8f6dd32c25a2f232786c30f12bb5f65fd5f9eb18 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthService.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesService.java
@@ -10,7 +10,7 @@ package org.opendaylight.transportpce.networkmodel.service;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.AToZDirection;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201126.path.description.ZToADirection;
 
-public interface NetworkModelWavelengthService {
+public interface FrequenciesService {
 
     /**
      * Allocate frequency in network topology.

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
similarity index 99%
rename from networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceImpl.java
rename to networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
index 775ba53b5f1a496d13a3c2c68214faeac574ec5f..649b81051b9868404f9df3ccad6b00c8fb5dd558 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceImpl.java
@@ -67,13 +67,13 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelengthService {
+public class FrequenciesServiceImpl implements FrequenciesService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(NetworkModelWavelengthServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FrequenciesServiceImpl.class);
     private final DataBroker dataBroker;
     private final AvailFreqMapsKey availFreqMapKey = new AvailFreqMapsKey(GridConstant.C_BAND);
 
-    public NetworkModelWavelengthServiceImpl(DataBroker dataBroker) {
+    public FrequenciesServiceImpl(DataBroker dataBroker) {
         this.dataBroker = dataBroker;
     }
 

diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
index 79605958d790b1da9ba8b92ad4a5c4ac95aa7000..7b3e161eab7f17e8b4d6ec87b24b99462a1644d2 100644 (file)
--- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
+++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml
@@ -28,7 +28,7 @@
         <argument ref="networkutilsServiceImpl" />
         <argument ref="netconfTopologyListener" />
         <argument ref="notificationService" />
-        <argument ref="networkModelWavelengthService" />
+        <argument ref="frequenciesService" />
     </bean>
 
     <bean id="netconfTopologyListener" class="org.opendaylight.transportpce.networkmodel.NetConfTopologyListener">
@@ -47,12 +47,12 @@
         <argument ref="networkTransactionImpl" />
    </bean>
 
-    <bean id="networkModelWavelengthService" class="org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthServiceImpl">
+    <bean id="frequenciesService" class="org.opendaylight.transportpce.networkmodel.service.FrequenciesServiceImpl">
         <argument ref="dataBroker" />
     </bean>
 
     <service ref="networkModelService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelService" />
 
-    <service ref="networkModelWavelengthService" interface="org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService" />
+    <service ref="frequenciesService" interface="org.opendaylight.transportpce.networkmodel.service.FrequenciesService" />
 
 </blueprint>

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
index ba0b84ffb70f0442eb375a260fe6a222d565a839..693257f857614be294be64785d2b31cea4a2723b 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetworkModelProviderTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
-import org.opendaylight.transportpce.networkmodel.service.NetworkModelWavelengthService;
+import org.opendaylight.transportpce.networkmodel.service.FrequenciesService;
 import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService;
 
@@ -40,7 +40,7 @@ public class NetworkModelProviderTest extends AbstractTest {
     @Mock
     private NotificationService notificationService;
     @Mock
-    private NetworkModelWavelengthService networkModelWavelengthService;
+    private FrequenciesService networkModelWavelengthService;
 
 
     @Test

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
similarity index 95%
rename from networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceTest.java
rename to networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
index 6b836ed7b883fa75eecf1bc5cebed13888fd0987..a50c4975c788fdb27b347dcb33f91d37e8ddf79e 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWavelengthServiceTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/FrequenciesServiceTest.java
@@ -46,8 +46,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NetworkModelWavelengthServiceTest extends AbstractTest {
-    private static final Logger LOG = LoggerFactory.getLogger(NetworkModelWavelengthServiceTest.class);
+public class FrequenciesServiceTest extends AbstractTest {
+    private static final Logger LOG = LoggerFactory.getLogger(FrequenciesServiceTest.class);
     private static final String OPENROADM_TOPOLOGY_FILE = "src/test/resources/openroadm-topology.xml";
     private static final String PATH_DESCRIPTION_FILE = "src/test/resources/path_description.json";
     private static PathDescription pathDescription;
@@ -76,7 +76,7 @@ public class NetworkModelWavelengthServiceTest extends AbstractTest {
 
     @Test
     public void allocateFrequenciesTest() throws IOException {
-        NetworkModelWavelengthService service = new NetworkModelWavelengthServiceImpl(getDataBroker());
+        FrequenciesService service = new FrequenciesServiceImpl(getDataBroker());
         service.allocateFrequencies(pathDescription.getAToZDirection(), pathDescription.getZToADirection());
         TerminationPoint1 terminationPoint = getNetworkTerminationPointFromDatastore("ROADM-A1-DEG2", "DEG2-CTP-TXRX");
         assertEquals("Lambda 1 should not be available for ctp-attributes",
@@ -95,7 +95,7 @@ public class NetworkModelWavelengthServiceTest extends AbstractTest {
 
     @Test
     public void releaseFrequenciesTest() throws IOException {
-        NetworkModelWavelengthService service = new NetworkModelWavelengthServiceImpl(getDataBroker());
+        FrequenciesService service = new FrequenciesServiceImpl(getDataBroker());
         service.allocateFrequencies(pathDescription.getAToZDirection(), pathDescription.getZToADirection());
         service.releaseFrequencies(pathDescription.getAToZDirection(), pathDescription.getZToADirection());
         TerminationPoint1 terminationPoint = getNetworkTerminationPointFromDatastore("ROADM-A1-DEG2", "DEG2-CTP-TXRX");