From 82610815f1b706e2f9b5e5578474f3a8205c41aa Mon Sep 17 00:00:00 2001 From: Martial COULIBALY Date: Thu, 13 Sep 2018 17:09:22 +0200 Subject: [PATCH] Reintroduce SP 1.6 models in API module Rename all yang modules to be compliant with transportpce-*.yang JIIRA:TRNSPRTPCE-44 Change-Id: I0018dbbad7a84ab2a185256356813337cc48bc94 Signed-off-by: Martial COULIBALY --- ...transportpce-common-types@2017-09-07.yang} | 2 +- .../transportpce-pce@2017-04-26.yang} | 6 +- ....yang => transportpce-pce@2017-10-17.yang} | 9 +- ...nsportpce-renderer-device@2017-02-28.yang} | 11 +- ... => transportpce-renderer@2017-10-17.yang} | 9 +- .../transportpce-service-path@2017-10-17.yang | 65 ++++++ ...ansportpce-servicehandler@2017-09-30.yang} | 2 +- ...ansportpce-servicehandler@2017-10-17.yang} | 11 +- ...sportpce-alarmsuppression@2017-11-02.yang} | 6 +- ...transportpce-networkutils@2017-08-18.yang} | 6 +- ....yang => transportpce-olm@2017-04-18.yang} | 9 +- ... transportpce-portmapping@2017-02-28.yang} | 6 +- .../common/mapping/PortMapping.java | 2 +- .../common/mapping/PortMappingImpl.java | 212 ++++++++---------- .../networkmodel/NetworkModelProvider.java | 10 +- .../networkmodel/NetworkUtilsImpl.java | 30 +-- .../transportpce/networkmodel/OrdLink.java | 3 +- .../networkmodel/R2RLinkDiscovery.java | 19 +- .../networkmodel/Rdm2XpdrLink.java | 2 +- .../listeners/AlarmNotificationListener.java | 8 +- .../networkmodel/util/LinkIdUtil.java | 2 +- .../olm/OlmPowerServiceRpcImpl.java | 28 +-- .../transportpce/olm/OlmProvider.java | 8 +- .../transportpce/olm/power/PowerMgmt.java | 10 +- .../olm/service/OlmPowerService.java | 24 +- .../olm/service/OlmPowerServiceImpl.java | 132 +++++------ .../transportpce/olm/util/OlmUtils.java | 40 ++-- .../transportpce/olm/util/RoadmLinks.java | 98 -------- .../transportpce/pce/impl/PceProvider.java | 6 +- .../pce/impl/PceServiceRPCImpl.java | 4 +- .../renderer/ModelMappingUtils.java | 8 +- .../renderer/RendererProvider.java | 8 +- .../renderer/ServicePathInputData.java | 2 +- .../OpenRoadmInterfaceFactory.java | 47 ++-- .../DeviceRendererService.java | 13 +- .../DeviceRendererServiceImpl.java | 81 ++++--- .../RendererServiceOperationsImpl.java | 20 +- .../tasks/DeviceRenderingRollbackTask.java | 8 +- .../tasks/DeviceRenderingTask.java | 3 +- .../tasks/OlmPowerSetupRollbackTask.java | 14 +- .../tasks/OlmPowerSetupTask.java | 11 +- .../renderer/rpcs/DeviceRendererRPCImpl.java | 18 +- .../blueprint/renderer-blueprint.xml | 2 +- ...ceRendererServiceImplCreateOtsOmsTest.java | 4 +- .../DeviceRendererServiceImplDeleteTest.java | 4 +- ...DeviceRendererServiceImplRollbackTest.java | 6 +- .../DeviceRendererServiceImplSetupTest.java | 4 +- ...ndererServiceOperationsImplDeleteTest.java | 6 +- .../RendererServiceOperationsImplTest.java | 18 +- .../renderer/stub/OlmServiceStub.java | 34 +-- .../renderer/utils/CreateOtsOmsDataUtils.java | 4 +- .../renderer/utils/MountPointUtils.java | 12 +- .../renderer/utils/ServiceDataUtils.java | 8 +- .../utils/ServiceImplementationDataUtils.java | 8 +- .../impl/ServicehandlerProvider.java | 4 +- .../listeners/PceListenerImpl.java | 8 +- .../test_renderer_service_path_nominal.py | 4 +- 57 files changed, 539 insertions(+), 600 deletions(-) rename api/src/main/yang/{org-transportpce-common-types@2017-09-07.yang => service_path/transportpce-common-types@2017-09-07.yang} (98%) rename api/src/main/yang/{pce@2017-04-26.yang => service_path/transportpce-pce@2017-04-26.yang} (99%) rename api/src/main/yang/service_path/{transportpce-pce.yang => transportpce-pce@2017-10-17.yang} (96%) rename api/src/main/yang/{renderer@2017-02-28.yang => service_path/transportpce-renderer-device@2017-02-28.yang} (85%) rename api/src/main/yang/service_path/{transportpce-renderer.yang => transportpce-renderer@2017-10-17.yang} (94%) create mode 100644 api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang rename api/src/main/yang/{servicehandler.yang => service_path/transportpce-servicehandler@2017-09-30.yang} (98%) rename api/src/main/yang/service_path/{transportpce-servicehandler.yang => transportpce-servicehandler@2017-10-17.yang} (94%) rename api/src/main/yang/{alarmsuppression@2017-11-02.yang => transportpce-alarmsuppression@2017-11-02.yang} (87%) rename api/src/main/yang/{networkutils@2017-08-18.yang => transportpce-networkutils@2017-08-18.yang} (93%) rename api/src/main/yang/{olm@2017-04-18.yang => transportpce-olm@2017-04-18.yang} (95%) rename api/src/main/yang/{portmapping@2017-02-28.yang => transportpce-portmapping@2017-02-28.yang} (93%) delete mode 100644 olm/src/main/java/org/opendaylight/transportpce/olm/util/RoadmLinks.java diff --git a/api/src/main/yang/org-transportpce-common-types@2017-09-07.yang b/api/src/main/yang/service_path/transportpce-common-types@2017-09-07.yang similarity index 98% rename from api/src/main/yang/org-transportpce-common-types@2017-09-07.yang rename to api/src/main/yang/service_path/transportpce-common-types@2017-09-07.yang index 27c52c5bb..7fcc41407 100644 --- a/api/src/main/yang/org-transportpce-common-types@2017-09-07.yang +++ b/api/src/main/yang/service_path/transportpce-common-types@2017-09-07.yang @@ -1,4 +1,4 @@ -module org-transportpce-common-types { +module transportpce-common-types { namespace "http://org/transportpce/common-types"; prefix org-transportpce-common-types; diff --git a/api/src/main/yang/pce@2017-04-26.yang b/api/src/main/yang/service_path/transportpce-pce@2017-04-26.yang similarity index 99% rename from api/src/main/yang/pce@2017-04-26.yang rename to api/src/main/yang/service_path/transportpce-pce@2017-04-26.yang index 76630a4e4..2e665ab33 100644 --- a/api/src/main/yang/pce@2017-04-26.yang +++ b/api/src/main/yang/service_path/transportpce-pce@2017-04-26.yang @@ -1,9 +1,7 @@ -module pce { - yang-version 1; +module transportpce-pce { namespace "http://org/opendaylight/transportpce/pce"; prefix "org-opendaylight-transportpce-pce"; - import ietf-yang-types { prefix yang; revision-date 2013-07-15; @@ -75,7 +73,7 @@ module pce { revision 2017-04-26 { description "Version 1.5"; - } + } rpc path-computation-request { input { diff --git a/api/src/main/yang/service_path/transportpce-pce.yang b/api/src/main/yang/service_path/transportpce-pce@2017-10-17.yang similarity index 96% rename from api/src/main/yang/service_path/transportpce-pce.yang rename to api/src/main/yang/service_path/transportpce-pce@2017-10-17.yang index ca2708f82..6c1c942cb 100644 --- a/api/src/main/yang/service_path/transportpce-pce.yang +++ b/api/src/main/yang/service_path/transportpce-pce@2017-10-17.yang @@ -1,6 +1,6 @@ module transportpce-pce { - namespace "http://org/transportpce/B-interface/pce"; - prefix transportpce-pce; + namespace "http://org/opendaylight/transportpce/pce"; + prefix "org-opendaylight-transportpce-pce"; import ietf-yang-types { prefix yang; @@ -56,6 +56,11 @@ module transportpce-pce { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision 2017-04-26 { + description + "Version 1.5"; + } + revision 2017-10-17 { description "Version 1.6"; diff --git a/api/src/main/yang/renderer@2017-02-28.yang b/api/src/main/yang/service_path/transportpce-renderer-device@2017-02-28.yang similarity index 85% rename from api/src/main/yang/renderer@2017-02-28.yang rename to api/src/main/yang/service_path/transportpce-renderer-device@2017-02-28.yang index d3cb4b77a..2c3bd483a 100644 --- a/api/src/main/yang/renderer@2017-02-28.yang +++ b/api/src/main/yang/service_path/transportpce-renderer-device@2017-02-28.yang @@ -1,9 +1,8 @@ -module renderer { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:renderer"; - prefix "renderer"; +module transportpce-device-renderer { + namespace "http://org/opendaylight/transportpce/renderer/device"; + prefix "org-opendaylight-transportpce-renderer-device"; - import org-transportpce-common-types { + import transportpce-common-types { prefix org-transportpce-common-types; revision-date 2017-09-07; } @@ -19,7 +18,7 @@ module renderer { Shweta Vachhani ( sv111y@att.com )"; revision "2017-02-28" { - description "Initial revision of renderer model"; + description "Initial revision of renderer model version 1.5"; } rpc service-path { diff --git a/api/src/main/yang/service_path/transportpce-renderer.yang b/api/src/main/yang/service_path/transportpce-renderer@2017-10-17.yang similarity index 94% rename from api/src/main/yang/service_path/transportpce-renderer.yang rename to api/src/main/yang/service_path/transportpce-renderer@2017-10-17.yang index 1051a3519..ff472a71c 100644 --- a/api/src/main/yang/service_path/transportpce-renderer.yang +++ b/api/src/main/yang/service_path/transportpce-renderer@2017-10-17.yang @@ -1,12 +1,13 @@ module transportpce-renderer { - namespace "http://org/transportpce/C-interface/renderer"; - prefix transportpce-renderer; + namespace "http://org/opendaylight/transportpce/renderer"; + prefix "org-opendaylight-transportpce-renderer"; import ietf-yang-types { prefix yang; } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; + revision-date 2016-10-14; } import transportpce-common-service-path-types { prefix transportpce-common-service-path-types; @@ -55,6 +56,10 @@ module transportpce-renderer { ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE"; + revision "2017-02-28" { + description "Initial revision of renderer model version 1.5"; + } + revision 2017-10-17 { description "Version 1.6"; diff --git a/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang new file mode 100644 index 000000000..373adfdab --- /dev/null +++ b/api/src/main/yang/service_path/transportpce-service-path@2017-10-17.yang @@ -0,0 +1,65 @@ +module transportpce-servicepath { + namespace "http://org/transportpce/B-C-interface/servicepath"; + prefix transportpce-servicepath; + + import ietf-yang-types { + prefix yang; + } + import transportpce-common-service-path-types { + prefix transportpce-common-service-path-types; + } + + organization + "transportPCE"; + contact + "transportPCE committers - ODL"; + description + "YANG definitions for service-path (transportPCE). Adapted from service definition (openroadm) + Copyright © 2017 Orange, Inc. and others. All rights reserved. + + openroadm copyright: + Copyright of the Members of the Open ROADM MSA Agreement dated (c) 2016, + AT&T Intellectual Property. All other rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + * Neither the Members of the Open ROADM MSA Agreement nor the names of its + contributors may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE OPEN ROADM MSA AGREEMENT ''AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT THE MEMBERS OF THE OPEN ROADM MSA AGREEMENT BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE"; + + revision 2017-04-26 { + description + "Version 1.5"; + } + revision 2017-10-17 { + description + "Version 1.6"; + } + + container service-path-list { + description + "List of service paths. Can only be created, deleted, modified, etc. using special RPCs."; + list service-paths { + key "service-path-name"; + uses transportpce-common-service-path-types:service-path; + } + } + +} diff --git a/api/src/main/yang/servicehandler.yang b/api/src/main/yang/service_path/transportpce-servicehandler@2017-09-30.yang similarity index 98% rename from api/src/main/yang/servicehandler.yang rename to api/src/main/yang/service_path/transportpce-servicehandler@2017-09-30.yang index b33130fa5..ea2fc1164 100644 --- a/api/src/main/yang/servicehandler.yang +++ b/api/src/main/yang/service_path/transportpce-servicehandler@2017-09-30.yang @@ -1,4 +1,4 @@ -module servicehandler { +module transportpce-servicehandler { namespace "http://org/opendaylight/transportpce/servicehandler"; prefix "org-opendaylight-transportpce-servicehandler"; diff --git a/api/src/main/yang/service_path/transportpce-servicehandler.yang b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang similarity index 94% rename from api/src/main/yang/service_path/transportpce-servicehandler.yang rename to api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang index feed6e1fc..cf7858f93 100644 --- a/api/src/main/yang/service_path/transportpce-servicehandler.yang +++ b/api/src/main/yang/service_path/transportpce-servicehandler@2017-10-17.yang @@ -1,6 +1,6 @@ module transportpce-servicehandler { - namespace "http://org/transportpce/B-C-interface/servicehandler"; - prefix transportpce-servicehandler; + namespace "http://org/opendaylight/transportpce/servicehandler"; + prefix "org-opendaylight-transportpce-servicehandler"; import ietf-yang-types { prefix yang; @@ -69,6 +69,13 @@ module transportpce-servicehandler { description "Version 1.6"; } + + revision 2017-09-30 { + description + "Version 1.2"; + } + + notification service-rpc-result-sh{ description "This Notification indicates result of service RPC"; diff --git a/api/src/main/yang/alarmsuppression@2017-11-02.yang b/api/src/main/yang/transportpce-alarmsuppression@2017-11-02.yang similarity index 87% rename from api/src/main/yang/alarmsuppression@2017-11-02.yang rename to api/src/main/yang/transportpce-alarmsuppression@2017-11-02.yang index 2ddce0035..8d165da3e 100644 --- a/api/src/main/yang/alarmsuppression@2017-11-02.yang +++ b/api/src/main/yang/transportpce-alarmsuppression@2017-11-02.yang @@ -1,7 +1,7 @@ -module alarmsuppression { +module transportpce-alarmsuppression { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:alarmsuppression"; - prefix "alarmsuppression"; + namespace "http://org/opendaylight/transportpce/alarmsuppression"; + prefix "org-opendaylight-transportpce-alarmsuppression"; organization "transportPCE"; diff --git a/api/src/main/yang/networkutils@2017-08-18.yang b/api/src/main/yang/transportpce-networkutils@2017-08-18.yang similarity index 93% rename from api/src/main/yang/networkutils@2017-08-18.yang rename to api/src/main/yang/transportpce-networkutils@2017-08-18.yang index d4f872781..1a1a0c73b 100644 --- a/api/src/main/yang/networkutils@2017-08-18.yang +++ b/api/src/main/yang/transportpce-networkutils@2017-08-18.yang @@ -1,7 +1,7 @@ -module networkutils { +module transportpce-networkutils { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:networkutils"; - prefix "networkutils"; + namespace "http://org/opendaylight/transportpce/networkutils"; + prefix "org-opendaylight-transportpce-networkutils"; revision "2017-08-18" { description "Initial revision of networkutils model"; diff --git a/api/src/main/yang/olm@2017-04-18.yang b/api/src/main/yang/transportpce-olm@2017-04-18.yang similarity index 95% rename from api/src/main/yang/olm@2017-04-18.yang rename to api/src/main/yang/transportpce-olm@2017-04-18.yang index b970eccbc..60e348658 100644 --- a/api/src/main/yang/olm@2017-04-18.yang +++ b/api/src/main/yang/transportpce-olm@2017-04-18.yang @@ -1,9 +1,9 @@ -module olm { +module transportpce-olm { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:olm"; - prefix "olm"; + namespace "http://org/opendaylight/transportpce/olm"; + prefix "org-opendaylight-transportpce-olm"; - import org-transportpce-common-types { + import transportpce-common-types { prefix org-transportpce-common-types; revision-date 2017-09-07; } @@ -26,6 +26,7 @@ module olm { revision "2017-04-18" { description "Initial revision of olm model"; } + rpc get-pm{ description "This RPC fetches from the device a list of pm measurements diff --git a/api/src/main/yang/portmapping@2017-02-28.yang b/api/src/main/yang/transportpce-portmapping@2017-02-28.yang similarity index 93% rename from api/src/main/yang/portmapping@2017-02-28.yang rename to api/src/main/yang/transportpce-portmapping@2017-02-28.yang index 7f683fa77..3e892da19 100644 --- a/api/src/main/yang/portmapping@2017-02-28.yang +++ b/api/src/main/yang/transportpce-portmapping@2017-02-28.yang @@ -1,7 +1,7 @@ -module portmapping { +module transportpce-portmapping { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:portmapping"; - prefix "portmapping"; + namespace "http://org/opendaylight/transportpce/portmapping"; + prefix "org-opendaylight-transportpce-portmapping"; import org-openroadm-common-types { prefix org-openroadm-common-types; diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java index a213fd795..a636105c4 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMapping.java @@ -8,7 +8,7 @@ package org.opendaylight.transportpce.common.mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; public interface PortMapping { diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java index 2ede78500..029cf949a 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingImpl.java @@ -32,6 +32,17 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.NetworkBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegreeBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegreeKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.CircuitPack; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.Port; @@ -54,19 +65,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.Inte import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpenROADMOpticalMultiplex; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OpticalTransport; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfig; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.NetworkBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegreeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegreeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,7 +92,8 @@ public class PortMappingImpl implements PortMapping { List portMapList = new ArrayList<>(); InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); Optional deviceInfoOptional = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.OPERATIONAL, infoIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); Info deviceInfo; if (deviceInfoOptional.isPresent()) { @@ -166,24 +166,25 @@ public class PortMappingImpl implements PortMapping { for (ConnectionPorts cp : degreeConPorts) { String circuitPackName = cp.getCircuitPackName(); String portName = cp.getPortName().toString(); - InstanceIdentifier portIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - CircuitPacks.class, new CircuitPacksKey(circuitPackName)).child(Ports.class, new PortsKey(portName)); + InstanceIdentifier portIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)) + .child(Ports.class, new PortsKey(portName)); LOG.info("Fetching logical Connection Point value for port {} at circuit pack {}", portName, circuitPackName); Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, portIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.OPERATIONAL, portIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (portObject.isPresent()) { Ports port = portObject.get(); if (port.getLogicalConnectionPoint() != null) { - LOG.info("Logical Connection Point for {} {} is {}", circuitPackName, portName, port - .getLogicalConnectionPoint()); - portMapList.add(createMappingObject(nodeId, port, circuitPackName, port - .getLogicalConnectionPoint())); + LOG.info("Logical Connection Point for {} {} is {}", circuitPackName, portName, + port.getLogicalConnectionPoint()); + portMapList.add(createMappingObject(nodeId, port, circuitPackName, + port.getLogicalConnectionPoint())); } else { - LOG.warn("Logical Connection Point value is missing for {} {}", circuitPackName, port - .getPortName()); + LOG.warn("Logical Connection Point value is missing for {} {}", circuitPackName, + port.getPortName()); } } else { LOG.warn("Port {} is not present in node {} in circuit pack {}!", portName, nodeId, circuitPackName); @@ -207,11 +208,11 @@ public class PortMappingImpl implements PortMapping { for (int degreeCounter = 1; degreeCounter <= maxDegree; degreeCounter++) { LOG.info("Getting Connection ports for Degree Number {}", degreeCounter); - InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - Degree.class, new DegreeKey(degreeCounter)); + InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Degree.class, new DegreeKey(degreeCounter)); Optional ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId, - LogicalDatastoreType.CONFIGURATION, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.CONFIGURATION, + deviceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmDegreeObject.isPresent()) { degrees.add(ordmDegreeObject.get()); } else { @@ -243,23 +244,21 @@ public class PortMappingImpl implements PortMapping { private boolean createPpPortMapping(String nodeId, Info deviceInfo, List portMapList) { // Creating mapping data for SRG's PP - HashMap> srgCps = getSrgCps( - nodeId, deviceInfo); - Set>> circuitPacks = srgCps - .entrySet(); - for (Entry> entry : circuitPacks) { + HashMap> srgCps = getSrgCps(nodeId, deviceInfo); + Set>> circuitPacks = srgCps.entrySet(); + for (Entry> entry : circuitPacks) { Integer srgIndex = entry.getKey(); for (org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.srg.CircuitPacks cp : entry .getValue()) { String circuitPackName = cp.getCircuitPackName(); - InstanceIdentifier cpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - CircuitPacks.class, new CircuitPacksKey(circuitPackName)); + InstanceIdentifier cpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(CircuitPacks.class, new CircuitPacksKey(circuitPackName)); Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, cpIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.OPERATIONAL, cpIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (!circuitPackObject.isPresent() || (circuitPackObject.get().getPorts() == null)) { LOG.warn("{} : Circuit pack {} not found or without ports.", nodeId, circuitPackName); @@ -270,11 +269,13 @@ public class PortMappingImpl implements PortMapping { if (port.getLogicalConnectionPoint() != null) { String logicalConnectionPoint = getLogicalConnectionPort(port, srgIndex); LOG.info("{} : Logical Connection Point for {} {} is {}", nodeId, circuitPackName, port - .getPortName(), logicalConnectionPoint); + .getPortName(), + logicalConnectionPoint); portMapList.add(createMappingObject(nodeId, port, circuitPackName, logicalConnectionPoint)); } else if (Port.PortQual.RoadmInternal.equals(port.getPortQual())) { LOG.info("Port is internal, skipping Logical Connection Point missing for {} {}", - circuitPackName, port.getPortName()); + circuitPackName, + port.getPortName()); } else if (port.getLogicalConnectionPoint() == null) { LOG.info("Value missing, Skipping Logical Connection Point missing for {} {}", circuitPackName, port.getPortName()); @@ -298,12 +299,10 @@ public class PortMappingImpl implements PortMapping { * @return List of circuit packs object belonging to- shared risk group * subtree */ - private HashMap> getSrgCps(String deviceId, - Info ordmInfo) { - HashMap> cpPerSrg = - new HashMap<>(); + private HashMap> getSrgCps(String deviceId, Info ordmInfo) { + HashMap> cpPerSrg = new HashMap<>(); Integer maxSrg; // Get value for max Srg from info subtree, required for iteration // if not present assume to be 20 (temporary) @@ -316,11 +315,11 @@ public class PortMappingImpl implements PortMapping { List srgCps = new ArrayList<>(); LOG.info("Getting Circuitpacks for Srg Number {}", srgCounter); - InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( - SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter)); + InstanceIdentifier srgIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter)); Optional ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId, - LogicalDatastoreType.CONFIGURATION, srgIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.CONFIGURATION, + srgIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (ordmSrgObject.isPresent()) { srgCps.addAll(ordmSrgObject.get().getCircuitPacks()); cpPerSrg.put(ordmSrgObject.get().getSrgNumber(), srgCps); @@ -355,8 +354,8 @@ public class PortMappingImpl implements PortMapping { // Creating for Xponder Line and Client Ports InstanceIdentifier deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class); Optional deviceObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); + LogicalDatastoreType.OPERATIONAL, deviceIID, + Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); // Variable to keep track of number of line ports int line = 1; @@ -380,55 +379,19 @@ public class PortMappingImpl implements PortMapping { if (Port.PortQual.XpdrNetwork.equals(port.getPortQual())) { portMapList.add(createMappingObject(nodeId, port, circuitPackName, "XPDR1-" + OpenRoadmInterfacesImpl.NETWORK_TOKEN + line)); - //String lcp = port.getLogicalConnectionPoint(); - //String regex = "XPDR[0-9]+-NETWORK[0-9]+"; - //checkLogicalConnectionPoint(regex, lcp, nodeId, portMapList, circuitPackName, port, "NETWORK", line); line++; } else if (Port.PortQual.XpdrClient.equals(port.getPortQual())) { portMapList.add(createMappingObject(nodeId, port, circuitPackName, "XPDR1-" + OpenRoadmInterfacesImpl.CLIENT_TOKEN + client)); - //String lcp = port.getLogicalConnectionPoint(); - //String regex = "XPDR[0-9]+-CLIENT[0-9]+"; - //checkLogicalConnectionPoint(regex, lcp, nodeId, portMapList, circuitPackName, port, "CLIENT", client); client++; } else { - LOG.warn("Port type {} not supported", port.getPortQual()); + LOG.warn("Not supported type of port! Port type: {}", port.getPortQual()); } } } return true; } - private void checkLogicalConnectionPoint(String regex, String logicalConnectionPoint, String nodeId, List< - Mapping> portMapList, String circuitPackName, Ports port, String portQual, int index) { - if (logicalConnectionPoint.matches(regex)) { - Mapping map = createMappingObject(nodeId, port, circuitPackName, logicalConnectionPoint); - if (portMapList.stream().filter(mapping -> mapping.getLogicalConnectionPoint().equals( - logicalConnectionPoint)).count() > 0) { - LOG.warn("{} : logical connection point {} on {} {} already used. Port can not be used", nodeId, - logicalConnectionPoint, circuitPackName, port.getPortName()); - } else { - portMapList.add(map); - LOG.info("{} : logical connection point for {} {} is {}", nodeId, circuitPackName, port.getPortName(), - logicalConnectionPoint); - } - } else if (logicalConnectionPoint.isEmpty()) { - String lcp = "XPDR0-" + portQual + index; - Mapping map = createMappingObject(nodeId, port, circuitPackName, lcp); - if (portMapList.contains(map)) { - LOG.warn("{} : can not assign logical connection point {} to port {} of circuit pack {}. " - + "Name is already used", nodeId, lcp, port.getPortName(), circuitPackName); - } else { - portMapList.add(createMappingObject(nodeId, port, circuitPackName, lcp)); - LOG.info("{} : no logical connection port on {} {}. Assigning {}.", nodeId, circuitPackName, port - .getPortName(), lcp); - } - } else { - LOG.warn("{} : logical connection point {} on {} {} does not respect OrgOpenRoadm recommendation. Port can " - + "not be used.", nodeId, logicalConnectionPoint, circuitPackName, port.getPortName()); - } - } - /** * This private method builds the mapping object to be pushed in MD-SAL in * order to save port mapping. In case of TTP ports, it also saves the @@ -454,8 +417,8 @@ public class PortMappingImpl implements PortMapping { if (logicalConnectionPoint.contains(OpenRoadmInterfacesImpl.TTP_TOKEN) && (port.getInterfaces() != null)) { for (Interfaces interfaces : port.getInterfaces()) { try { - Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, interfaces - .getInterfaceName()); + Optional openRoadmInterface = this.openRoadmInterfaces.getInterface(nodeId, + interfaces.getInterfaceName()); if (openRoadmInterface.isPresent()) { Class interfaceType = openRoadmInterface.get().getType(); // Check if interface type is OMS or OTS @@ -478,30 +441,30 @@ public class PortMappingImpl implements PortMapping { } private CpToDegree createCpToDegreeObject(String circuitPackName, String degreeNumber, String nodeId, - Map interfaceList) { + Map interfaceList) { String interfaceName = null; if (interfaceList.get(circuitPackName) != null) { interfaceName = interfaceList.get(circuitPackName); } return new CpToDegreeBuilder().withKey(new CpToDegreeKey(circuitPackName)).setCircuitPackName(circuitPackName) - .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build(); + .setDegreeNumber(new Long(degreeNumber)).setInterfaceName(interfaceName).build(); } private static List getDegreePorts(List degrees) { - return degrees.stream().filter(degree -> degree.getConnectionPorts() != null).flatMap(degree -> degree - .getConnectionPorts().stream()).collect(Collectors.toList()); + return degrees.stream().filter(degree -> degree.getConnectionPorts() != null) + .flatMap(degree -> degree.getConnectionPorts().stream()).collect(Collectors.toList()); } private List getCpToDegreeList(List degrees, String nodeId, - Map interfaceList) { + Map interfaceList) { List cpToDegreeList = new ArrayList<>(); for (Degree degree : degrees) { if (degree.getCircuitPacks() != null) { LOG.info("Inside CP to degree list"); cpToDegreeList.addAll(degree.getCircuitPacks().stream() - .map(cp -> createCpToDegreeObject(cp.getCircuitPackName() , - degree.getDegreeNumber().toString(), nodeId ,interfaceList)) - .collect(Collectors.toList())); + .map(cp -> createCpToDegreeObject(cp.getCircuitPackName() , + degree.getDegreeNumber().toString(), nodeId ,interfaceList)) + .collect(Collectors.toList())); } } return cpToDegreeList; @@ -523,8 +486,8 @@ public class PortMappingImpl implements PortMapping { * * @return Result true/false based on status of operation. */ - private boolean postPortMapping(Info deviceInfo, List portMapList, Integer nodeType, List< - CpToDegree> cp2DegreeList) { + private boolean postPortMapping(Info deviceInfo, List portMapList, Integer nodeType, + List cp2DegreeList) { NodesBuilder nodesBldr = new NodesBuilder(); nodesBldr.withKey(new NodesKey(deviceInfo.getNodeId())).setNodeId(deviceInfo.getNodeId()); nodesBldr.setNodeType(NodeTypes.forValue(nodeType)); @@ -621,8 +584,8 @@ public class PortMappingImpl implements PortMapping { } return logicalConnectionPoint; } - LOG.warn("Unsupported port direction for port {} - {} - LogicalConnectionPoint is null", port, port - .getPortDirection()); + LOG.warn("Unsupported port direction for port {} - {} - LogicalConnectionPoint is null", + port, port.getPortDirection()); return null; // TODO return false or continue? } @@ -630,8 +593,8 @@ public class PortMappingImpl implements PortMapping { public void deleteMappingData(String nodeId) { LOG.info("Deleting Mapping Data corresponding at node '{}'", nodeId); WriteTransaction rw = this.dataBroker.newWriteOnlyTransaction(); - InstanceIdentifier nodesIID = InstanceIdentifier.create(Network.class).child(Nodes.class, new NodesKey( - nodeId)); + InstanceIdentifier nodesIID = InstanceIdentifier.create(Network.class) + .child(Nodes.class, new NodesKey(nodeId)); rw.delete(LogicalDatastoreType.CONFIGURATION, nodesIID); try { rw.submit().get(1, TimeUnit.SECONDS); @@ -648,7 +611,7 @@ public class PortMappingImpl implements PortMapping { InstanceIdentifier portIId = InstanceIdentifier.create(OrgOpenroadmDevice.class).child( CircuitPacks.class, new CircuitPacksKey(oldMapping.getSupportingCircuitPackName())).child(Ports.class, new PortsKey(oldMapping.getSupportingPort())); - if (oldMapping != null && nodeId != null) { + if ((oldMapping != null) && (nodeId != null)) { try { Optional portObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, portIId, Timeouts.DEVICE_READ_TIMEOUT, @@ -677,38 +640,47 @@ public class PortMappingImpl implements PortMapping { LOG.error("Impossible to update mapping"); return false; } - } private Map getEthInterfaceList(String nodeId) { LOG.info("It is calling get ethernet interface"); Map cpToInterfaceMap = new HashMap<>(); - InstanceIdentifier lldpIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Protocols.class).augmentation(Protocols1.class).child(Lldp.class); - Optional lldpObject = this.deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, lldpIID, Timeouts.DEVICE_READ_TIMEOUT, + InstanceIdentifier protocolsIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) + .child(Protocols.class); + Optional protocolObject = this.deviceTransactionManager.getDataFromDevice(nodeId, + LogicalDatastoreType.OPERATIONAL, protocolsIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (lldpObject.isPresent() && (lldpObject.get().getPortConfig() != null)) { - for (PortConfig portConfig : lldpObject.get().getPortConfig()) { + if (!protocolObject.isPresent() || (protocolObject.get().augmentation(Protocols1.class) == null)) { + LOG.warn("LLDP subtree is missing : isolated openroadm device"); + return cpToInterfaceMap; + } + List portConfigList = protocolObject.get().augmentation(Protocols1.class).getLldp().getPortConfig(); + if (!portConfigList.isEmpty()) { + for (PortConfig portConfig : portConfigList) { if (portConfig.getAdminStatus().equals(PortConfig.AdminStatus.Txandrx)) { InstanceIdentifier interfaceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) .child(Interface.class, new InterfaceKey(portConfig.getIfName())); Optional interfaceObject = this.deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, interfaceIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (interfaceObject.isPresent() && (interfaceObject.get().getSupportingCircuitPackName() != null)) { + if (interfaceObject.isPresent() + && (interfaceObject.get().getSupportingCircuitPackName() != null)) { String supportingCircuitPackName = interfaceObject.get().getSupportingCircuitPackName(); cpToInterfaceMap.put(supportingCircuitPackName, portConfig.getIfName()); - InstanceIdentifier circuitPacksIID = InstanceIdentifier.create(OrgOpenroadmDevice - .class).child(CircuitPacks.class, new CircuitPacksKey(supportingCircuitPackName)); + InstanceIdentifier circuitPacksIID = InstanceIdentifier + .create(OrgOpenroadmDevice.class).child(CircuitPacks.class, + new CircuitPacksKey(supportingCircuitPackName)); Optional circuitPackObject = this.deviceTransactionManager.getDataFromDevice( nodeId, LogicalDatastoreType.OPERATIONAL, circuitPacksIID, Timeouts .DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); - if (circuitPackObject.isPresent() && (circuitPackObject.get().getParentCircuitPack() != null)) { - cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack().getCircuitPackName() , - portConfig.getIfName()); + if (circuitPackObject.isPresent() + && (circuitPackObject.get().getParentCircuitPack() != null)) { + cpToInterfaceMap.put(circuitPackObject.get().getParentCircuitPack() + .getCircuitPackName(), portConfig.getIfName()); } } + } else { + LOG.warn("PortConfig Admi Status is not equal Txandrx"); } } } else { 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 e485367a3..ff946da7d 100644 --- 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.networkmodel.util.ClliNetwork; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmNetwork; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.NetworkutilsService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.slf4j.Logger; @@ -28,14 +28,14 @@ public class NetworkModelProvider { private final DataBroker dataBroker; private final RpcProviderRegistry rpcProviderRegistry; - private final NetworkutilsService networkutilsService; + private final TransportpceNetworkutilsService networkutilsService; private final NetConfTopologyListener topologyListener; private final OpenRoadmTopology openRoadmTopology; private ListenerRegistration dataTreeChangeListenerRegistration; - private BindingAwareBroker.RpcRegistration networkutilsServiceRpcRegistration; + private BindingAwareBroker.RpcRegistration networkutilsServiceRpcRegistration; public NetworkModelProvider(final DataBroker dataBroker, final RpcProviderRegistry rpcProviderRegistry, - final NetworkutilsService networkutilsService, final NetConfTopologyListener topologyListener, + final TransportpceNetworkutilsService networkutilsService, final NetConfTopologyListener topologyListener, OpenRoadmTopology openRoadmTopology) { this.dataBroker = dataBroker; this.rpcProviderRegistry = rpcProviderRegistry; @@ -56,7 +56,7 @@ public class NetworkModelProvider { dataBroker.registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class)), topologyListener); networkutilsServiceRpcRegistration = - rpcProviderRegistry.addRpcImplementation(NetworkutilsService.class, networkutilsService); + rpcProviderRegistry.addRpcImplementation(TransportpceNetworkutilsService.class, networkutilsService); } /** diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java index 7100c56c1..afadd0ff5 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/NetworkUtilsImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.transportpce.networkmodel; import com.google.common.base.Optional; import com.google.common.util.concurrent.ListenableFuture; - import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; @@ -17,6 +16,19 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.DeleteLinkOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRdmXpdrLinksOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitXpdrRdmLinksOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.TransportpceNetworkutilsService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey; @@ -24,26 +36,13 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.DeleteLinkInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.DeleteLinkOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.DeleteLinkOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRdmXpdrLinksInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRdmXpdrLinksOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRdmXpdrLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitXpdrRdmLinksInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitXpdrRdmLinksOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitXpdrRdmLinksOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.NetworkutilsService; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NetworkUtilsImpl implements NetworkutilsService { +public class NetworkUtilsImpl implements TransportpceNetworkutilsService { private static final Logger LOG = LoggerFactory.getLogger(NetworkUtilsImpl.class); private final DataBroker dataBroker; @@ -98,6 +97,7 @@ public class NetworkUtilsImpl implements NetworkutilsService { } } + @Override public ListenableFuture> initRoadmNodes(InitRoadmNodesInput input) { boolean createRdmLinks = OrdLink.createRdm2RdmLinks(input, this.openRoadmTopology,this.dataBroker); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java index 408d13adc..1f83df4f5 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -9,13 +9,13 @@ package org.opendaylight.transportpce.networkmodel; 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.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.LinkIdUtil; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.link.OMSAttributesBuilder; @@ -28,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInput; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java index 78b76f2d2..e7784647e 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/R2RLinkDiscovery.java @@ -12,7 +12,6 @@ import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.MountPoint; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; @@ -21,6 +20,12 @@ import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.CpToDegree; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.Direction; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Protocols; @@ -28,12 +33,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1 import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.NbrList; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.nbr.list.IfName; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.CpToDegree; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -96,7 +95,7 @@ public class R2RLinkDiscovery { try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID) .get().toJavaUtil(); - if (nodesObject.isPresent() && nodesObject.get().getMapping() != null) { + if (nodesObject.isPresent() && (nodesObject.get().getMapping() != null)) { List mappingList = nodesObject.get().getMapping(); mappingList = mappingList.stream().filter(mp -> mp.getLogicalConnectionPoint().contains("DEG" + degreeCounter)).collect(Collectors.toList()); @@ -249,13 +248,13 @@ public class R2RLinkDiscovery { try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { Optional nodesObject = readTx.read(LogicalDatastoreType.CONFIGURATION, nodesIID) .get().toJavaUtil(); - if (nodesObject.isPresent() && nodesObject.get().getCpToDegree() != null) { + if (nodesObject.isPresent() && (nodesObject.get().getCpToDegree() != null)) { List cpToDeg = nodesObject.get().getCpToDegree(); Stream cpToDegStream = cpToDeg.stream().filter(cp -> cp.getInterfaceName() != null) .filter(cp -> cp.getInterfaceName().equals(interfaceName)); if (cpToDegStream != null) { Optional firstCpToDegree = cpToDegStream.findFirst(); - if (firstCpToDegree.isPresent() && firstCpToDegree != null) { + if (firstCpToDegree.isPresent() && (firstCpToDegree != null)) { LOG.debug("Found and returning {}",firstCpToDegree.get().getDegreeNumber().intValue()); return firstCpToDegree.get().getDegreeNumber().intValue(); } else { diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java index b67091ee7..9b748824f 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java @@ -16,6 +16,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.networkmodel.util.OpenRoadmTopology; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.links.input.grouping.LinksInput; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmLinkType; @@ -26,7 +27,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.LinkBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.links.input.grouping.LinksInput; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java index 80e89c888..ac2497333 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/listeners/AlarmNotificationListener.java @@ -14,6 +14,10 @@ import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.Nodelist; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.nodelist.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.AlarmNotification; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.OrgOpenroadmAlarmListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.alarm.ProbableCause; @@ -29,10 +33,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resour import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Service; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Shelf; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resource.resource.resource.Srg; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.ServiceNodelist; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service.nodelist.Nodelist; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service.nodelist.nodelist.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service.nodelist.nodelist.NodesBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java index cf6eed3be..d8e037ac0 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/LinkIdUtil.java @@ -9,8 +9,8 @@ package org.opendaylight.transportpce.networkmodel.util; import java.text.MessageFormat; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkutils.rev170818.InitRoadmNodesInput; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.LinkId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.networkutils.rev170818.InitRoadmNodesInput; public final class LinkIdUtil { diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java index d793f6d70..60b237b71 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmPowerServiceRpcImpl.java @@ -9,26 +9,26 @@ package org.opendaylight.transportpce.olm; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.olm.service.OlmPowerService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; /** * The Class OlmPowerServiceRpcImpl. */ -public class OlmPowerServiceRpcImpl implements OlmService { +public class OlmPowerServiceRpcImpl implements TransportpceOlmService { private final OlmPowerService olmPowerService; public OlmPowerServiceRpcImpl(OlmPowerService olmPowerService) { diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmProvider.java b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmProvider.java index 36343095c..b283ef561 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/OlmProvider.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/OlmProvider.java @@ -11,7 +11,7 @@ package org.opendaylight.transportpce.olm; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.transportpce.olm.service.OlmPowerService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ public class OlmProvider { private static final Logger LOG = LoggerFactory.getLogger(OlmProvider.class); private final RpcProviderRegistry rpcProviderRegistry; private final OlmPowerService olmPowerService; - private RpcRegistration olmRPCRegistration; + private RpcRegistration olmRPCRegistration; /** * Instantiates a new olm provider. @@ -42,8 +42,8 @@ public class OlmProvider { public void init() { LOG.info("OlmProvider Session Initiated"); // Initializing Notification module - olmRPCRegistration = rpcProviderRegistry.addRpcImplementation(OlmService.class, new OlmPowerServiceRpcImpl( - this.olmPowerService)); + olmRPCRegistration = rpcProviderRegistry.addRpcImplementation(TransportpceOlmService.class, + new OlmPowerServiceRpcImpl(this.olmPowerService)); } /** diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java index 82b11c0b9..755236d38 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/power/PowerMgmt.java @@ -24,6 +24,11 @@ import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.olm.util.OlmUtils; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.PowerDBm; @@ -42,11 +47,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.re import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.och.container.OchBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerService.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerService.java index 63e91cf83..19206d6d8 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerService.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerService.java @@ -8,18 +8,18 @@ package org.opendaylight.transportpce.olm.service; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; public interface OlmPowerService { diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index 700409635..c76401a8e 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -37,6 +37,28 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.olm.power.PowerMgmt; import org.opendaylight.transportpce.olm.util.OlmUtils; import org.opendaylight.transportpce.olm.util.OtsPmHolder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.Spans; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.calculate.spanloss.base.output.SpansBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; @@ -61,28 +83,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.LinkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Network1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.network.Link; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.calculate.spanloss.base.output.Spans; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.calculate.spanloss.base.output.SpansBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; @@ -98,7 +98,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { private final PortMapping portMapping; public OlmPowerServiceImpl(DataBroker dataBroker, PowerMgmt powerMgmt, - DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { + DeviceTransactionManager deviceTransactionManager, PortMapping portMapping) { this.dataBroker = dataBroker; this.powerMgmt = powerMgmt; this.portMapping = portMapping; @@ -113,6 +113,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { LOG.info("close ..."); } + @Override public GetPmOutput getPm(GetPmInput pmInput) { GetPmOutputBuilder pmOutputBuilder = OlmUtils.pmFetch(pmInput, this.deviceTransactionManager); @@ -134,7 +135,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { @Override public ServicePowerTurndownOutput servicePowerTurndown( - ServicePowerTurndownInput powerTurndownInput) { + ServicePowerTurndownInput powerTurndownInput) { ServicePowerTurndownOutputBuilder powerTurnDownOutput = new ServicePowerTurndownOutputBuilder(); // TODO add flag or return failure instead of string @@ -150,17 +151,16 @@ public class OlmPowerServiceImpl implements OlmPowerService { public CalculateSpanlossBaseOutput calculateSpanlossBase(CalculateSpanlossBaseInput spanlossBaseInput) { LOG.info("CalculateSpanlossBase Request received for source type {}", spanlossBaseInput.getSrcType()); - List networkLinks = getNetworkLinks(); if (networkLinks.isEmpty()) { LOG.warn("Failed to get links form {} topology.", NetworkUtils.OVERLAY_NETWORK_ID); return new CalculateSpanlossBaseOutputBuilder().setResult(FAILED).build(); } - if (!CalculateSpanlossBaseInput.SrcType.All.equals(spanlossBaseInput.getSrcType())) { + if (! CalculateSpanlossBaseInput.SrcType.All.equals(spanlossBaseInput.getSrcType())) { networkLinks = networkLinks.stream() - .filter(link -> link.getLinkId().equals(spanlossBaseInput.getLinkId())) - .collect(Collectors.toList()); + .filter(link -> link.getLinkId().equals(spanlossBaseInput.getLinkId())) + .collect(Collectors.toList()); } List roadmLinks = new ArrayList<>(); @@ -168,10 +168,11 @@ public class OlmPowerServiceImpl implements OlmPowerService { Link1 roadmLinkAugmentation = link.augmentation(Link1.class); if (roadmLinkAugmentation == null) { LOG.debug("Missing OpenRoadm link augmentation in link {} from {} topology.", - link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); + link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); continue; } if (OpenroadmLinkType.ROADMTOROADM.equals(roadmLinkAugmentation.getLinkType())) { + // Only calculate spanloss for Roadm-to-Roadm links roadmLinks.add(link); } } @@ -216,7 +217,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { Link1 roadmLinkAugmentation = link.augmentation(Link1.class); if (roadmLinkAugmentation == null) { LOG.debug("Missing OpenRoadm link augmentation in link {} from {} topology.", - link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); + link.getLinkId().getValue(), NetworkUtils.OVERLAY_NETWORK_ID); continue; } if (OpenroadmLinkType.ROADMTOROADM.equals(roadmLinkAugmentation.getLinkType())) { @@ -252,22 +253,21 @@ public class OlmPowerServiceImpl implements OlmPowerService { NetworkKey overlayTopologyKey = new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)); InstanceIdentifier networkIID = InstanceIdentifier.builder(Network.class, overlayTopologyKey) - .augmentation(Network1.class) - .build(); + .augmentation(Network1.class) + .build(); Optional networkOptional; try (ReadOnlyTransaction rtx = this.dataBroker.newReadOnlyTransaction()) { - // TODO change to constant from Timeouts class when it will be - // merged. + //TODO change to constant from Timeouts class when it will be merged. networkOptional = rtx.read(LogicalDatastoreType.CONFIGURATION, networkIID).get(Timeouts.DATASTORE_READ, - TimeUnit.MILLISECONDS).toJavaUtil(); + TimeUnit.MILLISECONDS).toJavaUtil(); } catch (InterruptedException | ExecutionException | TimeoutException e) { LOG.warn("Read of {} topology failed", NetworkUtils.OVERLAY_NETWORK_ID); return Collections.emptyList(); } - if (!networkOptional.isPresent()) { + if (! networkOptional.isPresent()) { LOG.warn("Network augmentation with links data is not present in {} topology.", - NetworkUtils.OVERLAY_NETWORK_ID); + NetworkUtils.OVERLAY_NETWORK_ID); return Collections.emptyList(); } @@ -280,21 +280,16 @@ public class OlmPowerServiceImpl implements OlmPowerService { } /** - * This method retrieves OTS PM from current PM list by nodeId and TPId: - * Steps: + * This method retrieves OTS PM from current PM list by nodeId and TPId: Steps: * *

- * 1. Get OTS interface name from port mapping by TPId 2. Call getPm RPC to - * get OTS PM + * 1. Get OTS interface name from port mapping by TPId 2. Call getPm RPC to get OTS PM * *

* - * @param nodeId - * Node-id of the NE. - * @param tpID - * Termination point Name. - * @param pmName - * PM name which need to be retrieved + * @param nodeId Node-id of the NE. + * @param tpID Termination point Name. + * @param pmName PM name which need to be retrieved * @return reference to OtsPmHolder */ private OtsPmHolder getPmMeasurements(String nodeId, String tpID, String pmName) { @@ -304,10 +299,10 @@ public class OlmPowerServiceImpl implements OlmPowerService { return null; } GetPmInput getPmInput = new GetPmInputBuilder().setNodeId(realNodeId) - .setResourceType(ResourceTypeEnum.Interface).setGranularity(PmGranularity._15min) - .setResourceIdentifier( - new ResourceIdentifierBuilder().setResourceName(mapping.getSupportingOts()).build()) - .build(); + .setResourceType(ResourceTypeEnum.Interface).setGranularity(PmGranularity._15min) + .setResourceIdentifier( + new ResourceIdentifierBuilder().setResourceName(mapping.getSupportingOts()).build()) + .build(); GetPmOutput otsPmOutput = getPm(getPmInput); if (otsPmOutput == null) { @@ -318,7 +313,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { for (Measurements measurement : otsPmOutput.getMeasurements()) { if (pmName.equals(measurement.getPmparameterName())) { return new OtsPmHolder(pmName, Double.parseDouble(measurement.getPmparameterValue()), - mapping.getSupportingOts()); + mapping.getSupportingOts()); } } } catch (NumberFormatException e) { @@ -336,18 +331,15 @@ public class OlmPowerServiceImpl implements OlmPowerService { *

* 2. Set spanloss * - * @param nodeId - * nodeId of NE on which spanloss need to be updated - * @param interfaceName - * OTS interface for NE on which spanloss is cacluated - * @param spanLoss - * calculated spanloss value - * @param direction - * for which spanloss is calculated.It can be either Tx or Rx + * @param nodeId nodeId of NE on which spanloss need to be updated + * @param interfaceName OTS interface for NE on which spanloss is cacluated + * @param spanLoss calculated spanloss value + * @param direction for which spanloss is calculated.It can be either Tx or Rx * @return true/false */ private boolean setSpanLoss(String nodeId, String interfaceName, BigDecimal spanLoss, String direction) { String realNodeId = getRealNodeId(nodeId); + LOG.info("Setting Spanloss in device for {}, InterfaceName: {}", realNodeId, interfaceName); switch (direction) { case "TX": LOG.info("Setting 'span-loss-transmit' in device: {}, Interface: {}", realNodeId, interfaceName); @@ -360,11 +352,11 @@ public class OlmPowerServiceImpl implements OlmPowerService { break; } InstanceIdentifier interfacesIID = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey(interfaceName)); + .child(Interface.class, new InterfaceKey(interfaceName)); com.google.common.base.Optional interfaceObject; try { Future> deviceTxFuture = - this.deviceTransactionManager.getDeviceTransaction(realNodeId); + this.deviceTransactionManager.getDeviceTransaction(realNodeId); java.util.Optional deviceTxOpt = deviceTxFuture.get(); DeviceTransaction deviceTx; if (deviceTxOpt.isPresent()) { @@ -401,7 +393,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { interfaceBuilder.addAugmentation(Interface1.class, intf1Builder.setOts(otsBuilder.build()).build()); deviceTx.put(LogicalDatastoreType.CONFIGURATION, interfacesIID, interfaceBuilder.build()); ListenableFuture submit = - deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); + deviceTx.submit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT); submit.get(); LOG.info("Spanloss Value update completed successfully"); return true; @@ -457,7 +449,7 @@ public class OlmPowerServiceImpl implements OlmPowerService { private String getRealNodeId(String mappedNodeId) { KeyedInstanceIdentifier mappedNodeII = - InstanceIdentifiers.OVERLAY_NETWORK_II.child(Node.class, new NodeKey(new NodeId(mappedNodeId))); + InstanceIdentifiers.OVERLAY_NETWORK_II.child(Node.class, new NodeKey(new NodeId(mappedNodeId))); com.google.common.base.Optional realNode; try (ReadOnlyTransaction readOnlyTransaction = this.dataBroker.newReadOnlyTransaction()) { realNode = readOnlyTransaction.read(LogicalDatastoreType.CONFIGURATION, mappedNodeII).get(); @@ -467,16 +459,16 @@ public class OlmPowerServiceImpl implements OlmPowerService { } if (!realNode.isPresent() || (realNode.get().getSupportingNode() == null)) { throw new IllegalArgumentException( - String.format("Could not find node %s, or supporting node is not present", mappedNodeId)); + String.format("Could not find node %s, or supporting node is not present", mappedNodeId)); } List collect = realNode.get().getSupportingNode().stream() - .filter(node -> (node.getNetworkRef() != null) - && NetworkUtils.UNDERLAY_NETWORK_ID.equals(node.getNetworkRef().getValue()) - && (node.getNodeRef() != null) && !Strings.isNullOrEmpty(node.getNodeRef().getValue())) - .collect(Collectors.toList()); + .filter(node -> (node.getNetworkRef() != null) + && NetworkUtils.UNDERLAY_NETWORK_ID.equals(node.getNetworkRef().getValue()) + && (node.getNodeRef() != null) && !Strings.isNullOrEmpty(node.getNodeRef().getValue())) + .collect(Collectors.toList()); if (collect.isEmpty() || (collect.size() > 1)) { throw new IllegalArgumentException(String.format("Invalid support node count [%d] was found for node %s", - collect.size(), mappedNodeId)); + collect.size(), mappedNodeId)); } return collect.iterator().next().getNodeRef().getValue(); } diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java index 41caec5b6..ff1697554 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/util/OlmUtils.java @@ -8,19 +8,23 @@ package org.opendaylight.transportpce.olm.util; import com.google.common.base.Strings; - import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.MeasurementsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.CurrentPmlist; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.current.pm.Measurements; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.currentpmlist.CurrentPm; @@ -40,12 +44,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.rev161014.resour import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.get.pm.input.ResourceIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.MeasurementsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; @@ -112,8 +110,8 @@ public final class OlmUtils { .getDataFromDevice(input.getNodeId(), LogicalDatastoreType.OPERATIONAL, currentPmsIID, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT); if (currentPmList.isPresent()) { - List measurements = extractWantedMeasurements(currentPmList.get(), + List measurements = extractWantedMeasurements(currentPmList.get(), input.getResourceType(), input.getResourceIdentifier(), input.getGranularity()); if (measurements.isEmpty()) { LOG.error("No Matching PM data found for node: {}, " + "resource type: {}, resource name: {}", @@ -144,12 +142,12 @@ public final class OlmUtils { } } - private static List extractWantedMeasurements(CurrentPmlist currentPmList, + private static List extractWantedMeasurements(CurrentPmlist currentPmList, ResourceTypeEnum wantedResourceType, ResourceIdentifier wantedResourceIdentifier, PmGranularity wantedGranularity) { - List measurements = new ArrayList<>(); + List measurements = new ArrayList<>(); for (CurrentPm pm : currentPmList.getCurrentPm()) { ResourceTypeEnum currentResourceType = pm.getResource().getResourceType().getType(); if (currentResourceType.equals(wantedResourceType)) { @@ -165,10 +163,10 @@ public final class OlmUtils { return measurements; } - private static List extractMeasurements(List measurementsFromDevice) { - List - extractedMeasurements = new ArrayList<>(); + private static List extractMeasurements(List measurementsFromDevice) { + List extractedMeasurements = new ArrayList<>(); for (Measurements measure : measurementsFromDevice) { MeasurementsBuilder measurement = new MeasurementsBuilder(); if (!measure.getMeasurement().getPmParameterName().getType().equals(PmNamesEnum.VendorExtension)) { @@ -193,7 +191,7 @@ public final class OlmUtils { PmGranularity wantedGranularity) { boolean identifiersAreEqual = compareResourceIdentifiers(resource, wantedResourceType, wantedResourceIdentifier); - return identifiersAreEqual && granularity != null && granularity.equals(wantedGranularity); + return identifiersAreEqual && (granularity != null) && granularity.equals(wantedGranularity); } private static boolean compareResourceIdentifiers(Resource resource, ResourceTypeEnum wantedResourceType, @@ -263,8 +261,8 @@ public final class OlmUtils { .map(port -> { String portName = port.getPortName(); String circuitPackName = port.getCircuitPackName(); - return portName != null - && circuitPackName != null + return (portName != null) + && (circuitPackName != null) && portName.equals(wantedResourceIdentifier.getResourceName()) && circuitPackName.equals(wantedResourceIdentifier.getCircuitPackName()); }) diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/util/RoadmLinks.java b/olm/src/main/java/org/opendaylight/transportpce/olm/util/RoadmLinks.java deleted file mode 100644 index 6c9de8b2e..000000000 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/util/RoadmLinks.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright © 2017 AT&T and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.transportpce.olm.util; -/** - * The Class RoadmLinks. - */ -public class RoadmLinks { - - /** The src node id. */ - private String srcNodeId; - - /** The src tp id. */ - private String srcTpId; - - /** The dest node id. */ - private String destNodeId; - - /** The dest tpid. */ - private String destTpid; - - /** - * Gets the src node id. - * - * @return the src node id - */ - public String getSrcNodeId() { - return srcNodeId; - } - - /** - * Sets the src node id. - * - * @param srcNodeId the new src node id - */ - public void setSrcNodeId(String srcNodeId) { - this.srcNodeId = srcNodeId; - } - - /** - * Gets the src tp id. - * - * @return the src tp id - */ - public String getSrcTpId() { - return srcTpId; - } - - /** - * Sets the src tp id. - * - * @param srcTpId the new src tp id - */ - public void setSrcTpId(String srcTpId) { - this.srcTpId = srcTpId; - } - - /** - * Gets the dest node id. - * - * @return the dest node id - */ - public String getDestNodeId() { - return destNodeId; - } - - /** - * Sets the dest node id. - * - * @param destNodeId the new dest node id - */ - public void setDestNodeId(String destNodeId) { - this.destNodeId = destNodeId; - } - - /** - * Gets the dest tpid. - * - * @return the dest tpid - */ - public String getDestTpid() { - return destTpid; - } - - /** - * Sets the dest tpid. - * - * @param destTpid the new dest tpid - */ - public void setDestTpid(String destTpid) { - this.destTpid = destTpid; - } - -} diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceProvider.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceProvider.java index e24e09c4b..043d647f3 100755 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceProvider.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceProvider.java @@ -10,7 +10,7 @@ package org.opendaylight.transportpce.pce.impl; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.transportpce.pce.service.PathComputationService; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PceService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.TransportpcePceService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,7 +24,7 @@ public class PceProvider { private final RpcProviderRegistry rpcRegistry; private final PathComputationService pathComputationService; - private BindingAwareBroker.RpcRegistration rpcRegistration; + private BindingAwareBroker.RpcRegistration rpcRegistration; public PceProvider(RpcProviderRegistry rpcProviderRegistry, PathComputationService pathComputationService) { this.rpcRegistry = rpcProviderRegistry; @@ -37,7 +37,7 @@ public class PceProvider { public void init() { LOG.info("PceProvider Session Initiated"); final PceServiceRPCImpl consumer = new PceServiceRPCImpl(pathComputationService); - rpcRegistration = rpcRegistry.addRpcImplementation(PceService.class, consumer); + rpcRegistration = rpcRegistry.addRpcImplementation(TransportpcePceService.class, consumer); } /* diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java index 27b91ce39..f078bdc4b 100755 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java @@ -13,7 +13,7 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev17 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.CancelResourceReserveOutput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PathComputationRequestInput; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PceService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.TransportpcePceService; /* import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.service.path.rpc.result.PathDescriptionBuilder; ///// check well PathDescriptionBuilder import @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; /** * PceService implementation. */ -public class PceServiceRPCImpl implements PceService { +public class PceServiceRPCImpl implements TransportpcePceService { private static final Logger LOG = LoggerFactory.getLogger(PceServiceRPCImpl.class); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java index 4b5a7b03f..a080619c6 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ModelMappingUtils.java @@ -14,6 +14,10 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommon; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.configuration.response.common.ConfigurationResponseCommonBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceDeleteInput; @@ -29,10 +33,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java index 69dad3864..80c13e44c 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/RendererProvider.java @@ -12,8 +12,8 @@ import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.renderer.rpcs.DeviceRendererRPCImpl; import org.opendaylight.transportpce.renderer.rpcs.TransportPCEServicePathRPCImpl; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.TransportpceDeviceRendererService; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.TransportpceServicepathService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,13 +21,13 @@ public class RendererProvider { private static final Logger LOG = LoggerFactory.getLogger(RendererProvider.class); private final RpcProviderRegistry rpcProviderRegistry; - private RpcRegistration deviceRendererRegistration; private DeviceRendererRPCImpl deviceRendererRPCImpl; + private RpcRegistration deviceRendererRegistration; private RpcRegistration tpceServiceRegistry; private RendererServiceOperations rendererServiceOperations; public RendererProvider(RpcProviderRegistry rpcProviderRegistry, DeviceRendererRPCImpl deviceRendererRPCImpl, - RendererServiceOperations rendererServiceOperations) { + RendererServiceOperations rendererServiceOperations) { this.rpcProviderRegistry = rpcProviderRegistry; this.deviceRendererRPCImpl = deviceRendererRPCImpl; this.rendererServiceOperations = rendererServiceOperations; @@ -41,7 +41,7 @@ public class RendererProvider { TransportPCEServicePathRPCImpl transportPCEServicePathRPCImpl = new TransportPCEServicePathRPCImpl(this.rendererServiceOperations); this.deviceRendererRegistration = this.rpcProviderRegistry - .addRpcImplementation(RendererService.class, this.deviceRendererRPCImpl); + .addRpcImplementation(TransportpceDeviceRendererService.class, deviceRendererRPCImpl); this.tpceServiceRegistry = this.rpcProviderRegistry .addRpcImplementation(TransportpceServicepathService.class, transportPCEServicePathRPCImpl); } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ServicePathInputData.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ServicePathInputData.java index 7869a9b7b..155a60ebb 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/ServicePathInputData.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/ServicePathInputData.java @@ -7,7 +7,7 @@ */ package org.opendaylight.transportpce.renderer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; public class ServicePathInputData { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java index 75b43fa27..70abad7dc 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterfaceFactory.java @@ -13,6 +13,7 @@ import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceKey; @@ -40,7 +41,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.odu.interfaces.rev161 import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OTU4; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.OtuAttributes; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.otu.interfaces.rev161014.otu.container.OtuBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +54,7 @@ public class OpenRoadmInterfaceFactory { this.openRoadmInterfaces = openRoadmInterfaces; } - public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint,String serviceName) + public String createOpenRoadmEthInterface(String nodeId, String logicalConnPoint) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -71,7 +71,7 @@ public class OpenRoadmInterfaceFactory { ethIfBuilder.setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, - logicalConnPoint + "-ETHERNET",serviceName); + logicalConnPoint + "-ETHERNET"); // Create Interface1 type object required for adding as augmentation Interface1Builder ethIf1Builder = new Interface1Builder(); @@ -90,14 +90,15 @@ public class OpenRoadmInterfaceFactory { * This methods creates an OCH interface on the given termination point on * Roadm. * - * @param waveNumber - * wavelength number of the OCH interface. + * @param nodeId node ID + * @param logicalConnPoint logical Connection Point + * @param waveNumber wavelength number of the OCH interface * * @return Name of the interface if successful, otherwise return null. + * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, - String serviceName) + public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -106,7 +107,7 @@ public class OpenRoadmInterfaceFactory { } // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber),serviceName); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); // OCH interface specific data OchBuilder ocIfBuilder = new OchBuilder(); @@ -136,8 +137,7 @@ public class OpenRoadmInterfaceFactory { } public String createOpenRoadmOchInterface(String nodeId, String logicalConnPoint, Long waveNumber, Class< - ? extends RateIdentity> rate, OchAttributes.ModulationFormat format,String serviceName) - throws OpenRoadmInterfaceException { + ? extends RateIdentity> rate, OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node %s and" @@ -158,7 +158,7 @@ public class OpenRoadmInterfaceFactory { .interfaces.rev161014.Interface1Builder(); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, - createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber),serviceName); + createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); ochInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.Interface1.class, ochIf1Builder.setOch(ocIfBuilder.build()).build()); @@ -180,12 +180,15 @@ public class OpenRoadmInterfaceFactory { /** * This methods creates an ODU interface on the given termination point. * + * @param nodeId node ID + * @param logicalConnPoint logical Connection Point + * @param supportingOtuInterface supporting OTU Interface * * @return Name of the interface if successful, otherwise return null. + * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface, - String serviceName) + public String createOpenRoadmOdu4Interface(String nodeId, String logicalConnPoint, String supportingOtuInterface) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -193,7 +196,7 @@ public class OpenRoadmInterfaceFactory { + " logical connection port %s", nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint - + "-ODU",serviceName); + + "-ODU"); oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data @@ -223,13 +226,15 @@ public class OpenRoadmInterfaceFactory { /** * This methods creates an OTU interface on the given termination point. * + * @param nodeId node ID + * @param logicalConnPoint logical Connection Point + * @param supportOchInterface support OCH Interface * * @return Name of the interface if successful, otherwise return null. * @throws OpenRoadmInterfaceException OpenRoadmInterfaceException */ - public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface, - String serviceName) + public String createOpenRoadmOtu4Interface(String nodeId, String logicalConnPoint, String supportOchInterface) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { @@ -238,7 +243,7 @@ public class OpenRoadmInterfaceFactory { } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint - + "-OTU",serviceName); + + "-OTU"); otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data @@ -263,7 +268,7 @@ public class OpenRoadmInterfaceFactory { if (mapping.getSupportingOts() == null) { // Create generic interface InterfaceBuilder otsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpticalTransport.class, "OTS-" - + mapping.getLogicalConnectionPoint(),""); + + mapping.getLogicalConnectionPoint()); // OTS interface augmentation specific data OtsBuilder otsIfBuilder = new OtsBuilder(); otsIfBuilder.setFiberType(FiberType.Smf); @@ -288,7 +293,7 @@ public class OpenRoadmInterfaceFactory { if (mapping.getSupportingOms() == null) { // Create generic interface InterfaceBuilder omsInterfaceBldr = createGenericInterfaceBuilder(mapping, OpenROADMOpticalMultiplex.class, - "OMS-" + mapping.getLogicalConnectionPoint(),""); + "OMS-" + mapping.getLogicalConnectionPoint()); if (mapping.getSupportingOts() != null) { omsInterfaceBldr.setSupportingInterface(mapping.getSupportingOts()); } else { @@ -305,10 +310,10 @@ public class OpenRoadmInterfaceFactory { } private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, - String key,String serviceName) { + String key) { InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); interfaceBuilder.setDescription(" TBD "); - interfaceBuilder.setCircuitId(serviceName); + interfaceBuilder.setCircuitId(" TBD "); interfaceBuilder.setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()); interfaceBuilder.setSupportingPort(portMap.getSupportingPort()); interfaceBuilder.setAdministrativeState(AdminStates.InService); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererService.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererService.java index 5dc595d6b..6fb01df07 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererService.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererService.java @@ -10,12 +10,13 @@ package org.opendaylight.transportpce.renderer.provisiondevice; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; + public interface DeviceRendererService { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index f5a57fc0a..ef2cf9a59 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -37,6 +37,22 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServiceListTopology; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollback; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.Topology; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.get.connection.port.trail.output.Ports; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; @@ -52,22 +68,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907 import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.ServiceNodelist; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service.nodelist.NodelistBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service.nodelist.NodelistKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.renderer.rollback.output.FailedToRollback; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.renderer.rollback.output.FailedToRollbackBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.renderer.rollback.output.FailedToRollbackKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,7 +80,6 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { private final OpenRoadmInterfaces openRoadmInterfaces; private final CrossConnect crossConnect; private final PortMapping portMapping; - private String serviceName; public DeviceRendererServiceImpl(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager, OpenRoadmInterfaceFactory openRoadmInterfaceFactory, OpenRoadmInterfaces openRoadmInterfaces, @@ -91,12 +90,10 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { this.openRoadmInterfaces = openRoadmInterfaces; this.crossConnect = crossConnect; this.portMapping = portMapping; - serviceName = "Undefined"; } @Override public ServicePathOutput setupServicePath(ServicePathInput input, ServicePathDirection direction) { - this.serviceName = input.getServiceName(); List nodes = input.getNodes(); // Register node for suppressing alarms if (!alarmSuppressionNodeRegistration(input)) { @@ -127,49 +124,49 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { crossConnectFlag++; // create OpenRoadm Xponder Line Interfaces String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, destTp, waveNumber, R100G.class, ModulationFormat.DpQpsk, serviceName); + nodeId, destTp, waveNumber, R100G.class, ModulationFormat.DpQpsk); createdOchInterfaces.add(supportingOchInterface); String supportingOtuInterface = this.openRoadmInterfaceFactory - .createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface, serviceName); + .createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface); createdOtuInterfaces.add(supportingOtuInterface); createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, - destTp, supportingOtuInterface, serviceName)); + destTp, supportingOtuInterface)); } if ((srcTp != null) && srcTp.contains(OpenRoadmInterfacesImpl.CLIENT_TOKEN)) { crossConnectFlag++; // create OpenRoadm Xponder Client Interfaces createdEthInterfaces.add( - this.openRoadmInterfaceFactory.createOpenRoadmEthInterface(nodeId, srcTp, serviceName)); + this.openRoadmInterfaceFactory.createOpenRoadmEthInterface(nodeId, srcTp)); } if ((srcTp != null) && srcTp.contains(OpenRoadmInterfacesImpl.NETWORK_TOKEN)) { crossConnectFlag++; // create OpenRoadm Xponder Line Interfaces String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( - nodeId, srcTp, waveNumber, R100G.class, ModulationFormat.DpQpsk, serviceName); + nodeId, srcTp, waveNumber, R100G.class, ModulationFormat.DpQpsk); createdOchInterfaces.add(supportingOchInterface); String supportingOtuInterface = this.openRoadmInterfaceFactory - .createOpenRoadmOtu4Interface(nodeId, srcTp, supportingOchInterface, serviceName); + .createOpenRoadmOtu4Interface(nodeId, srcTp, supportingOchInterface); createdOtuInterfaces.add(supportingOtuInterface); createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, - srcTp, supportingOtuInterface, serviceName)); + srcTp, supportingOtuInterface)); } if ((destTp != null) && destTp.contains(OpenRoadmInterfacesImpl.CLIENT_TOKEN)) { crossConnectFlag++; // create OpenRoadm Xponder Client Interfaces createdEthInterfaces.add( - this.openRoadmInterfaceFactory.createOpenRoadmEthInterface(nodeId, destTp, serviceName)); + this.openRoadmInterfaceFactory.createOpenRoadmEthInterface(nodeId, destTp)); } if ((srcTp != null) && (srcTp.contains(OpenRoadmInterfacesImpl.TTP_TOKEN) || srcTp.contains(OpenRoadmInterfacesImpl.PP_TOKEN))) { createdOchInterfaces.add( this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber, serviceName)); + .createOpenRoadmOchInterface(nodeId, srcTp, waveNumber)); } if ((destTp != null) && (destTp.contains(OpenRoadmInterfacesImpl.TTP_TOKEN) || destTp.contains(OpenRoadmInterfacesImpl.PP_TOKEN))) { createdOchInterfaces.add( this.openRoadmInterfaceFactory - .createOpenRoadmOchInterface(nodeId, destTp, waveNumber, serviceName)); + .createOpenRoadmOchInterface(nodeId, destTp, waveNumber)); } if (crossConnectFlag < 1) { LOG.info("Creating cross connect between source {} and destination {} for node {}", srcTp, @@ -398,21 +395,20 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { NodelistBuilder nodeListBuilder = new NodelistBuilder(); nodeListBuilder.withKey(new NodelistKey(input.getServiceName())); nodeListBuilder.setServiceName(input.getServiceName()); - List nodeList = new ArrayList<>(); for (Nodes node : input.getNodes()) { nodeList.add( - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102 + new org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102 .service.nodelist.nodelist.NodesBuilder() .setNodeId(node.getNodeId()).build()); } nodeListBuilder.setNodes(nodeList); - InstanceIdentifier< - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service - .nodelist.Nodelist> nodeListIID = + InstanceIdentifier nodeListIID = InstanceIdentifier.create(ServiceNodelist.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression .rev171102.service.nodelist.Nodelist.class, new NodelistKey(input.getServiceName())); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); @@ -428,23 +424,22 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } } - private boolean alarmSuppressionNodeRemoval(String name) { - InstanceIdentifier< - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression.rev171102.service - .nodelist.Nodelist> nodeListIID = + private boolean alarmSuppressionNodeRemoval(String serviceName) { + InstanceIdentifier nodeListIID = InstanceIdentifier.create(ServiceNodelist.class).child( - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.alarmsuppression + org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression .rev171102.service.nodelist.Nodelist.class, - new NodelistKey(name)); + new NodelistKey(serviceName)); final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction(); writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, nodeListIID); Future submit = writeTransaction.submit(); try { submit.get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS); - LOG.info("Nodes are unregister for alarm suppression for service: {}", name); + LOG.info("Nodes are unregister for alarm suppression for service: {}", serviceName); return true; } catch (InterruptedException | TimeoutException | ExecutionException e) { - LOG.warn("Failed to alarm suppresslist for service: {}", name, e); + LOG.warn("Failed to alarm suppresslist for service: {}", serviceName, e); return false; } } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index 7c3f101dc..d116f6941 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -12,7 +12,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -20,7 +19,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -36,6 +34,13 @@ import org.opendaylight.transportpce.renderer.provisiondevice.tasks.DeviceRender import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OlmPowerSetupRollbackTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.OlmPowerSetupTask; import org.opendaylight.transportpce.renderer.provisiondevice.tasks.RollbackProcessor; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.path.PathDescription; @@ -48,13 +53,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.path.list.ServicePathsKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.get.pm.input.ResourceIdentifierBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.Measurements; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; @@ -70,12 +68,12 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations private static final int NUMBER_OF_THREADS = 4; private final DeviceRendererService deviceRenderer; - private final OlmService olmService; + private final TransportpceOlmService olmService; private final DataBroker dataBroker; private ListeningExecutorService executor; private NetworkModelWavelengthService networkModelWavelengthService; - public RendererServiceOperationsImpl(DeviceRendererService deviceRenderer, OlmService olmService, + public RendererServiceOperationsImpl(DeviceRendererService deviceRenderer, TransportpceOlmService olmService, DataBroker dataBroker, NetworkModelWavelengthService networkModelWavelengthService) { this.deviceRenderer = deviceRenderer; this.olmService = olmService; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java index 01bf58cb3..93d6c5184 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingRollbackTask.java @@ -10,11 +10,11 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.ArrayList; import java.util.List; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollback; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.renderer.rollback.output.FailedToRollback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java index abe78185e..975b04359 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java @@ -9,13 +9,12 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.List; import java.util.concurrent.Callable; - import org.opendaylight.transportpce.renderer.ServicePathInputData; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRenderingResult; import org.opendaylight.transportpce.renderer.provisiondevice.servicepath.ServicePathDirection; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java index 8b1027ccf..7ce0a7a3d 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupRollbackTask.java @@ -8,11 +8,11 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.concurrent.Future; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,10 +22,10 @@ public class OlmPowerSetupRollbackTask extends RollbackTask { private static final Logger LOG = LoggerFactory.getLogger(OlmPowerSetupRollbackTask.class); private static final String FAILED = "Failed"; private final boolean isRollbackNecessary; - private final OlmService olmService; + private final TransportpceOlmService olmService; private final ServicePowerSetupInput powerSetupInput; - public OlmPowerSetupRollbackTask(String id, boolean isRollbackNecessary, OlmService olmService, + public OlmPowerSetupRollbackTask(String id, boolean isRollbackNecessary, TransportpceOlmService olmService, ServicePowerSetupInput powerSetupInput) { super(id); this.isRollbackNecessary = isRollbackNecessary; diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java index aaf54a9a7..5d4f3f720 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OlmPowerSetupTask.java @@ -9,11 +9,10 @@ package org.opendaylight.transportpce.renderer.provisiondevice.tasks; import java.util.concurrent.Callable; import java.util.concurrent.Future; - import org.opendaylight.transportpce.renderer.provisiondevice.OLMRenderingResult; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,10 +21,10 @@ public class OlmPowerSetupTask implements Callable { private static final Logger LOG = LoggerFactory.getLogger(OlmPowerSetupTask.class); - private final OlmService olmService; + private final TransportpceOlmService olmService; private final ServicePowerSetupInput input; - public OlmPowerSetupTask(OlmService olmService, ServicePowerSetupInput input) { + public OlmPowerSetupTask(TransportpceOlmService olmService, ServicePowerSetupInput input) { this.olmService = olmService; this.input = input; } diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java index a5060820a..b850f2a74 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/DeviceRendererRPCImpl.java @@ -11,20 +11,20 @@ package org.opendaylight.transportpce.renderer.rpcs; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; import org.opendaylight.transportpce.renderer.provisiondevice.DeviceRendererService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.TransportpceDeviceRendererService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DeviceRendererRPCImpl implements RendererService { +public class DeviceRendererRPCImpl implements TransportpceDeviceRendererService { private static final Logger LOG = LoggerFactory.getLogger(DeviceRendererRPCImpl.class); private DeviceRendererService deviceRenderer; diff --git a/renderer/src/main/resources/org/opendaylight/blueprint/renderer-blueprint.xml b/renderer/src/main/resources/org/opendaylight/blueprint/renderer-blueprint.xml index 9af746256..467e35266 100644 --- a/renderer/src/main/resources/org/opendaylight/blueprint/renderer-blueprint.xml +++ b/renderer/src/main/resources/org/opendaylight/blueprint/renderer-blueprint.xml @@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + interface="org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService"/> diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java index 6440bfcb9..bfe5aa4d1 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplCreateOtsOmsTest.java @@ -28,8 +28,8 @@ import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub; import org.opendaylight.transportpce.renderer.utils.CreateOtsOmsDataUtils; import org.opendaylight.transportpce.renderer.utils.MountPointUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput; public class DeviceRendererServiceImplCreateOtsOmsTest extends AbstractTest { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplDeleteTest.java index 46365bd48..65fe3fa7a 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplDeleteTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplDeleteTest.java @@ -32,6 +32,8 @@ import org.opendaylight.transportpce.renderer.utils.MountPointUtils; import org.opendaylight.transportpce.renderer.utils.ServiceImplementationDataUtils; import org.opendaylight.transportpce.renderer.utils.TransactionUtils; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.connection.DestinationBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.connection.SourceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; @@ -39,8 +41,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.open import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class DeviceRendererServiceImplDeleteTest extends AbstractTest { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplRollbackTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplRollbackTest.java index d1a2db3a1..3cf081ede 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplRollbackTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplRollbackTest.java @@ -29,12 +29,12 @@ import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub; import org.opendaylight.transportpce.renderer.stub.MountPointStub; import org.opendaylight.transportpce.renderer.utils.ServiceImplementationDataUtils; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterface; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackOutput; public class DeviceRendererServiceImplRollbackTest extends AbstractTest { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplSetupTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplSetupTest.java index bc69d17a0..dfb78bf2a 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplSetupTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImplSetupTest.java @@ -30,9 +30,9 @@ import org.opendaylight.transportpce.renderer.stub.MountPointServiceStub; import org.opendaylight.transportpce.renderer.utils.MountPointUtils; import org.opendaylight.transportpce.renderer.utils.ServiceImplementationDataUtils; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutput; public class DeviceRendererServiceImplSetupTest extends AbstractTest { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java index 62a96093b..50563d20d 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java @@ -37,6 +37,8 @@ import org.opendaylight.transportpce.renderer.stub.OlmServiceStub; import org.opendaylight.transportpce.renderer.utils.ServiceDeleteDataUtils; import org.opendaylight.transportpce.renderer.utils.TransactionUtils; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.handler.header.ServiceHandlerHeaderBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteInputBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceDeleteOutput; @@ -44,8 +46,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.path.list.ServicePaths; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.path.list.ServicePathsBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.path.list.ServicePathsKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutputBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; @@ -59,7 +59,7 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest { private PortMapping portMapping; private CrossConnect crossConnect; private NetworkModelWavelengthService networkModelWavelengthService; - private OlmService olmService; + private TransportpceOlmService olmService; private void setMountPoint(MountPoint mountPoint) { MountPointService mountPointService = new MountPointServiceStub(mountPoint); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java index 563fde1eb..5a23ff510 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplTest.java @@ -34,19 +34,19 @@ import org.opendaylight.transportpce.renderer.stub.OlmServiceStub; import org.opendaylight.transportpce.renderer.utils.MountPointUtils; import org.opendaylight.transportpce.renderer.utils.ServiceDataUtils; import org.opendaylight.transportpce.test.AbstractTest; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.MeasurementsBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.PmGranularity; import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev161014.ResourceTypeEnum; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceImplementationRequestInput; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.ServiceImplementationRequestOutput; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.get.pm.input.ResourceIdentifierBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.Measurements; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.get.pm.output.MeasurementsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathOutputBuilder; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; public class RendererServiceOperationsImplTest extends AbstractTest { @@ -59,7 +59,7 @@ public class RendererServiceOperationsImplTest extends AbstractTest { private PortMapping portMapping; private OpenRoadmInterfaceFactory openRoadmInterfaceFactory; private CrossConnect crossConnect; - private OlmService olmService; + private TransportpceOlmService olmService; private NetworkModelWavelengthService networkModelWavelengthService; private void setMountPoint(MountPoint mountPoint) { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java index 91a3ca0e8..519f7f58d 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/stub/OlmServiceStub.java @@ -9,26 +9,26 @@ package org.opendaylight.transportpce.renderer.stub; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossBaseOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.CalculateSpanlossCurrentOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.GetPmOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.OlmService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerResetOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerSetupOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.olm.rev170418.ServicePowerTurndownOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossCurrentOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.GetPmOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerResetOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerTurndownOutputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.TransportpceOlmService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -public class OlmServiceStub implements OlmService { +public class OlmServiceStub implements TransportpceOlmService { @Override public ListenableFuture> calculateSpanlossCurrent( CalculateSpanlossCurrentInput input) { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/CreateOtsOmsDataUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/CreateOtsOmsDataUtils.java index 588f5f205..533f02ad1 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/CreateOtsOmsDataUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/CreateOtsOmsDataUtils.java @@ -8,8 +8,8 @@ package org.opendaylight.transportpce.renderer.utils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.CreateOtsOmsInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInputBuilder; public final class CreateOtsOmsDataUtils { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java index 0c9525474..3431e94d7 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/MountPointUtils.java @@ -17,16 +17,16 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.renderer.stub.MountPointStub; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.Network; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.Nodes; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.NodesKey; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.GetConnectionPortTrailOutputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.OrgOpenroadmDeviceService; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.get.connection.port.trail.output.Ports; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.Network; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.Mapping; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.portmapping.rev170228.network.nodes.MappingKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java index e646ed94b..55611bf64 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceDataUtils.java @@ -11,6 +11,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ServiceFormat; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.port.PortBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirection; @@ -44,10 +48,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInputBuilder; public final class ServiceDataUtils { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceImplementationDataUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceImplementationDataUtils.java index 8995a6335..cd52ccac1 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceImplementationDataUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/ServiceImplementationDataUtils.java @@ -9,6 +9,10 @@ package org.opendaylight.transportpce.renderer.utils; import java.util.ArrayList; import java.util.List; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInputBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInputBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ServiceFormat; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.port.PortBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirection; @@ -42,10 +46,6 @@ import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.NodesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.RendererRollbackInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.renderer.rev170228.ServicePathInputBuilder; public final class ServiceImplementationDataUtils { diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java index 250c5ee83..e2ba6b0c7 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerProvider.java @@ -15,7 +15,7 @@ import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.transportpce.pce.service.PathComputationService; import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PceListener; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.TransportpcePceListener; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.OrgOpenroadmServiceService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.slf4j.Logger; @@ -34,7 +34,7 @@ public class ServicehandlerProvider { private final DataBroker dataBroker; private final RpcProviderRegistry rpcRegistry; private final NotificationService notificationService; - private ListenerRegistration pcelistenerRegistration; + private ListenerRegistration pcelistenerRegistration; private RpcRegistration rpcRegistration; private PathComputationService pathComputationService; private RendererServiceOperations rendererServiceOperations; diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java index 30a72e12d..d5a831f4d 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java @@ -7,15 +7,15 @@ */ package org.opendaylight.transportpce.servicehandler.listeners; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.PceListener; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.ServicePathRpcResult; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev170426.TransportpcePceListener; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.RpcStatusEx; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.ServicePathNotificationTypes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Deprecated -public class PceListenerImpl implements PceListener { +public class PceListenerImpl implements TransportpcePceListener { private static final Logger LOG = LoggerFactory.getLogger(PceListenerImpl.class); @@ -30,8 +30,8 @@ public class PceListenerImpl implements PceListener { "Received '" + notification.getNotificationType() + "' StubPce notification " + "from service '" + notification.getServiceName() + "' " + "with status '" + notification.getStatus() + "'"); build.append(" with StatusMessage '" + notification.getStatusMessage() + "'"); - if (notification.getStatus() == RpcStatusEx.Successful && notification.getNotificationType() - .getIntValue() == ServicePathNotificationTypes.PathComputationRequest.getIntValue()) { + if ((notification.getStatus() == RpcStatusEx.Successful) && (notification.getNotificationType() + .getIntValue() == ServicePathNotificationTypes.PathComputationRequest.getIntValue())) { build.append(" PathDescription : " + notification.getPathDescription().toString()); /* * switch (action.getIntValue()) { case 1: //service-create case diff --git a/tests/transportpce_tests/test_renderer_service_path_nominal.py b/tests/transportpce_tests/test_renderer_service_path_nominal.py index d0d1cfd4a..5eb53bd39 100644 --- a/tests/transportpce_tests/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/test_renderer_service_path_nominal.py @@ -163,7 +163,7 @@ class TransportPCERendererTesting(unittest.TestCase): res['nodes'][0]['mapping']) def test_05_service_path_create(self): - url = "{}/operations/renderer:service-path".format(self.restconf_baseurl) + url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", @@ -350,7 +350,7 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertIn('not-reserved-inuse', res['circuit-packs'][0]["equipment-state"]) def test_14_service_path_delete(self): - url = "{}/operations/renderer:service-path".format(self.restconf_baseurl) + url = "{}/operations/transportpce-device-renderer:service-path".format(self.restconf_baseurl) data = {"renderer:input": { "renderer:service-name": "service_test", "renderer:wave-number": "7", -- 2.36.6