From 7474055983b078ca899ccd3f1c56e5627bf77e52 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Wed, 29 May 2019 15:17:46 +0200 Subject: [PATCH] clean test environment - remove testtool traces - remove servicehandler functional tests and associated stubs - rationalize honeynode multiple openroadm versions support: move code for 2.1 and 2.2.1 versions in the same folder only one script to build (version passed as argument - def is 2.1) - clean repo from tabs and dos formatted files JIRA: TRNSPRTPCE-112 Change-Id: Id893085733cdc21bbec27062afee4df6f9763c75 Signed-off-by: guillaume.lambert --- .gitmodules | 8 - docs/developer-guide.rst | 224 +- .../OSGI-INF/blueprint/pce-blueprint.xml | 88 +- .../blueprint/servicehandler-blueprint.xml | 104 +- tests/SH_func_tests.sh | 6 - tests/SH_stubs.diff | 22 - tests/Xtesting/DockerSims/Dockerfile.orig | 9 +- .../DockerSims/Dockerfile.orig.testtool | 19 - tests/Xtesting/DockerSims/generate_sims.sh | 8 - tests/buildHoneynode.sh | 13 +- tests/buildHoneynode221.sh | 12 - tests/buildTesttool.sh | 23 - tests/honeynode/{ => 2.1}/README | 0 .../honeynode-common/asciidoc/Readme.adoc | 0 .../{ => 2.1}/honeynode-common/pom.xml | 0 .../AbstractDataObjectConverter.java | 0 .../converter/JSONDataObjectConverter.java | 0 .../converter/XMLDataObjectConverter.java | 0 .../converter/api/DataObjectConverter.java | 0 .../test/common/DataStoreContext.java | 0 .../test/common/DataStoreContextImpl.java | 0 .../asciidoc/Readme.adoc | 0 .../{ => 2.1}/honeynode-distribution/pom.xml | 0 .../honeynode-plugin-api/asciidoc/Readme.adoc | 0 .../{ => 2.1}/honeynode-plugin-api/pom.xml | 0 .../pm/types/rev161014/PmDataTypeBuilder.java | 0 .../main/yang/iana-afn-safi@2013-07-04.yang | 0 .../main/yang/ietf-inet-types@2013-07-15.yang | 0 ...tconf-monitoring-extension@2013-12-10.yang | 0 .../ietf-netconf-monitoring@2010-10-04.yang | 0 .../main/yang/ietf-netconf@2011-06-01.yang | 0 .../main/yang/ietf-yang-types@2013-07-15.yang | 0 ...org-openroadm-common-types@2016-10-14.yang | 0 ...org-openroadm-common-types@2017-09-29.yang | 0 .../yang/org-openroadm-device@2017-02-06.yang | 0 ...adm-equipment-states-types@2016-10-14.yang | 0 ...nroadm-ethernet-interfaces@2016-10-14.yang | 0 .../org-openroadm-interfaces@2016-10-14.yang | 0 .../org-openroadm-layerRate@2016-10-14.yang | 0 .../yang/org-openroadm-lldp@2016-10-14.yang | 0 ...roadm-maintenance-loopback@2016-10-14.yang | 0 ...adm-maintenance-testsignal@2016-10-14.yang | 0 .../org-openroadm-maintenance@2016-10-14.yang | 0 ...optical-channel-interfaces@2016-10-14.yang | 0 ...tical-multiplex-interfaces@2016-10-14.yang | 0 ...tical-transport-interfaces@2016-10-14.yang | 0 ...enroadm-otn-odu-interfaces@2016-10-14.yang | 0 ...enroadm-otn-otu-interfaces@2016-10-14.yang | 0 ...g-openroadm-physical-types@2016-10-14.yang | 0 .../org-openroadm-pm-types@2016-10-14.yang | 0 .../yang/org-openroadm-pm@2016-10-14.yang | 0 .../org-openroadm-port-types@2017-09-29.yang | 0 ...g-openroadm-resource-types@2016-10-14.yang | 0 .../org-openroadm-resource@2016-10-14.yang | 0 .../yang/org-openroadm-swdl@2016-10-14.yang | 0 .../org-openroadm-user-mgmt@2016-10-14.yang | 0 ...g-openroadm-wavelength-map@2016-10-14.yang | 0 .../asciidoc/Readme.adoc | 0 .../{ => 2.1}/honeynode-plugin-impl/pom.xml | 0 .../DeviceBindingDataBrokerProvider.java | 0 .../transportpce/device/DeviceModule.java | 0 .../device/DeviceReaderModule.java | 0 .../transportpce/device/DeviceRpcModule.java | 0 .../device/DeviceWriterModule.java | 0 .../configuration/DeviceConfiguration.java | 0 .../DeviceConfigurationModule.java | 0 .../configuration/NetconfConfiguration.java | 0 .../NetconfConfigurationModule.java | 0 .../device/configuration/PmConfiguration.java | 0 .../configuration/PmConfigurationModule.java | 0 .../device/read/DeviceReaderFactory.java | 0 .../device/read/DummyMonitoringService.java | 0 .../device/read/PmReaderFactory.java | 0 .../rpcs/ConnectionPortTrailService.java | 0 .../device/tools/DefaultDeviceFactory.java | 0 .../device/tools/DefaultNetconfFactory.java | 0 .../device/tools/DefaultPmListFactory.java | 0 .../device/write/DeviceChangeListener.java | 0 .../device/write/DeviceWriterFactory.java | 0 .../config/device/NamespaceTrimmer.xslt | 0 .../config/device/OperToConfig.xsl | 0 .../config/device/config.xsl | 0 .../test/CreateDeviceFromXMLFileTest.java | 0 .../device/test/DeviceOperToConfig.java | 0 .../device/test/DirectoryWatchTest.java | 0 .../device/test/RestAPICallsTest.java | 0 .../asciidoc/Readme.adoc | 0 .../minimal-distribution-core/pom.xml | 0 .../infra/distro/InitializationException.java | 0 .../distro/activation/ActivationConfig.java | 0 .../distro/activation/ActivationModule.java | 0 .../activation/ActiveModuleProvider.java | 0 .../distro/activation/ActiveModules.java | 0 .../infra/distro/cfgattrs/CfgAttrsModule.java | 0 .../cfgattrs/HoneycombConfiguration.java | 0 .../data/BindingDataBrokerProvider.java | 0 .../ConfigAndOperationalPipelineModule.java | 0 .../data/DOMNotificationServiceProvider.java | 0 .../infra/distro/data/DataStoreProvider.java | 0 .../infra/distro/data/DataTreeProvider.java | 0 .../HoneycombBindingDataBrokerProvider.java | 0 .../data/HoneycombDOMBrokerProvider.java | 0 .../data/HoneycombDOMDataBrokerProvider.java | 0 .../data/HoneycombDOMRpcServiceProvider.java | 0 .../HoneycombNotificationManagerProvider.java | 0 .../data/InmemoryDOMDataBrokerProvider.java | 0 .../data/ModifiableDTDelegProvider.java | 0 .../PersistedConfigInitializerProvider.java | 0 .../data/PersistingDataTreeProvider.java | 0 .../data/RpcRegistryBuilderProvider.java | 0 .../distro/data/RpcRegistryProvider.java | 0 .../data/config/WriterRegistryProvider.java | 0 .../data/context/ContextPipelineModule.java | 0 ...HoneycombContextDOMDataBrokerProvider.java | 0 .../data/context/ModifiableDTMgrProvider.java | 0 .../PersistedContextInitializerProvider.java | 0 .../RealtimeMappingContextProvider.java | 0 .../data/oper/ReadableDTDelegProvider.java | 0 .../data/oper/ReaderRegistryProvider.java | 0 .../InitializerPipelineModule.java | 0 .../InitializerRegistryAdapter.java | 0 .../InitializerRegistryAdapterProvider.java | 0 .../ModifiableDTDelegInitProvider.java | 0 .../schema/ModuleInfoBackedCtxProvider.java | 0 .../infra/distro/schema/ResourceLoader.java | 0 .../infra/distro/schema/SchemaModule.java | 0 .../distro/schema/SchemaServiceProvider.java | 0 .../distro/schema/SerializerProvider.java | 0 .../schema/YangBindingProviderModule.java | 0 .../distro/schema/YangModuleMappingIndex.java | 0 .../distro/schema/YangModulesProvider.java | 0 .../cert/honeycomb-keystore | Bin .../config/WEB-INF/web.xml | 0 .../config/activation.json | 0 .../config/honeycomb.json | 0 .../config/logback.xml | 0 .../honeycomb-tpce | 0 .../minimal-distribution/asciidoc/Readme.adoc | 0 .../{ => 2.1}/minimal-distribution/pom.xml | 0 .../io/fd/honeycomb/infra/distro/Main.java | 0 .../{ => 2.1}/netconf-netty-util/pom.xml | 0 .../nettyutil/AbstractChannelInitializer.java | 0 .../nettyutil/AbstractNetconfSession.java | 0 .../AbstractNetconfSessionNegotiator.java | 0 .../nettyutil/handler/BufferedWriter.java | 0 .../ChunkedFramingMechanismEncoder.java | 0 .../handler/EOMFramingMechanismEncoder.java | 0 .../FramingMechanismHandlerFactory.java | 0 .../handler/NetconfChunkAggregator.java | 0 .../handler/NetconfEOMAggregator.java | 0 .../nettyutil/handler/NetconfEXICodec.java | 0 .../handler/NetconfEXIToMessageDecoder.java | 0 .../NetconfHelloMessageToXMLEncoder.java | 0 .../handler/NetconfMessageToEXIEncoder.java | 0 .../handler/NetconfMessageToXMLEncoder.java | 0 .../NetconfXMLToHelloMessageDecoder.java | 0 .../handler/NetconfXMLToMessageDecoder.java | 0 .../handler/ThreadLocalTransformers.java | 0 .../nettyutil/handler/exi/EXIParameters.java | 0 .../handler/exi/NetconfStartExiMessage.java | 0 .../authentication/AuthenticationHandler.java | 0 .../ssh/authentication/LoginPassword.java | 0 .../ssh/authentication/PublicKeyAuth.java | 0 .../handler/ssh/client/AsyncSshHandler.java | 0 .../ssh/client/AsyncSshHandlerReader.java | 0 .../ssh/client/AsyncSshHandlerWriter.java | 0 .../{ => 2.1}/netconf/asciidoc/Readme.adoc | 0 tests/honeynode/{ => 2.1}/netconf/pom.xml | 0 ...HoneycombNotification2NetconfProvider.java | 0 .../netconf/NetconfBindingBrokerProvider.java | 0 .../netconf/NetconfConfigurationModule.java | 0 .../netconf/NetconfMdsalMapperProvider.java | 0 .../northbound/netconf/NetconfModule.java | 0 .../NetconfMonitoringMapperProvider.java | 0 ...etconfMonitoringReaderFactoryProvider.java | 0 .../NetconfMonitoringServiceProvider.java | 0 .../NetconfNotificationMapperProvider.java | 0 ...onfNotificationsReaderFactoryProvider.java | 0 .../netconf/NetconfReadersModule.java | 0 .../NetconfServerDispatcherProvider.java | 0 .../netconf/NetconfSshServerProvider.java | 0 .../netconf/NetconfTcpServerProvider.java | 0 .../netconf/NettyThreadGroupProvider.java | 0 .../config/netconf-whitelist.xml | 0 .../config/netconf.json | 0 tests/honeynode/{ => 2.1}/pom.xml | 0 .../{ => 2.1}/restconf/asciidoc/Readme.adoc | 0 tests/honeynode/{ => 2.1}/restconf/pom.xml | 0 .../restconf/HttpConnectorProvider.java | 0 .../restconf/HttpsConnectorProvider.java | 0 .../restconf/JettyServerProvider.java | 0 .../restconf/JettyServerStarter.java | 0 .../restconf/RestconfConfiguration.java | 0 .../restconf/RestconfConfigurationModule.java | 0 .../northbound/restconf/RestconfModule.java | 0 .../northbound/restconf/RestconfProvider.java | 0 .../config/restconf-whitelist.xml | 0 .../config/restconf.json | 0 .../{honeynode221 => honeynode/2.2.1}/README | 0 .../honeynode-common/asciidoc/Readme.adoc | 0 .../2.2.1}/honeynode-common/pom.xml | 0 .../AbstractDataObjectConverter.java | 0 .../converter/JSONDataObjectConverter.java | 0 .../converter/XMLDataObjectConverter.java | 0 .../converter/api/DataObjectConverter.java | 0 .../test/common/DataStoreContext.java | 0 .../test/common/DataStoreContextImpl.java | 0 .../asciidoc/Readme.adoc | 0 .../2.2.1}/honeynode-distribution/pom.xml | 0 .../honeynode-plugin-api/asciidoc/Readme.adoc | 0 .../2.2.1}/honeynode-plugin-api/pom.xml | 0 .../pm/types/rev171215/PmDataTypeBuilder.java | 0 .../facility/LogFacilityFacilityBuilder.java | 0 .../inet/types/rev130715/HostBuilder.java | 0 .../types/rev130715/IpAddressBuilder.java | 0 .../rev130715/IpAddressNoZoneBuilder.java | 0 .../inet/types/rev130715/IpPrefixBuilder.java | 0 .../state/schemas/SchemaLocationBuilder.java | 0 .../yang/common/iana-afn-safi@2013-07-04.yang | 0 .../common/ietf-inet-types@2013-07-15.yang | 0 ...tconf-monitoring-extension@2013-12-10.yang | 0 .../ietf-netconf-monitoring@2010-10-04.yang | 0 ...ietf-netconf-notifications@2012-02-06.yang | 0 .../yang/common/ietf-netconf@2011-06-01.yang | 0 .../ietf-network-topology@2015-06-08.yang | 0 .../yang/common/ietf-network@2015-06-08.yang | 0 .../common/ietf-yang-types@2013-07-15.yang | 0 .../yang/common/notifications@2008-07-14.yang | 0 ...org-openroadm-common-types@2018-10-19.yang | 0 ...adm-equipment-states-types@2017-12-15.yang | 0 ...openroadm-otn-common-types@2017-12-15.yang | 0 .../org-openroadm-pm-types@2017-12-15.yang | 0 .../common/org-openroadm-pm@2018-10-19.yang | 0 .../org-openroadm-port-types@2018-10-19.yang | 0 ...g-openroadm-resource-types@2018-10-19.yang | 0 .../org-openroadm-resource@2018-10-19.yang | 0 ...roadm-switching-pool-types@2017-12-15.yang | 0 .../org-openroadm-user-mgmt@2017-12-15.yang | 0 .../org-openroadm-device@2018-10-19.yang | 0 ...nroadm-ethernet-interfaces@2018-10-19.yang | 0 .../org-openroadm-interfaces@2017-06-26.yang | 0 .../org-openroadm-lldp@2018-10-19.yang | 0 ...roadm-maintenance-loopback@2017-12-15.yang | 0 ...adm-maintenance-testsignal@2017-12-15.yang | 0 ...m-media-channel-interfaces@2018-10-19.yang | 0 ...k-media-channel-interfaces@2018-10-19.yang | 0 ...optical-channel-interfaces@2018-10-19.yang | 0 ...tical-transport-interfaces@2018-10-19.yang | 0 .../org-openroadm-otn-common@2017-06-26.yang | 0 ...enroadm-otn-odu-interfaces@2018-10-19.yang | 0 ...enroadm-otn-otu-interfaces@2018-10-19.yang | 0 ...g-openroadm-physical-types@2018-10-19.yang | 0 .../org-openroadm-swdl@2018-10-19.yang | 0 .../org-openroadm-syslog@2017-12-15.yang | 0 .../asciidoc/Readme.adoc | 0 .../2.2.1}/honeynode-plugin-impl/pom.xml | 0 .../DeviceBindingDataBrokerProvider.java | 0 .../transportpce/device/DeviceModule.java | 0 .../device/DeviceNotificationModule.java | 0 .../device/DeviceReaderModule.java | 0 .../transportpce/device/DeviceRpcModule.java | 0 .../device/DeviceWriterModule.java | 0 .../configuration/DeviceConfiguration.java | 0 .../DeviceConfigurationModule.java | 0 .../configuration/NetconfConfiguration.java | 0 .../NetconfConfigurationModule.java | 0 .../device/configuration/PmConfiguration.java | 4 +- .../configuration/PmConfigurationModule.java | 0 .../DeviceNotificationProducer.java | 0 .../device/read/DeviceReaderFactory.java | 0 .../device/read/DummyMonitoringService.java | 0 .../device/read/PmReaderFactory.java | 0 .../rpcs/ConnectionPortTrailService.java | 0 .../device/tools/DefaultDeviceFactory.java | 0 .../device/tools/DefaultNetconfFactory.java | 0 .../device/tools/DefaultPmListFactory.java | 4 +- .../device/write/DeviceChangeListener.java | 0 .../device/write/DeviceWriterFactory.java | 0 .../config/device/NamespaceTrimmer.xslt | 0 .../config/device/OperToConfig.xsl | 310 +- .../config/device/config.xsl | 0 .../test/CreateDeviceFromXMLFileTest.java | 0 .../test/CreatePmListFromXMLFileTest.java | 0 .../device/test/DeviceOperToConfig.java | 0 .../device/test/DirectoryWatchTest.java | 0 .../device/test/RestAPICallsTest.java | 0 .../2.2.1}/log/honeycomb/honeycomb.log | 0 .../asciidoc/Readme.adoc | 0 .../2.2.1}/minimal-distribution-core/pom.xml | 0 .../infra/distro/InitializationException.java | 0 .../distro/activation/ActivationConfig.java | 0 .../distro/activation/ActivationModule.java | 0 .../activation/ActiveModuleProvider.java | 0 .../distro/activation/ActiveModules.java | 0 .../infra/distro/cfgattrs/CfgAttrsModule.java | 0 .../cfgattrs/HoneycombConfiguration.java | 0 .../data/BindingDataBrokerProvider.java | 0 .../ConfigAndOperationalPipelineModule.java | 0 .../data/DOMNotificationServiceProvider.java | 0 .../infra/distro/data/DataStoreProvider.java | 0 .../infra/distro/data/DataTreeProvider.java | 0 .../HoneycombBindingDataBrokerProvider.java | 0 .../data/HoneycombDOMBrokerProvider.java | 0 .../data/HoneycombDOMDataBrokerProvider.java | 0 .../data/HoneycombDOMRpcServiceProvider.java | 0 .../HoneycombNotificationManagerProvider.java | 0 .../data/InmemoryDOMDataBrokerProvider.java | 0 .../data/ModifiableDTDelegProvider.java | 0 .../PersistedConfigInitializerProvider.java | 0 .../data/PersistingDataTreeProvider.java | 0 .../data/RpcRegistryBuilderProvider.java | 0 .../distro/data/RpcRegistryProvider.java | 0 .../data/config/WriterRegistryProvider.java | 0 .../data/context/ContextPipelineModule.java | 0 ...HoneycombContextDOMDataBrokerProvider.java | 0 .../data/context/ModifiableDTMgrProvider.java | 0 .../PersistedContextInitializerProvider.java | 0 .../RealtimeMappingContextProvider.java | 0 .../data/oper/ReadableDTDelegProvider.java | 0 .../data/oper/ReaderRegistryProvider.java | 0 .../initializer/DeviceChangeListener.java | 0 .../InitializerPipelineModule.java | 0 .../InitializerRegistryAdapter.java | 0 .../InitializerRegistryAdapterProvider.java | 0 .../ModifiableDTDelegInitProvider.java | 0 .../schema/ModuleInfoBackedCtxProvider.java | 0 .../infra/distro/schema/ResourceLoader.java | 0 .../infra/distro/schema/SchemaModule.java | 0 .../distro/schema/SchemaServiceProvider.java | 0 .../distro/schema/SerializerProvider.java | 0 .../schema/YangBindingProviderModule.java | 0 .../distro/schema/YangModuleMappingIndex.java | 0 .../distro/schema/YangModulesProvider.java | 0 .../cert/honeycomb-keystore | Bin .../config/WEB-INF/web.xml | 0 .../config/activation.json | 0 .../config/honeycomb.json | 0 .../config/logback.xml | 0 .../honeycomb-tpce | 0 .../minimal-distribution/asciidoc/Readme.adoc | 0 .../2.2.1}/minimal-distribution/pom.xml | 0 .../io/fd/honeycomb/infra/distro/Main.java | 0 .../2.2.1}/netconf-netty-util/.gitignore | 0 .../2.2.1}/netconf-netty-util/pom.xml | 0 .../nettyutil/AbstractChannelInitializer.java | 0 .../nettyutil/AbstractNetconfSession.java | 0 .../AbstractNetconfSessionNegotiator.java | 0 .../nettyutil/handler/BufferedWriter.java | 0 .../ChunkedFramingMechanismEncoder.java | 0 .../handler/EOMFramingMechanismEncoder.java | 0 .../FramingMechanismHandlerFactory.java | 0 .../handler/NetconfChunkAggregator.java | 0 .../handler/NetconfEOMAggregator.java | 0 .../nettyutil/handler/NetconfEXICodec.java | 0 .../handler/NetconfEXIToMessageDecoder.java | 0 .../NetconfHelloMessageToXMLEncoder.java | 0 .../handler/NetconfMessageToEXIEncoder.java | 0 .../handler/NetconfMessageToXMLEncoder.java | 0 .../NetconfXMLToHelloMessageDecoder.java | 0 .../handler/NetconfXMLToMessageDecoder.java | 0 .../handler/ThreadLocalTransformers.java | 0 .../nettyutil/handler/exi/EXIParameters.java | 0 .../handler/exi/NetconfStartExiMessage.java | 0 .../authentication/AuthenticationHandler.java | 0 .../ssh/authentication/LoginPassword.java | 0 .../ssh/authentication/PublicKeyAuth.java | 0 .../handler/ssh/client/AsyncSshHandler.java | 0 .../ssh/client/AsyncSshHandlerReader.java | 0 .../ssh/client/AsyncSshHandlerWriter.java | 0 .../2.2.1}/netconf/asciidoc/Readme.adoc | 0 .../2.2.1}/netconf/pom.xml | 0 ...HoneycombNotification2NetconfProvider.java | 0 .../netconf/NetconfBindingBrokerProvider.java | 0 .../netconf/NetconfConfigurationModule.java | 0 .../netconf/NetconfMdsalMapperProvider.java | 0 .../northbound/netconf/NetconfModule.java | 0 .../NetconfMonitoringMapperProvider.java | 0 ...etconfMonitoringReaderFactoryProvider.java | 0 .../NetconfMonitoringServiceProvider.java | 0 .../NetconfNotificationMapperProvider.java | 0 ...onfNotificationsReaderFactoryProvider.java | 0 .../netconf/NetconfReadersModule.java | 0 .../NetconfServerDispatcherProvider.java | 0 .../netconf/NetconfSshServerProvider.java | 0 .../netconf/NetconfTcpServerProvider.java | 0 .../netconf/NettyThreadGroupProvider.java | 0 .../config/netconf-whitelist.xml | 0 .../config/netconf.json | 0 .../{honeynode221 => honeynode/2.2.1}/pom.xml | 0 .../2.2.1}/restconf/asciidoc/Readme.adoc | 0 .../2.2.1}/restconf/pom.xml | 0 .../restconf/HttpConnectorProvider.java | 0 .../restconf/HttpsConnectorProvider.java | 0 .../restconf/JettyServerProvider.java | 0 .../restconf/JettyServerStarter.java | 0 .../restconf/RestconfConfiguration.java | 0 .../restconf/RestconfConfigurationModule.java | 0 .../northbound/restconf/RestconfModule.java | 0 .../northbound/restconf/RestconfProvider.java | 0 .../config/restconf-whitelist.xml | 0 .../config/restconf.json | 0 .../honeynode221/fd_io_honeycomb_settings.xml | 139 - tests/mdsal | 1 - tests/netconf | 1 - .../ordmodels_1.2.1/org-openroadm-alarm.yang | 127 - .../org-openroadm-common-service-types.yang | 508 - .../org-openroadm-common-types.yang | 282 - .../org-openroadm-database.yang | 119 - .../org-openroadm-de-operations.yang | 77 - .../org-openroadm-device-resource-types.yang | 217 - .../ordmodels_1.2.1/org-openroadm-device.yang | 1213 --- .../org-openroadm-equipment-states-types.yang | 130 - .../org-openroadm-ethernet-interfaces.yang | 145 - .../org-openroadm-file-transfer.yang | 145 - tests/ordmodels_1.2.1/org-openroadm-fwdl.yang | 59 - .../org-openroadm-interfaces.yang | 108 - .../org-openroadm-layerRate.yang | 89 - tests/ordmodels_1.2.1/org-openroadm-lldp.yang | 302 - .../org-openroadm-maintenance-loopback.yang | 75 - .../org-openroadm-maintenance-testsignal.yang | 134 - .../org-openroadm-maintenance.yang | 87 - ...-openroadm-optical-channel-interfaces.yang | 184 - ...penroadm-optical-multiplex-interfaces.yang | 66 - ...penroadm-optical-transport-interfaces.yang | 144 - .../org-openroadm-otn-odu-interfaces.yang | 387 - .../org-openroadm-otn-otu-interfaces.yang | 185 - .../org-openroadm-physical-types.yang | 117 - .../org-openroadm-pm-types.yang | 278 - tests/ordmodels_1.2.1/org-openroadm-pm.yang | 189 - .../org-openroadm-port-types.yang | 150 - .../org-openroadm-probable-cause.yang | 522 -- .../org-openroadm-resource-types.yang | 252 - .../org-openroadm-resource.yang | 109 - .../org-openroadm-routing-constraints.yang | 128 - tests/ordmodels_1.2.1/org-openroadm-rstp.yang | 310 - .../org-openroadm-service.yang | 547 -- tests/ordmodels_1.2.1/org-openroadm-swdl.yang | 120 - .../ordmodels_1.2.1/org-openroadm-syslog.yang | 334 - tests/ordmodels_1.2.1/org-openroadm-tca.yang | 122 - .../org-openroadm-topology.yang | 91 - .../org-openroadm-user-mgmt.yang | 109 - .../org-openroadm-wavelength-map.yang | 71 - tests/pom.xml | 31 - .../openroadm/2.1/oper-ROADMB.xml | 8348 ++++++++--------- tests/setup.cfg | 2 +- tests/stubmodels/pom.xml | 95 - .../src/main/yang/stubpce@2017-04-26.yang | 164 - .../main/yang/stubrenderer@2017-04-26.yang | 138 - tests/stubpce/pom.xml | 155 - .../stubpce/CheckCoherencyHardSoft.java | 55 - .../transportpce/stubpce/CompliancyCheck.java | 89 - .../stubpce/LoggingFuturesCallBack.java | 41 - .../transportpce/stubpce/MyEndpoint.java | 59 - .../transportpce/stubpce/SendingPceRPCs.java | 911 -- .../stubpce/StubpceCompliancyCheck.java | 102 - .../stubpce/StubpceTxRxCheck.java | 195 - .../transportpce/stubpce/TpNodeTp.java | 153 - .../stubpce/impl/StubpceImpl.java | 590 -- .../stubpce/impl/StubpceProvider.java | 62 - .../stubpce/topology/InterNodePath.java | 556 -- .../topology/LogicalConnectionPoint.java | 68 - .../stubpce/topology/Network.java | 92 - .../stubpce/topology/NodeLinkNode.java | 117 - .../stubpce/topology/NodePath.java | 376 - .../transportpce/stubpce/topology/Path.java | 72 - .../topology/PathDescriptionsOrdered.java | 56 - .../stubpce/topology/Resource.java | 114 - .../stubpce/topology/RoadmToRoadm.java | 68 - .../stubpce/topology/SuperNode.java | 125 - .../stubpce/topology/SuperNodePath.java | 733 -- .../stubpce/topology/Topology.java | 107 - .../OSGI-INF/blueprint/Stubpce-blueprint.xml | 45 - tests/stubpce/src/main/resources/fakepce.xml | 198 - tests/stubrenderer/pom.xml | 99 - .../stubrenderer/SendingRendererRPCs.java | 132 - .../StubrendererCompliancyCheck.java | 95 - .../stubrenderer/impl/StubrendererImpl.java | 299 - .../impl/StubrendererProvider.java | 59 - .../blueprint/stubrenderer-blueprint.xml | 35 - tests/transportpce_tests/test_end2end.py | 8 +- tests/transportpce_tests/test_olm.py | 8 +- tests/transportpce_tests/test_portmapping.py | 4 +- .../test_renderer_service_path_nominal.py | 4 +- .../transportpce_tests/test_servicehandler.py | 846 -- .../test_topoPortMapping.py | 4 +- tests/transportpce_tests/test_topology.py | 8 +- tox.ini | 3 - 487 files changed, 4569 insertions(+), 20179 deletions(-) delete mode 100755 tests/SH_func_tests.sh delete mode 100644 tests/SH_stubs.diff delete mode 100644 tests/Xtesting/DockerSims/Dockerfile.orig.testtool delete mode 100755 tests/buildHoneynode221.sh delete mode 100755 tests/buildTesttool.sh rename tests/honeynode/{ => 2.1}/README (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/pom.xml (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-distribution/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/honeynode-distribution/pom.xml (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/pom.xml (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/iana-afn-safi@2013-07-04.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/ietf-inet-types@2013-07-15.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring-extension@2013-12-10.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring@2010-10-04.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/ietf-netconf@2011-06-01.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/ietf-yang-types@2013-07-15.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2017-09-29.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-device@2017-02-06.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-layerRate@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-lldp@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-physical-types@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-pm-types@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-pm@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-port-types@2017-09-29.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-resource-types@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-resource@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-swdl@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-api/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/pom.xml (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java (100%) rename tests/honeynode/{ => 2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/pom.xml (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution/pom.xml (100%) rename tests/honeynode/{ => 2.1}/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/pom.xml (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java (100%) rename tests/honeynode/{ => 2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java (100%) rename tests/honeynode/{ => 2.1}/netconf/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/netconf/pom.xml (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml (100%) rename tests/honeynode/{ => 2.1}/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json (100%) rename tests/honeynode/{ => 2.1}/pom.xml (100%) rename tests/honeynode/{ => 2.1}/restconf/asciidoc/Readme.adoc (100%) rename tests/honeynode/{ => 2.1}/restconf/pom.xml (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml (100%) rename tests/honeynode/{ => 2.1}/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json (100%) rename tests/{honeynode221 => honeynode/2.2.1}/README (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-distribution/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-distribution/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev171215/PmDataTypeBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev171215/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/iana-afn-safi@2013-07-04.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-inet-types@2013-07-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring-extension@2013-12-10.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring@2010-10-04.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-netconf-notifications@2012-02-06.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-netconf@2011-06-01.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-network-topology@2015-06-08.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-network@2015-06-08.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/ietf-yang-types@2013-07-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/notifications@2008-07-14.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-common-types@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-equipment-states-types@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-otn-common-types@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm-types@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-port-types@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource-types@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-switching-pool-types@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/common/org-openroadm-user-mgmt@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-device@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-ethernet-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-interfaces@2017-06-26.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-lldp@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-loopback@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-testsignal@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-media-channel-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-network-media-channel-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-channel-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-transport-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-common@2017-06-26.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-odu-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-otu-interfaces@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-physical-types@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-swdl@2018-10-19.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-api/src/main/yang/device221/org-openroadm-syslog@2017-12-15.yang (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceNotificationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java (95%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/notifications/DeviceNotificationProducer.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java (98%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl (97%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreatePmListFromXMLFileTest.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/log/honeycomb/honeycomb.log (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/DeviceChangeListener.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/.gitignore (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json (100%) rename tests/{honeynode221 => honeynode/2.2.1}/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/asciidoc/Readme.adoc (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/pom.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml (100%) rename tests/{honeynode221 => honeynode/2.2.1}/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json (100%) delete mode 100644 tests/honeynode221/fd_io_honeycomb_settings.xml delete mode 160000 tests/mdsal delete mode 160000 tests/netconf delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-alarm.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-common-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-database.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-de-operations.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-device.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-fwdl.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-layerRate.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-lldp.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-maintenance.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-physical-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-pm-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-pm.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-port-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-resource-types.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-resource.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-rstp.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-service.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-swdl.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-syslog.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-tca.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-topology.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang delete mode 100644 tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang delete mode 100644 tests/pom.xml delete mode 100644 tests/stubmodels/pom.xml delete mode 100644 tests/stubmodels/src/main/yang/stubpce@2017-04-26.yang delete mode 100644 tests/stubmodels/src/main/yang/stubrenderer@2017-04-26.yang delete mode 100644 tests/stubpce/pom.xml delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CheckCoherencyHardSoft.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CompliancyCheck.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/LoggingFuturesCallBack.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/MyEndpoint.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceCompliancyCheck.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceTxRxCheck.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/TpNodeTp.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceProvider.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/LogicalConnectionPoint.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Network.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodeLinkNode.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Path.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/PathDescriptionsOrdered.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/RoadmToRoadm.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNode.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java delete mode 100644 tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Topology.java delete mode 100644 tests/stubpce/src/main/resources/OSGI-INF/blueprint/Stubpce-blueprint.xml delete mode 100644 tests/stubpce/src/main/resources/fakepce.xml delete mode 100644 tests/stubrenderer/pom.xml delete mode 100644 tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java delete mode 100644 tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/StubrendererCompliancyCheck.java delete mode 100644 tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java delete mode 100644 tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java delete mode 100644 tests/stubrenderer/src/main/resources/OSGI-INF/blueprint/stubrenderer-blueprint.xml delete mode 100644 tests/transportpce_tests/test_servicehandler.py diff --git a/.gitmodules b/.gitmodules index b1690202f..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +0,0 @@ -[submodule "tests/netconf"] - path = tests/netconf - url = https://git.opendaylight.org/gerrit/p/netconf.git - branch = stable/nitrogen -[submodule "tests/mdsal"] - path = tests/mdsal - url = https://git.opendaylight.org/gerrit/p/mdsal.git - branch = stable/nitrogen diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index 6313d62d5..54a762fe9 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -308,20 +308,20 @@ To connect a node, use the following JSON RPC "node": [ { "node-id": "", - "netconf-node-topology:tcp-only": "false", - "netconf-node-topology:reconnect-on-changed-schema": "false", - "netconf-node-topology:host": "", - "netconf-node-topology:default-request-timeout-millis": "120000", - "netconf-node-topology:max-connection-attempts": "0", - "netconf-node-topology:sleep-factor": "1.5", - "netconf-node-topology:actor-response-wait-time": "5", - "netconf-node-topology:concurrent-rpc-limit": "0", - "netconf-node-topology:between-attempts-timeout-millis": "2000", - "netconf-node-topology:port": "", - "netconf-node-topology:connection-timeout-millis": "20000", - "netconf-node-topology:username": "", - "netconf-node-topology:password": "", - "netconf-node-topology:keepalive-delay": "300" + "netconf-node-topology:tcp-only": "false", + "netconf-node-topology:reconnect-on-changed-schema": "false", + "netconf-node-topology:host": "", + "netconf-node-topology:default-request-timeout-millis": "120000", + "netconf-node-topology:max-connection-attempts": "0", + "netconf-node-topology:sleep-factor": "1.5", + "netconf-node-topology:actor-response-wait-time": "5", + "netconf-node-topology:concurrent-rpc-limit": "0", + "netconf-node-topology:between-attempts-timeout-millis": "2000", + "netconf-node-topology:port": "", + "netconf-node-topology:connection-timeout-millis": "20000", + "netconf-node-topology:username": "", + "netconf-node-topology:password": "", + "netconf-node-topology:keepalive-delay": "300" } ] } @@ -464,92 +464,92 @@ nodes. .. code:: json { - "input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-create", - "request-system-id": "appname" - }, - "service-name": "test1", - "common-id": "commonId", - "connection-type": "service", - "service-a-end": { - "service-rate": "100", - "node-id": "", - "service-format": "Ethernet", - "clli": "", - "tx-direction": { - "port": { - "port-device-name": "", - "port-type": "fixed", - "port-name": "", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "", - "port-type": "fixed", - "port-name": "", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "", - "service-format": "Ethernet", - "clli": "", - "tx-direction": { - "port": { - "port-device-name": "", - "port-type": "fixed", - "port-name": "", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "", - "port-type": "fixed", - "port-name": "", - "port-rack": "000000.00", - "port-shelf": "Chassis#1" - }, - "lgx": { - "lgx-device-name": "Some lgx-device-name", - "lgx-port-name": "Some lgx-port-name", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "yyyy-mm-ddT00:00:01Z", - "operator-contact": "some-contact-info" - } + "input": { + "sdnc-request-header": { + "request-id": "request-1", + "rpc-action": "service-create", + "request-system-id": "appname" + }, + "service-name": "test1", + "common-id": "commonId", + "connection-type": "service", + "service-a-end": { + "service-rate": "100", + "node-id": "", + "service-format": "Ethernet", + "clli": "", + "tx-direction": { + "port": { + "port-device-name": "", + "port-type": "fixed", + "port-name": "", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "", + "port-type": "fixed", + "port-name": "", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "optic-type": "gray" + }, + "service-z-end": { + "service-rate": "100", + "node-id": "", + "service-format": "Ethernet", + "clli": "", + "tx-direction": { + "port": { + "port-device-name": "", + "port-type": "fixed", + "port-name": "", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "rx-direction": { + "port": { + "port-device-name": "", + "port-type": "fixed", + "port-name": "", + "port-rack": "000000.00", + "port-shelf": "Chassis#1" + }, + "lgx": { + "lgx-device-name": "Some lgx-device-name", + "lgx-port-name": "Some lgx-port-name", + "lgx-port-rack": "000000.00", + "lgx-port-shelf": "00" + } + }, + "optic-type": "gray" + }, + "due-date": "yyyy-mm-ddT00:00:01Z", + "operator-contact": "some-contact-info" + } } Most important parameters for this REST RPC are the identification of the two physical client ports @@ -570,18 +570,18 @@ connectivity service. .. code:: json { - "input": { - "sdnc-request-header": { - "request-id": "request-1", - "rpc-action": "service-delete", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "service-delete-req-info": { - "service-name": "test1", - "tail-retention": "no" - } - } + "input": { + "sdnc-request-header": { + "request-id": "request-1", + "rpc-action": "service-delete", + "request-system-id": "appname", + "notification-url": "http://localhost:8585/NotificationServer/notify" + }, + "service-delete-req-info": { + "service-name": "test1", + "tail-retention": "no" + } + } } Most important parameters for this REST RPC is the *service-name*. diff --git a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml index 93d2fa7be..6b0dbb68c 100755 --- a/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml +++ b/pce/src/main/resources/OSGI-INF/blueprint/pce-blueprint.xml @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml index d1d73e87a..a1232003f 100644 --- a/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml +++ b/servicehandler/src/main/resources/OSGI-INF/blueprint/servicehandler-blueprint.xml @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/SH_func_tests.sh b/tests/SH_func_tests.sh deleted file mode 100755 index 6fbbf4562..000000000 --- a/tests/SH_func_tests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -(cd .. && git apply tests/SH_stubs.diff && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true) -(cd .. && git checkout .) - -exit $? diff --git a/tests/SH_stubs.diff b/tests/SH_stubs.diff deleted file mode 100644 index 9d423a20c..000000000 --- a/tests/SH_stubs.diff +++ /dev/null @@ -1,22 +0,0 @@ -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 1c8ddfe..b83b8cc 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 -@@ -18,6 +18,7 @@ import org.opendaylight.transportpce.renderer.NetworkModelWavelengthService; - import org.opendaylight.transportpce.renderer.provisiondevice.RendererServiceOperations; - import org.opendaylight.transportpce.servicehandler.listeners.PceListenerImpl; - import org.opendaylight.transportpce.servicehandler.listeners.RendererListenerImpl; -+import org.opendaylight.transportpce.servicehandler.stub.StubRendererServiceOperations; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.TransportpcePceListener; - import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev171017.TransportpceRendererListener; - import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.OrgOpenroadmServiceService; -@@ -55,7 +56,8 @@ public class ServicehandlerProvider { - this.rpcRegistry = rpcProviderRegistry; - this.notificationService = notificationService; - this.pathComputationService = pathComputationService; -- this.rendererServiceOperations = rendererServiceOperations; -+ this.rendererServiceOperations = new StubRendererServiceOperations(networkModelWavelengthService, dataBroker, -+ notificationPublishService); - this.networkModelWavelengthService = networkModelWavelengthService; - this.notificationPublishService = notificationPublishService; - } diff --git a/tests/Xtesting/DockerSims/Dockerfile.orig b/tests/Xtesting/DockerSims/Dockerfile.orig index e2391aab2..c5e6a19f8 100644 --- a/tests/Xtesting/DockerSims/Dockerfile.orig +++ b/tests/Xtesting/DockerSims/Dockerfile.orig @@ -6,19 +6,12 @@ RUN apk add --update --no-cache bash procps maven git \ && git clone -b master https://git.opendaylight.org/gerrit/transportpce \ && cd transportpce/tests \ && ./buildHoneynode.sh \ - && mv honeynode/ /opt/sims/ \ + && mv honeynode/2.1 /opt/sims/honeynode \ && echo -e '#/bin/sh\n\ncd /opt/sims\n./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce $@\n'>/usr/bin/honeynode \ && chmod +x /usr/bin/honeynode \ -# && ./buildTesttool.sh \ -# && mv netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.5.0-executable.jar /opt/sims/ \ -# && mv schemas /opt/sims/ \ -# && echo -e '#/bin/sh\n\ncd /opt/sims\njava -jar /opt/sims/netconf-testtool-1.5.0-executable.jar $@\n'>/usr/bin/testtool \ -# && chmod +x /usr/bin/testtool \ && mv sample_configs/ /opt/sims/ \ && cd ../.. \ && rm -rf transportpce/ .m2/ \ && apk del git maven - #CMD honeynode 830 sample_configs/openroadm/2.1/oper-ROADMA.xml -#CMD testtool --schemas-dir schemas --initial-config-xml sample_configs/openroadm/1.2.1/sample-config-ROADMA.xml --starting-port 17830 diff --git a/tests/Xtesting/DockerSims/Dockerfile.orig.testtool b/tests/Xtesting/DockerSims/Dockerfile.orig.testtool deleted file mode 100644 index 2ca7ddf04..000000000 --- a/tests/Xtesting/DockerSims/Dockerfile.orig.testtool +++ /dev/null @@ -1,19 +0,0 @@ -FROM openjdk:8-jdk-alpine - -RUN apk add --update --no-cache bash procps maven git \ - && mkdir /opt/sims \ - && cd /root \ - && git clone -b master https://git.opendaylight.org/gerrit/transportpce \ - && cd transportpce/tests \ - && ./buildTesttool.sh \ - && mv netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.5.0-executable.jar /opt/sims/ \ - && mv schemas /opt/sims/ \ - && echo -e '#/bin/sh\n\ncd /opt/sims\njava -jar /opt/sims/netconf-testtool-1.5.0-executable.jar $@\n'>/usr/bin/testtool \ - && chmod +x /usr/bin/testtool \ - && mv sample_configs/ /opt/sims/ \ - && cd ../.. \ - && rm -rf transportpce/ .m2/ \ - && apk del git maven - - -#CMD testtool --schemas-dir schemas --initial-config-xml sample_configs/openroadm/1.2.1/sample-config-ROADMA.xml --starting-port 17830 diff --git a/tests/Xtesting/DockerSims/generate_sims.sh b/tests/Xtesting/DockerSims/generate_sims.sh index eb8bef656..0fea9c356 100755 --- a/tests/Xtesting/DockerSims/generate_sims.sh +++ b/tests/Xtesting/DockerSims/generate_sims.sh @@ -8,11 +8,3 @@ do DOCKNAME=honeynode_`echo $conf_file |cut -d\. -f1 |tr '[:upper:]' '[:lower:] echo -e "FROM alpine_honeynode:2.1\n\nCMD honeynode 830 sample_configs/openroadm/2.1/$conf_file\n" >Dockerfile sudo docker build --tag=$DOCKNAME:2.1 . done -cp Dockerfile.orig.testtool Dockerfile -sudo docker build --tag=alpine_testtool:1.2.1 . -for conf_file in `(cd ../../ && ls sample_configs/openroadm/1.2.1/)` -do DOCKNAME=testtool_`echo $conf_file |cut -d\. -f1 |cut -d\- -f3|tr '[:upper:]' '[:lower:]'` - echo "generating docker image '$DOCKNAME'" - echo -e "FROM alpine_testtool:1.2.1\n\nCMD testtool --schemas-dir schemas --starting-port 17830 --initial-config-xml sample_configs/openroadm/1.2.1/$conf_file\n" >Dockerfile - sudo docker build --tag=$DOCKNAME:1.2.1 . -done diff --git a/tests/buildHoneynode.sh b/tests/buildHoneynode.sh index 3d9db4ab0..5bffcea9b 100755 --- a/tests/buildHoneynode.sh +++ b/tests/buildHoneynode.sh @@ -1,11 +1,14 @@ #!/bin/bash +ORDMVERSION=${1:-2.1} + set -e -rm -rf honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -mkdir -p honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -cp honeynode/honeynode-plugin-api/src/main/yang/* honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -(cd honeynode && mvn clean install -DskipTests -Dcheckstyle.skip -s fd_io_honeycomb_settings.xml) -chmod +x ./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce +rm -rf honeynode/$ORDMVERSION/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang +mkdir -p honeynode/$ORDMVERSION/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang +#cp honeynode/$ORDMVERSION/honeynode-plugin-api/src/main/yang/* honeynode/$ORDMVERSION/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang +find honeynode/$ORDMVERSION/honeynode-plugin-api/src/main/yang/ -name "*.yang" -type f -exec cp {} ./honeynode/$ORDMVERSION/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang \; +(cd honeynode/$ORDMVERSION/ && mvn clean install -DskipTests -Dcheckstyle.skip -s ../fd_io_honeycomb_settings.xml) +chmod +x ./honeynode/$ORDMVERSION/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce exit $? diff --git a/tests/buildHoneynode221.sh b/tests/buildHoneynode221.sh deleted file mode 100755 index 4f2e3ba0a..000000000 --- a/tests/buildHoneynode221.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -rm -rf honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -mkdir -p honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -cp honeynode221/honeynode-plugin-api/src/main/yang/common/* honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -cp honeynode221/honeynode-plugin-api/src/main/yang/device221/* honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/yang -(cd honeynode221 && mvn clean install -DskipTests -Dcheckstyle.skip -s fd_io_honeycomb_settings.xml) -chmod +x ./honeynode221/honeynode-distribution/target/honeynode-distribution-1.18.01-hc/honeynode-distribution-1.18.01/honeycomb-tpce - -exit $? diff --git a/tests/buildTesttool.sh b/tests/buildTesttool.sh deleted file mode 100755 index 8e8ee9b80..000000000 --- a/tests/buildTesttool.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -# It may require to call git submodule update --init - -set -e - -yang="\ -mdsal/model/iana/iana-afn-safi/src/main/yang/iana-afn-safi@2013-07-04.yang \ -mdsal/model/ietf/ietf-inet-types-2013-07-15/src/main/yang/ietf-inet-types@2013-07-15.yang \ -mdsal/model/ietf/ietf-yang-types-20130715/src/main/yang/ietf-yang-types@2013-07-15.yang \ -netconf/netconf/models/ietf-netconf/src/main/yang/ietf-netconf@2011-06-01.yang \ -netconf/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-notifications@2012-02-06.yang \ -netconf/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang" - -rm -rf netconf mdsal && git submodule update --init -(cd netconf && patch -p1 < ../netconf.patch ) -(cd netconf/netconf/tools/netconf-testtool && mvn clean install -s ../../../../odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true) -rm -rf schemas && mkdir -p schemas -cp ordmodels_1.2.1/org-openroadm-* schemas -cp ${yang} schemas -mkdir -p transportpce_tests/log/ - -exit $? diff --git a/tests/honeynode/README b/tests/honeynode/2.1/README similarity index 100% rename from tests/honeynode/README rename to tests/honeynode/2.1/README diff --git a/tests/honeynode/honeynode-common/asciidoc/Readme.adoc b/tests/honeynode/2.1/honeynode-common/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/honeynode-common/asciidoc/Readme.adoc rename to tests/honeynode/2.1/honeynode-common/asciidoc/Readme.adoc diff --git a/tests/honeynode/honeynode-common/pom.xml b/tests/honeynode/2.1/honeynode-common/pom.xml similarity index 100% rename from tests/honeynode/honeynode-common/pom.xml rename to tests/honeynode/2.1/honeynode-common/pom.xml diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java diff --git a/tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java b/tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java similarity index 100% rename from tests/honeynode/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java rename to tests/honeynode/2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java diff --git a/tests/honeynode/honeynode-distribution/asciidoc/Readme.adoc b/tests/honeynode/2.1/honeynode-distribution/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/honeynode-distribution/asciidoc/Readme.adoc rename to tests/honeynode/2.1/honeynode-distribution/asciidoc/Readme.adoc diff --git a/tests/honeynode/honeynode-distribution/pom.xml b/tests/honeynode/2.1/honeynode-distribution/pom.xml similarity index 100% rename from tests/honeynode/honeynode-distribution/pom.xml rename to tests/honeynode/2.1/honeynode-distribution/pom.xml diff --git a/tests/honeynode/honeynode-plugin-api/asciidoc/Readme.adoc b/tests/honeynode/2.1/honeynode-plugin-api/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/honeynode-plugin-api/asciidoc/Readme.adoc rename to tests/honeynode/2.1/honeynode-plugin-api/asciidoc/Readme.adoc diff --git a/tests/honeynode/honeynode-plugin-api/pom.xml b/tests/honeynode/2.1/honeynode-plugin-api/pom.xml similarity index 100% rename from tests/honeynode/honeynode-plugin-api/pom.xml rename to tests/honeynode/2.1/honeynode-plugin-api/pom.xml diff --git a/tests/honeynode/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java b/tests/honeynode/2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev161014/PmDataTypeBuilder.java diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/iana-afn-safi@2013-07-04.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/iana-afn-safi@2013-07-04.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/iana-afn-safi@2013-07-04.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/iana-afn-safi@2013-07-04.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-inet-types@2013-07-15.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-inet-types@2013-07-15.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-inet-types@2013-07-15.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-inet-types@2013-07-15.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring-extension@2013-12-10.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring-extension@2013-12-10.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring-extension@2013-12-10.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring-extension@2013-12-10.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring@2010-10-04.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring@2010-10-04.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring@2010-10-04.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf-monitoring@2010-10-04.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf@2011-06-01.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf@2011-06-01.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-netconf@2011-06-01.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-netconf@2011-06-01.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-yang-types@2013-07-15.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-yang-types@2013-07-15.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/ietf-yang-types@2013-07-15.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/ietf-yang-types@2013-07-15.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2017-09-29.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2017-09-29.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2017-09-29.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-common-types@2017-09-29.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-device@2017-02-06.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-device@2017-02-06.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-device@2017-02-06.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-device@2017-02-06.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-equipment-states-types@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-ethernet-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-layerRate@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-layerRate@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-layerRate@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-layerRate@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-lldp@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-lldp@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-lldp@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-lldp@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-loopback@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance-testsignal@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-maintenance@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-channel-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-multiplex-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-optical-transport-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-otn-odu-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-otn-otu-interfaces@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-physical-types@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-physical-types@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-physical-types@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-physical-types@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-pm-types@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-pm-types@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-pm-types@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-pm-types@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-pm@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-pm@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-pm@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-pm@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-port-types@2017-09-29.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-port-types@2017-09-29.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-port-types@2017-09-29.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-port-types@2017-09-29.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-resource-types@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-resource-types@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-resource-types@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-resource-types@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-resource@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-resource@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-resource@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-resource@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-swdl@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-swdl@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-swdl@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-swdl@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-user-mgmt@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang b/tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang similarity index 100% rename from tests/honeynode/honeynode-plugin-api/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang rename to tests/honeynode/2.1/honeynode-plugin-api/src/main/yang/org-openroadm-wavelength-map@2016-10-14.yang diff --git a/tests/honeynode/honeynode-plugin-impl/asciidoc/Readme.adoc b/tests/honeynode/2.1/honeynode-plugin-impl/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/asciidoc/Readme.adoc rename to tests/honeynode/2.1/honeynode-plugin-impl/asciidoc/Readme.adoc diff --git a/tests/honeynode/honeynode-plugin-impl/pom.xml b/tests/honeynode/2.1/honeynode-plugin-impl/pom.xml similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/pom.xml rename to tests/honeynode/2.1/honeynode-plugin-impl/pom.xml diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl b/tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl rename to tests/honeynode/2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl diff --git a/tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java diff --git a/tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java b/tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java similarity index 100% rename from tests/honeynode/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java rename to tests/honeynode/2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java diff --git a/tests/honeynode/minimal-distribution-core/asciidoc/Readme.adoc b/tests/honeynode/2.1/minimal-distribution-core/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/minimal-distribution-core/asciidoc/Readme.adoc rename to tests/honeynode/2.1/minimal-distribution-core/asciidoc/Readme.adoc diff --git a/tests/honeynode/minimal-distribution-core/pom.xml b/tests/honeynode/2.1/minimal-distribution-core/pom.xml similarity index 100% rename from tests/honeynode/minimal-distribution-core/pom.xml rename to tests/honeynode/2.1/minimal-distribution-core/pom.xml diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java b/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java rename to tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml diff --git a/tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce b/tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce similarity index 100% rename from tests/honeynode/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce rename to tests/honeynode/2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce diff --git a/tests/honeynode/minimal-distribution/asciidoc/Readme.adoc b/tests/honeynode/2.1/minimal-distribution/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/minimal-distribution/asciidoc/Readme.adoc rename to tests/honeynode/2.1/minimal-distribution/asciidoc/Readme.adoc diff --git a/tests/honeynode/minimal-distribution/pom.xml b/tests/honeynode/2.1/minimal-distribution/pom.xml similarity index 100% rename from tests/honeynode/minimal-distribution/pom.xml rename to tests/honeynode/2.1/minimal-distribution/pom.xml diff --git a/tests/honeynode/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java b/tests/honeynode/2.1/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java similarity index 100% rename from tests/honeynode/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java rename to tests/honeynode/2.1/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java diff --git a/tests/honeynode/netconf-netty-util/pom.xml b/tests/honeynode/2.1/netconf-netty-util/pom.xml similarity index 100% rename from tests/honeynode/netconf-netty-util/pom.xml rename to tests/honeynode/2.1/netconf-netty-util/pom.xml diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java diff --git a/tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java b/tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java similarity index 100% rename from tests/honeynode/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java rename to tests/honeynode/2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java diff --git a/tests/honeynode/netconf/asciidoc/Readme.adoc b/tests/honeynode/2.1/netconf/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/netconf/asciidoc/Readme.adoc rename to tests/honeynode/2.1/netconf/asciidoc/Readme.adoc diff --git a/tests/honeynode/netconf/pom.xml b/tests/honeynode/2.1/netconf/pom.xml similarity index 100% rename from tests/honeynode/netconf/pom.xml rename to tests/honeynode/2.1/netconf/pom.xml diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java diff --git a/tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java b/tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java similarity index 100% rename from tests/honeynode/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java rename to tests/honeynode/2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java diff --git a/tests/honeynode/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml b/tests/honeynode/2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml similarity index 100% rename from tests/honeynode/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml rename to tests/honeynode/2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml diff --git a/tests/honeynode/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json b/tests/honeynode/2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json similarity index 100% rename from tests/honeynode/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json rename to tests/honeynode/2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json diff --git a/tests/honeynode/pom.xml b/tests/honeynode/2.1/pom.xml similarity index 100% rename from tests/honeynode/pom.xml rename to tests/honeynode/2.1/pom.xml diff --git a/tests/honeynode/restconf/asciidoc/Readme.adoc b/tests/honeynode/2.1/restconf/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode/restconf/asciidoc/Readme.adoc rename to tests/honeynode/2.1/restconf/asciidoc/Readme.adoc diff --git a/tests/honeynode/restconf/pom.xml b/tests/honeynode/2.1/restconf/pom.xml similarity index 100% rename from tests/honeynode/restconf/pom.xml rename to tests/honeynode/2.1/restconf/pom.xml diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java diff --git a/tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java b/tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java similarity index 100% rename from tests/honeynode/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java rename to tests/honeynode/2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java diff --git a/tests/honeynode/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml b/tests/honeynode/2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml similarity index 100% rename from tests/honeynode/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml rename to tests/honeynode/2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml diff --git a/tests/honeynode/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json b/tests/honeynode/2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json similarity index 100% rename from tests/honeynode/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json rename to tests/honeynode/2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json diff --git a/tests/honeynode221/README b/tests/honeynode/2.2.1/README similarity index 100% rename from tests/honeynode221/README rename to tests/honeynode/2.2.1/README diff --git a/tests/honeynode221/honeynode-common/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/honeynode-common/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/honeynode-common/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/honeynode-common/asciidoc/Readme.adoc diff --git a/tests/honeynode221/honeynode-common/pom.xml b/tests/honeynode/2.2.1/honeynode-common/pom.xml similarity index 100% rename from tests/honeynode221/honeynode-common/pom.xml rename to tests/honeynode/2.2.1/honeynode-common/pom.xml diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/AbstractDataObjectConverter.java diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/JSONDataObjectConverter.java diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/XMLDataObjectConverter.java diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/binding/converter/api/DataObjectConverter.java diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContext.java diff --git a/tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java b/tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java similarity index 100% rename from tests/honeynode221/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java rename to tests/honeynode/2.2.1/honeynode-common/src/main/java/io/fd/honeycomb/transportpce/test/common/DataStoreContextImpl.java diff --git a/tests/honeynode221/honeynode-distribution/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/honeynode-distribution/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/honeynode-distribution/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/honeynode-distribution/asciidoc/Readme.adoc diff --git a/tests/honeynode221/honeynode-distribution/pom.xml b/tests/honeynode/2.2.1/honeynode-distribution/pom.xml similarity index 100% rename from tests/honeynode221/honeynode-distribution/pom.xml rename to tests/honeynode/2.2.1/honeynode-distribution/pom.xml diff --git a/tests/honeynode221/honeynode-plugin-api/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/honeynode-plugin-api/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/honeynode-plugin-api/asciidoc/Readme.adoc diff --git a/tests/honeynode221/honeynode-plugin-api/pom.xml b/tests/honeynode/2.2.1/honeynode-plugin-api/pom.xml similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/pom.xml rename to tests/honeynode/2.2.1/honeynode-plugin-api/pom.xml diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev171215/PmDataTypeBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev171215/PmDataTypeBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev171215/PmDataTypeBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev171215/PmDataTypeBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev171215/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev171215/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev171215/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/syslog/rev171215/syslog/selector/log/selector/selector/facility/log/facility/LogFacilityFacilityBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/HostBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpAddressNoZoneBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev130715/IpPrefixBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/netconf/monitoring/rev101004/netconf/state/schemas/SchemaLocationBuilder.java diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/iana-afn-safi@2013-07-04.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/iana-afn-safi@2013-07-04.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/iana-afn-safi@2013-07-04.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/iana-afn-safi@2013-07-04.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-inet-types@2013-07-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-inet-types@2013-07-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-inet-types@2013-07-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-inet-types@2013-07-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring-extension@2013-12-10.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring-extension@2013-12-10.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring-extension@2013-12-10.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring-extension@2013-12-10.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring@2010-10-04.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring@2010-10-04.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring@2010-10-04.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-monitoring@2010-10-04.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-notifications@2012-02-06.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-notifications@2012-02-06.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf-notifications@2012-02-06.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf-notifications@2012-02-06.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf@2011-06-01.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf@2011-06-01.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-netconf@2011-06-01.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-netconf@2011-06-01.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-network-topology@2015-06-08.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-network-topology@2015-06-08.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-network-topology@2015-06-08.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-network-topology@2015-06-08.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-network@2015-06-08.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-network@2015-06-08.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-network@2015-06-08.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-network@2015-06-08.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-yang-types@2013-07-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-yang-types@2013-07-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/ietf-yang-types@2013-07-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/ietf-yang-types@2013-07-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/notifications@2008-07-14.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/notifications@2008-07-14.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/notifications@2008-07-14.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/notifications@2008-07-14.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-common-types@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-common-types@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-common-types@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-common-types@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-equipment-states-types@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-equipment-states-types@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-equipment-states-types@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-equipment-states-types@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-otn-common-types@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-otn-common-types@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-otn-common-types@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-otn-common-types@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm-types@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm-types@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm-types@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm-types@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-pm@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-port-types@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-port-types@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-port-types@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-port-types@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource-types@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource-types@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource-types@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource-types@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-resource@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-switching-pool-types@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-switching-pool-types@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-switching-pool-types@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-switching-pool-types@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-user-mgmt@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-user-mgmt@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/common/org-openroadm-user-mgmt@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/common/org-openroadm-user-mgmt@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-device@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-device@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-device@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-device@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-ethernet-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-ethernet-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-ethernet-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-ethernet-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-interfaces@2017-06-26.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-interfaces@2017-06-26.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-interfaces@2017-06-26.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-interfaces@2017-06-26.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-lldp@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-lldp@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-lldp@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-lldp@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-loopback@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-loopback@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-loopback@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-loopback@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-testsignal@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-testsignal@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-testsignal@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-maintenance-testsignal@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-media-channel-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-media-channel-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-media-channel-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-media-channel-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-network-media-channel-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-network-media-channel-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-network-media-channel-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-network-media-channel-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-channel-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-channel-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-channel-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-channel-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-transport-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-transport-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-transport-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-optical-transport-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-common@2017-06-26.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-common@2017-06-26.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-common@2017-06-26.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-common@2017-06-26.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-odu-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-odu-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-odu-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-odu-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-otu-interfaces@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-otu-interfaces@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-otu-interfaces@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-otn-otu-interfaces@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-physical-types@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-physical-types@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-physical-types@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-physical-types@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-swdl@2018-10-19.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-swdl@2018-10-19.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-swdl@2018-10-19.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-swdl@2018-10-19.yang diff --git a/tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-syslog@2017-12-15.yang b/tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-syslog@2017-12-15.yang similarity index 100% rename from tests/honeynode221/honeynode-plugin-api/src/main/yang/device221/org-openroadm-syslog@2017-12-15.yang rename to tests/honeynode/2.2.1/honeynode-plugin-api/src/main/yang/device221/org-openroadm-syslog@2017-12-15.yang diff --git a/tests/honeynode221/honeynode-plugin-impl/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/honeynode-plugin-impl/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/honeynode-plugin-impl/asciidoc/Readme.adoc diff --git a/tests/honeynode221/honeynode-plugin-impl/pom.xml b/tests/honeynode/2.2.1/honeynode-plugin-impl/pom.xml similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/pom.xml rename to tests/honeynode/2.2.1/honeynode-plugin-impl/pom.xml diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceBindingDataBrokerProvider.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceNotificationModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceNotificationModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceNotificationModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceNotificationModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceReaderModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceRpcModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/DeviceWriterModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfiguration.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/DeviceConfigurationModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfiguration.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/NetconfConfigurationModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java similarity index 95% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java index 376968ebc..454df7dbb 100644 --- a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java +++ b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java @@ -58,13 +58,13 @@ public final class PmConfiguration { } public CurrentPmList getDataPm() { - CurrentPmList result = null; + CurrentPmList result = null; File pm_list_data = new File(classLoader.getResource(PM_DATA_SAMPLE_OPER_XML).getFile()); result = defaultPmListFactory.createDefaultPmList(dataStoreContextUtil,pm_list_data); if (result != null) { LOG.info("result pm list size : {}", result.getCurrentPmEntry().size()); } else { - LOG.error("no current-pm-list retreived from initial xml file"); + LOG.error("no current-pm-list retreived from initial xml file"); } return result; } diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfigurationModule.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/notifications/DeviceNotificationProducer.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/notifications/DeviceNotificationProducer.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/notifications/DeviceNotificationProducer.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/notifications/DeviceNotificationProducer.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DeviceReaderFactory.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/PmReaderFactory.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/rpcs/ConnectionPortTrailService.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultDeviceFactory.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultNetconfFactory.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java similarity index 98% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java index 2c33fe5d1..0309cf6e9 100644 --- a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java +++ b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/tools/DefaultPmListFactory.java @@ -52,7 +52,7 @@ public class DefaultPmListFactory { * @return {@link CurrentPmlist} */ public CurrentPmList createDefaultPmList(DataStoreContext dataStoreContextUtil, File pm_data_config) { - CurrentPmList result = null; + CurrentPmList result = null; if (pm_data_config.exists()) { String config = pm_data_config.getName(); LOG.info("file with pm '{}' exists at location : {}", config, pm_data_config.getAbsolutePath()); @@ -88,7 +88,7 @@ public class DefaultPmListFactory { * @return {@link CurrentPmlist} */ public CurrentPmList createDefaultPmList(DataStoreContext dataStoreContextUtil, String pm_data_config) { - CurrentPmList result = null; + CurrentPmList result = null; if (pm_data_config != null) { LOG.info("Pm List data config string is ok "); InputStream targetStream; diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceChangeListener.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/write/DeviceWriterFactory.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/NamespaceTrimmer.xslt diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl similarity index 97% rename from tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl index 81081bfb8..b26e4fc47 100644 --- a/tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl +++ b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl @@ -1,155 +1,155 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/config.xsl diff --git a/tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreateDeviceFromXMLFileTest.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreatePmListFromXMLFileTest.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreatePmListFromXMLFileTest.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreatePmListFromXMLFileTest.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/CreatePmListFromXMLFileTest.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DeviceOperToConfig.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/DirectoryWatchTest.java diff --git a/tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java b/tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java similarity index 100% rename from tests/honeynode221/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java rename to tests/honeynode/2.2.1/honeynode-plugin-impl/src/test/java/io/fd/honeycomb/transportpce/device/test/RestAPICallsTest.java diff --git a/tests/honeynode221/log/honeycomb/honeycomb.log b/tests/honeynode/2.2.1/log/honeycomb/honeycomb.log similarity index 100% rename from tests/honeynode221/log/honeycomb/honeycomb.log rename to tests/honeynode/2.2.1/log/honeycomb/honeycomb.log diff --git a/tests/honeynode221/minimal-distribution-core/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/minimal-distribution-core/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/minimal-distribution-core/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/minimal-distribution-core/asciidoc/Readme.adoc diff --git a/tests/honeynode221/minimal-distribution-core/pom.xml b/tests/honeynode/2.2.1/minimal-distribution-core/pom.xml similarity index 100% rename from tests/honeynode221/minimal-distribution-core/pom.xml rename to tests/honeynode/2.2.1/minimal-distribution-core/pom.xml diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/InitializationException.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationConfig.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActivationModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/activation/ActiveModules.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/CfgAttrsModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/cfgattrs/HoneycombConfiguration.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/BindingDataBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ConfigAndOperationalPipelineModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DOMNotificationServiceProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataStoreProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombBindingDataBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMDataBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombDOMRpcServiceProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/HoneycombNotificationManagerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/ModifiableDTDelegProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistedConfigInitializerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/PersistingDataTreeProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryBuilderProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/RpcRegistryProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ContextPipelineModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/HoneycombContextDOMDataBrokerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/ModifiableDTMgrProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/PersistedContextInitializerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/context/RealtimeMappingContextProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReadableDTDelegProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/DeviceChangeListener.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/DeviceChangeListener.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/DeviceChangeListener.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/DeviceChangeListener.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerPipelineModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapter.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/InitializerRegistryAdapterProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/initializer/ModifiableDTDelegInitProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/ResourceLoader.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SchemaServiceProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/SerializerProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangBindingProviderModule.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModuleMappingIndex.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/schema/YangModulesProvider.java diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/cert/honeycomb-keystore diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/WEB-INF/web.xml diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/activation.json diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/config/logback.xml diff --git a/tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce b/tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce similarity index 100% rename from tests/honeynode221/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce rename to tests/honeynode/2.2.1/minimal-distribution-core/src/main/resources/honeycomb-minimal-resources/honeycomb-tpce diff --git a/tests/honeynode221/minimal-distribution/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/minimal-distribution/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/minimal-distribution/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/minimal-distribution/asciidoc/Readme.adoc diff --git a/tests/honeynode221/minimal-distribution/pom.xml b/tests/honeynode/2.2.1/minimal-distribution/pom.xml similarity index 100% rename from tests/honeynode221/minimal-distribution/pom.xml rename to tests/honeynode/2.2.1/minimal-distribution/pom.xml diff --git a/tests/honeynode221/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java b/tests/honeynode/2.2.1/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java similarity index 100% rename from tests/honeynode221/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java rename to tests/honeynode/2.2.1/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/Main.java diff --git a/tests/honeynode221/netconf-netty-util/.gitignore b/tests/honeynode/2.2.1/netconf-netty-util/.gitignore similarity index 100% rename from tests/honeynode221/netconf-netty-util/.gitignore rename to tests/honeynode/2.2.1/netconf-netty-util/.gitignore diff --git a/tests/honeynode221/netconf-netty-util/pom.xml b/tests/honeynode/2.2.1/netconf-netty-util/pom.xml similarity index 100% rename from tests/honeynode221/netconf-netty-util/pom.xml rename to tests/honeynode/2.2.1/netconf-netty-util/pom.xml diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractChannelInitializer.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/BufferedWriter.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ChunkedFramingMechanismEncoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/EOMFramingMechanismEncoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/FramingMechanismHandlerFactory.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfChunkAggregator.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEOMAggregator.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXICodec.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ThreadLocalTransformers.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/AuthenticationHandler.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/LoginPassword.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerReader.java diff --git a/tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java b/tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java similarity index 100% rename from tests/honeynode221/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java rename to tests/honeynode/2.2.1/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/client/AsyncSshHandlerWriter.java diff --git a/tests/honeynode221/netconf/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/netconf/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/netconf/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/netconf/asciidoc/Readme.adoc diff --git a/tests/honeynode221/netconf/pom.xml b/tests/honeynode/2.2.1/netconf/pom.xml similarity index 100% rename from tests/honeynode221/netconf/pom.xml rename to tests/honeynode/2.2.1/netconf/pom.xml diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/HoneycombNotification2NetconfProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfBindingBrokerProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfConfigurationModule.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMdsalMapperProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfModule.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringMapperProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringReaderFactoryProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfMonitoringServiceProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationsReaderFactoryProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfReadersModule.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfServerDispatcherProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfSshServerProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfTcpServerProvider.java diff --git a/tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java b/tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java similarity index 100% rename from tests/honeynode221/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java rename to tests/honeynode/2.2.1/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NettyThreadGroupProvider.java diff --git a/tests/honeynode221/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml b/tests/honeynode/2.2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml similarity index 100% rename from tests/honeynode221/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml rename to tests/honeynode/2.2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf-whitelist.xml diff --git a/tests/honeynode221/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json b/tests/honeynode/2.2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json similarity index 100% rename from tests/honeynode221/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json rename to tests/honeynode/2.2.1/netconf/src/main/resources/honeycomb-minimal-resources/config/netconf.json diff --git a/tests/honeynode221/pom.xml b/tests/honeynode/2.2.1/pom.xml similarity index 100% rename from tests/honeynode221/pom.xml rename to tests/honeynode/2.2.1/pom.xml diff --git a/tests/honeynode221/restconf/asciidoc/Readme.adoc b/tests/honeynode/2.2.1/restconf/asciidoc/Readme.adoc similarity index 100% rename from tests/honeynode221/restconf/asciidoc/Readme.adoc rename to tests/honeynode/2.2.1/restconf/asciidoc/Readme.adoc diff --git a/tests/honeynode221/restconf/pom.xml b/tests/honeynode/2.2.1/restconf/pom.xml similarity index 100% rename from tests/honeynode221/restconf/pom.xml rename to tests/honeynode/2.2.1/restconf/pom.xml diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpConnectorProvider.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/HttpsConnectorProvider.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerProvider.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/JettyServerStarter.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfiguration.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfConfigurationModule.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfModule.java diff --git a/tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java b/tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java similarity index 100% rename from tests/honeynode221/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java rename to tests/honeynode/2.2.1/restconf/src/main/java/io/fd/honeycomb/northbound/restconf/RestconfProvider.java diff --git a/tests/honeynode221/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml b/tests/honeynode/2.2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml similarity index 100% rename from tests/honeynode221/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml rename to tests/honeynode/2.2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf-whitelist.xml diff --git a/tests/honeynode221/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json b/tests/honeynode/2.2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json similarity index 100% rename from tests/honeynode221/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json rename to tests/honeynode/2.2.1/restconf/src/main/resources/honeycomb-minimal-resources/config/restconf.json diff --git a/tests/honeynode221/fd_io_honeycomb_settings.xml b/tests/honeynode221/fd_io_honeycomb_settings.xml deleted file mode 100644 index 2fd709fa1..000000000 --- a/tests/honeynode221/fd_io_honeycomb_settings.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - fd.io-release - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/groups/public/ - - true - never - - - false - - - - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/repositories/public/ - - true - never - - - false - - - - - - - fd.io-snapshots - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-shapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-release - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - - - fd.io-release - fd.io-snapshots - opendaylight-snapshots - opendaylight-release - - - diff --git a/tests/mdsal b/tests/mdsal deleted file mode 160000 index a6433bbfd..000000000 --- a/tests/mdsal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6433bbfd68b44bd5d1c661f90b96584597f44ae diff --git a/tests/netconf b/tests/netconf deleted file mode 160000 index 685c28f55..000000000 --- a/tests/netconf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 685c28f557b2f4e7b6b960a6aa397dcc8994b10d diff --git a/tests/ordmodels_1.2.1/org-openroadm-alarm.yang b/tests/ordmodels_1.2.1/org-openroadm-alarm.yang deleted file mode 100644 index 5ed8792b6..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-alarm.yang +++ /dev/null @@ -1,127 +0,0 @@ -module org-openroadm-alarm { - namespace "http://org/openroadm/alarm"; - prefix org-openroadm-alarm; - - import ietf-yang-types { - prefix yang; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-resource { - prefix org-openroadm-resource; - } - import org-openroadm-probable-cause { - prefix org-openroadm-probable-cause; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of an alarm. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping alarm { - leaf id { - description - "Uniquely id for this alarm, within the given management domain"; - type string; - mandatory true; - } - container resource { - description - "Resource under alarm"; - uses org-openroadm-resource:resource; - } - container probableCause { - description - "Probable cause of alarm"; - uses org-openroadm-probable-cause:probable-cause; - } - leaf type { - description - "Type of alarm. Based on X.733 event Type."; - mandatory false; - type enumeration { - enum "communication" { - value 1; - } - enum "qualityOfService" { - value 2; - } - enum "processingError" { - value 3; - } - enum "equipment" { - value 4; - } - enum "environmental" { - value 5; - } - } - } - leaf raiseTime { - description - "Time alarm was raised"; - type yang:date-and-time; - mandatory true; - } - leaf severity { - description - "Severity of alarm. Based on X.733 perceived severity."; - mandatory true; - type org-openroadm-common-types:severity; - } - leaf circuit-id { - description - "Circuit-id for alarm correlation."; - type string; - } - } - - container active-alarm-list { - description - "List of currently active alarms. An alarm is removed from this table when the state transitions to clear."; - list activeAlarms { - key "id"; - uses alarm; - } - config false; - } - notification alarm-notification { - description - "Notification sent on initial alarm creation, as well as any time the alarm changes state, including clear"; - uses alarm; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang b/tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang deleted file mode 100644 index 7d5978c09..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-common-service-types.yang +++ /dev/null @@ -1,508 +0,0 @@ -module org-openroadm-common-service-types { - namespace "http://org/openroadm/common/service/types"; - prefix org-openroadm-common-service-types; - - import ietf-yang-types { - prefix yang; - } - import ietf-inet-types { - prefix inet; - } - import org-openroadm-routing-constraints { - prefix org-openroadm-routing-constraints; - } - import org-openroadm-topology { - prefix org-openroadm-topology; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } - - organization - "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of common service types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping configuration-response-common { - container configuration-response-common { - leaf request-id { - type string; - mandatory true; - } - leaf response-code { - type string; - mandatory true; - } - leaf response-message { - type string; - } - leaf ack-final-indicator { - type string; - mandatory true; - } - } - } - - grouping response-parameters { - container response-parameters { - uses org-openroadm-routing-constraints:routing-constraints; - } - } - - grouping service-endpoint { - leaf service-format { - type service-format; - mandatory true; - description - "Format of the requested service: Ethernet, OTU, etc."; - } - leaf service-rate { - when "../service-format!='OMS'"{ - description "service rate not applicable when service - format is roadmline"; - } - type uint32; - mandatory true; - description - "Rate of the requested service in GBps"; - } - leaf clli { - type string; - mandatory true; - description - "CLLI"; - } - uses org-openroadm-resource-types:device-id; - container site; - container tx-direction { - uses service-port; - uses service-lgx; - uses service-tail; - } - container rx-direction { - uses service-port; - uses service-lgx; - uses service-tail; - } - leaf optic-type { - type org-openroadm-common-types:optic-types; - } - container router { - description - "Needed for communication with DWDM pluggable"; - leaf node-id { - type string; - description - "Node id. This is reported against the service, but may not get reflected in the service in the network."; - } - leaf ip-address { - type inet:ip-address; - description - "Router IP Address. This is reported against the service, but may not get reflected in the service in the network."; - } - leaf url { - type string; - description - "URL needed for communication with DWDM pluggable. This is reported against the service, but may not get reflected in the service in the network."; - } - } - leaf user-label { - type string; - mandatory false; - description - "Label for service endpoint, defined by the user"; - } - } - - typedef rpc-actions { - description "rpc-actions include all the rpc methods"; - type enumeration { - enum service-create { - value "1"; - } - enum service-feasibility-check { - value "2"; - } - enum service-delete { - value "3"; - } - enum equipment-notification { - value "4"; - } - enum temp-service-create { - value "5"; - } - enum temp-service-delete { - value "6"; - } - enum service-roll { - value "7"; - } - enum service-reconfigure { - value "8"; - } - enum service-restoration { - value "9"; - } - enum service-reversion { - value "10"; - } - enum service-reroute { - value "11"; - } - enum service-reroute-confirm { - value "12"; - } - enum network-re-optimization { - value "13"; - } - } - } - - grouping sdnc-request-header { - container sdnc-request-header { - leaf request-id { - type string; - } - leaf rpc-action { - type rpc-actions; - } - leaf notification-url { - type string; - } - leaf request-system-id{ - type string; - } - } - } - - grouping service-port { - container port { - leaf port-device-name { - type string; - } - leaf port-type { - type string; - } - leaf port-name { - type string; - } - leaf port-rack { - type string; - } - leaf port-shelf { - type string; - } - leaf port-slot { - type string; - } - leaf port-sub-slot { - type string; - } - } - } - - grouping service-lgx { - container lgx { - leaf lgx-device-name { - type string; - } - leaf lgx-port-name { - type string; - } - leaf lgx-port-rack { - type string; - } - leaf lgx-port-shelf { - type string; - } - } - } - - grouping service-tail { - container tail { - container tail-roadm { - description - "ROADM on which the transponder is connected to (TID, IP Address, - or FQDN)"; - uses org-openroadm-resource-types:device-id; - } - container xponder-port { - description - "Muxponder port used in tail, that will get used as a service endpoint."; - leaf circuit-pack-name { - type string; - } - leaf port-name { - type string; - } - } - leaf tail-roadm-port-aid { - type string; - description - "This will provide the transponder port needed to inter-city ROADM - connection"; - } - leaf tail-roadm-port-rack-location { - type string; - description - "Transponder's location"; - } - } - } - - grouping service-information { - leaf due-date { - type yang:date-and-time; - description - "Date and time service to be turn up. If time is not specified for a given date, default to midnight. Service turned up immediately if no due date is specified"; - } - leaf end-date { - type yang:date-and-time; - description - "Date and time service to be removed"; - mandatory false; - } - leaf nc-code { - type string; - description - "NC code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network."; - } - leaf nci-code { - type string; - description - "NCI code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network."; - } - leaf secondary-nci-code { - type string; - description - "NC code applied to wavelength service only.This is reported against the service, but may not get reflected in the service in the network."; - } - leaf customer { - type string; - description - "To be included in ticket information.This is reported against the service, but may not get reflected in the service in the network."; - } - leaf customer-contact { - type string; - description - "Customer contact information To be included in ticket information. This is reported against the service, but may not get reflected in the service in the network."; - } - leaf operator-contact { - type string; - description - "Operator contact information to be included in ticket information. This is reported against the service, but may not get reflected in the service in the network."; - } - } - - grouping service { - leaf service-name { - type string; - description - "Identifier for the service to be created in - the ROADM network, e.g., CLFI, CLCI, etc."; - mandatory true; - } - leaf common-id { - type string; - description - "To be used by the ROADM controller to identify the routing - constraints received from planning application (PED)."; - } - uses sdnc-request-header; - leaf connection-type { - type connection-type; - mandatory true; - description - "Connection type"; - } - leaf lifecycle-state { - type org-openroadm-common-types:lifecycle-state; - description - "Lifecycle State of service. Whether it is planned, deployed, in maintenance, etc."; - } - leaf administrative-state { - type org-openroadm-common-types:state; - description - "Administrative State: Intended state of service"; - } - leaf operational-state { - type org-openroadm-common-types:state; - config false; - description - "Operational State: Actual state of service"; - } - leaf condition { - type service-condition; - description - "Service Condition: Additional information about the state of the service. Only sent when applicable."; - } - container service-a-end { - uses service-endpoint; - } - container service-z-end { - uses service-endpoint; - } - uses org-openroadm-routing-constraints:routing-constraints; - uses service-information; - leaf latency { - type uint32; - description - "Latency on service"; - } - leaf-list fiber-span-srlgs { - type string; - description - "Shared risk link group identifiers"; - } - list equipment-srgs { - key "srg-number"; - uses org-openroadm-resource-types:srg-number; - } - leaf-list supporting-service-name { - description - "The service name that this runs over top. If connection-type is service, then this is the related - connection-type = infrastructure service, for example."; - type string; - } - container topology { - uses org-openroadm-topology:topology; - } - } - - grouping service-notification-result { - leaf service-name { - type string; - description - "Identifier for the service e.g., CLFI, CLCI, etc."; - mandatory true; - } - leaf actual-date { - type yang:date-and-time; - description - "Actual date and time (if successful)"; - } - } - - typedef service-format { - type enumeration { - enum "Ethernet" { - value 1; - } - enum "OTU" { - value 2; - } - enum "OC" { - value 3; - } - enum "STM" { - value 4; - } - enum "OMS" { - value 5; - } - enum "ODU" { - value 6; - } - enum "OTM" { - value 7; - } - } - } - - typedef service-notification-types { - type enumeration { - enum "service-create-result" { - value 1; - } - enum "service-reconfigure-result" { - value 2; - } - enum "service-delete-result" { - value 3; - } - enum "service-roll-result" { - value 4; - } - enum "service-revert-result" { - value 5; - } - enum "service-reroute-result" { - value 6; - } - enum "service-restoration-result" { - value 7; - } - } - } - - typedef connection-type { - type enumeration { - enum "service" { - value 1; - } - enum "infrastructure" { - value 2; - } - enum "roadm-line" { - value 3; - } - } - } - - typedef service-condition { - type enumeration { - enum "restored-temporarily" { - value 1; - } - enum "re-routed-temporarily" { - value 2; - } - enum "activated-for-service" { - value 3; - } - enum "activated-for-further-check" { - value 4; - } - enum "activated-for-troubleshooting-failure" { - value 5; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-common-types.yang b/tests/ordmodels_1.2.1/org-openroadm-common-types.yang deleted file mode 100644 index e52b12bea..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-common-types.yang +++ /dev/null @@ -1,282 +0,0 @@ -module org-openroadm-common-types { - namespace "http://org/openroadm/common-types"; - prefix org-openroadm-common-types; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of common types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping physical-location { - leaf rack { - type string; - mandatory false; - } - leaf shelf { - type string; - mandatory false; - } - leaf slot { - type string; - mandatory false; - } - leaf subSlot { - type string; - mandatory false; - } - } - - typedef node-types { - type enumeration { - enum "rdm" { - value 1; - } - enum "xpdr" { - value 2; - } - } - description - "3 digit identifier for node type - 1. rdm for ROADM - 2. xpdr for Transponder, Regen"; - } - - typedef power-dBm { - description - "Power value in dBm."; - type decimal64 { - fraction-digits 2; - } - units "dBm"; - } - - typedef ratio-dB { - description - "Power ratio in dB."; - type decimal64 { - fraction-digits 3; - } - units "dB"; - } - - typedef severity { - description - "Severity, based on X.733 perceived severity"; - type enumeration { - enum "critical" { - value 1; - } - enum "major" { - value 2; - } - enum "minor" { - value 3; - } - enum "warning" { - value 4; - } - enum "clear" { - value 5; - } - enum "indeterminate" { - value 6; - } - } - } - - typedef rpc-status { - description - "status of RPC "; - type enumeration { - enum "Successful" { - value 1; - } - enum "Failed" { - value 2; - } - } - } - - grouping rpc-response-status { - leaf status { - type rpc-status; - mandatory true; - description - "Successful or Failed"; - } - leaf status-message { - type string; - description - "Gives a more detailed reason for failure"; - } - } - - typedef lifecycle-state { - description - "Lifecycle state."; - type enumeration { - enum "deployed" { - value 1; - } - enum "planned" { - value 2; - } - enum "maintenance" { - value 3; - } - enum "deploying" { - value 4; - } - enum "undeploying" { - value 5; - } - } - } - - typedef state { - description - "State that indicates whether the resource is able to provide fullfill its role - carry traffic, etc."; - type enumeration { - enum "inService" { - value 1; - } - enum "outOfService" { - value 2; - } - enum "degraded" { - value 3; - } - } - } - - typedef optic-types { - type enumeration { - enum "gray" { - value 1; - } - enum "dwdm" { - value 2; - } - } - } - grouping equipment-type { - leaf type { - type equipment-type-enum; - mandatory true; - config false; - } - leaf extension { - description - "Populated with equipment type when enum value is set to vendorExtension"; - type string; - mandatory false; - config false; - } - } - - typedef equipment-type-enum { - type enumeration { - enum "other" { - value 1; - } - enum "powerSupply" { - value 2; - } - enum "shelfProcessor" { - value 3; - } - enum "crossConnect" { - value 4; - } - enum "fan" { - value 5; - } - enum "accessPanel" { - value 6; - } - enum "circuitPack" { - value 7; - } - } - } - - typedef optical-control-mode { - description - "Optical Control Mode: identifies specific algorithm related to power management and general optical control."; - type enumeration { - enum "power" { - value 1; - } - enum "gainLoss" { - value 2; - } - enum "off" { - value 3; - } - } - reference "openroadm.org: Open ROADM MSA Specification."; - } - - typedef direction { - type enumeration { - enum "tx" { - value 1; - } - enum "rx" { - value 2; - } - enum "bidirectional" { - value 3; - } - } - } - - typedef pm-direction { - type enumeration { - enum "tx" { - value 1; - } - enum "rx" { - value 2; - } - enum "bidirectional" { - value 3; - } - enum "notApplicable" { - value 4; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-database.yang b/tests/ordmodels_1.2.1/org-openroadm-database.yang deleted file mode 100644 index 991e1cb59..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-database.yang +++ /dev/null @@ -1,119 +0,0 @@ -module org-openroadm-database { - namespace "http://org/openroadm/database"; - prefix org-openroadm-database; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "This module contains definitions for System Management. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - rpc db-backup { - description - "copy running DB to user provided file to a given path"; - input { - leaf filename { - type string { - length "10..255"; - } - description - "Path and file name is used with back-up.(xxx.DBS)"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc db-restore { - description - "Restore database "; - input { - leaf filename { - type string { - length "10..255"; - } - description - "PATH/file name use file name.(xxx.DBS)"; - } - leaf nodeIDCheck { - type boolean; - default "true"; - description - "Flag to indicate if sysNameCheck is required"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc db-activate { - description - "activate the database"; - input { - leaf rollBackTimer { - type string; - description - "rollbackTimer "; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc cancel-rollback-timer { - description - "Cancel roll back timer which user provisioned as part of activate command"; - input { - leaf accept { - type boolean; - description - " TRUE means rollback timer is cancelled and new load is accepted"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc database-init { - description - "Initialize the database to default DB"; - output { - uses org-openroadm-common-types:rpc-response-status; - } //output - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-de-operations.yang b/tests/ordmodels_1.2.1/org-openroadm-de-operations.yang deleted file mode 100644 index 26c3673ef..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-de-operations.yang +++ /dev/null @@ -1,77 +0,0 @@ -module org-openroadm-de-operations { - namespace "http://org/openroadm/de/operations"; - prefix org-openroadm-de-operations; - - import org-openroadm-resource { - prefix org-openroadm-resource; - } - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of operations. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - rpc restart { - description - "Restart a resource with warm/cold option. If no resource is provided or only the device name is provded, then the device itself will be restarted. - Note that resources on the device will not be restartable"; - input { - uses org-openroadm-resource:resource; - leaf option{ - type enumeration{ - enum "warm"{ - value 1; - } - enum "cold"{ - value 2; - } - } - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - notification restart-notification { - description - "This Notification is sent when a resource on a device has completed a restart. This is sent as a result of restarts triggered via the - restart RPC and other means. The resource identified is the from the RPC request or the equivalment if the restart was triggered another way."; - uses org-openroadm-resource:resource; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang b/tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang deleted file mode 100644 index eb2d9a2c3..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-device-resource-types.yang +++ /dev/null @@ -1,217 +0,0 @@ -module org-openroadm-device-resource-types { - namespace "http://org/openroadm/de/device-resource-types"; - prefix org-openroadm-device-resource-types; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of resource types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping device-id { - description - "Device identifier. Unique within the Controller."; - leaf node-id { - description - "Node Id. Globally unique identifier for a device."; - type leafref { - path "/org-openroadm-device/info/node-id"; - } - mandatory true; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping shelf-name { - leaf shelf-name { - description - "Shelf identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/shelves/shelf-name"; - } - mandatory true; - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping physical-link-name { - leaf physical-link-name { - description - "Physical Link identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/physical-link/physical-link-name"; - } - mandatory true; - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping internal-link-name { - uses org-openroadm-device:circuit-pack-name; - leaf internal-link-name { - description - "Internal Link identifier. Unique within the context of a circuit pack."; - type leafref { - path "/org-openroadm-device/internal-link/internal-link-name"; - } - mandatory true; - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping connection-number { - leaf connection-number { - description - "Connection identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/connections/connection-number"; - } - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping this-will-test-ids { - uses device-id; - container shelf { - uses shelf-name; - } - container circuit-pack { - uses org-openroadm-device:circuit-pack-name; - } - container port { - uses org-openroadm-device:port-name; - } - uses internal-link-name; - uses physical-link-name; - uses connection-number; - uses org-openroadm-device:srg-number; - uses org-openroadm-device:degree-number; - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping xponder-device-id { - description - "Xponder identifier. Unique within the Controller."; - leaf node-id { - description - "Xponder Id. Globally unique identifier for the device"; - type leafref { - path "/org-openroadm-device/info/node-id"; - } - mandatory true; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping xponder-number { - leaf xponder-number { - description - "Xponder identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/xponders/xponder-number"; - } - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping xponder-shelf-name { - uses xponder-number; - leaf shelf-name { - description - "Shelf identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/xponders[xponder-number=current()/../xponder-number]/shelves/shelf-name"; - } - mandatory true; - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping xponder-circuit-pack-name { - uses xponder-number; - leaf circuit-pack-name { - description - "Circuit Pack identifier. Unique within the context of a xponder."; - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping xponder-port-name { - uses xponder-circuit-pack-name; - leaf port-name { - description - "Port identifier. Unique within the context of a circuit-pack."; - type leafref { - path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name"; - } - config false; - } - } -*/ - -/* Currently not used; if used later, needs to move to org-openroadm-device.yang so leafref can be resolved. - grouping this-will-test-xponder-ids { - uses xponder-device-id; - container shelf { - uses xponder-shelf-name; - } - container circuit-pack { - uses xponder-circuit-pack-name; - } - container port { - uses xponder-port-name; - } - } -*/ -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-device.yang b/tests/ordmodels_1.2.1/org-openroadm-device.yang deleted file mode 100644 index e17d0ecfb..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-device.yang +++ /dev/null @@ -1,1213 +0,0 @@ -module org-openroadm-device { - namespace "http://org/openroadm/device"; - prefix org-openroadm-device; - - import ietf-yang-types { - prefix ietf-yang-types; - } - import ietf-inet-types { - prefix ietf-inet-types; - } - import ietf-netconf { - prefix ietf-nc; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } - import org-openroadm-wavelength-map { - prefix org-openroadm-wavelength-map; - } - import org-openroadm-physical-types { - prefix org-openroadm-physical-types; - } - import org-openroadm-user-mgmt { - prefix org-openroadm-user-mgmt; - } - import org-openroadm-port-types { - prefix org-openroadm-port-types; - } - import org-openroadm-interfaces { - prefix org-openroadm-interfaces; - } - import org-openroadm-swdl { - prefix org-openroadm-swdl; - } - import org-openroadm-equipment-states-types { - prefix org-openroadm-equipment-states-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of ROADM device - - 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. - - Also contains code components extracted from IETF netconf. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2017-02-06 { - description - "Version 1.2.1 - removed pattern for current-datetime in info tree and rpc"; - } - - revision 2016-10-14 { - description - "Version 1.2"; - } - - rpc get-connection-port-trail { - input { - leaf connection-number { - type string; - mandatory true; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - list ports { - uses org-openroadm-common-types:physical-location; - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - } - } - rpc disable-automatic-shutoff { - input { - leaf amp { - type leafref { - path "/org-openroadm-device/shelves/shelf-name"; - } - mandatory true; - description - "The shelf where amp is located"; - } - leaf degree-number { - type uint16; - mandatory true; - } - leaf support-timer { - type uint16 { - range "1..600"; - } - default "20"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc start-scan { - input { - leaf degree-number { - type uint16; - mandatory true; - } - leaf port-direction { - type org-openroadm-common-types:direction; - } - leaf distance { - type uint32; - } - leaf resolution { - type uint32; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - - notification otdr-scan-result { - leaf status { - type enumeration { - enum "Completed" { - value 1; - } - enum "Failed" { - value 2; - } - } - mandatory true; - description - "Completed or Failed for the scan's final status"; - } - leaf result-file { - type string; - } - } - - rpc set-current-datetime { - description - "Set the info/current-datetime leaf to the specified value."; - input { - leaf current-datetime { - type ietf-yang-types:date-and-time; - mandatory true; - description - "The current system date and time in UTC. Format: YYYY-MM-DDTHH:MM:SS"; - } - } - - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - - grouping device-common { - leaf node-id { - type string; - description - "Globally unique identifer for a device."; - default "openroadm"; - } - leaf node-number { - type uint32; - description - "Number assigned to a ROADM node at a - given office"; - } - leaf node-type { - type org-openroadm-common-types:node-types; - description - "Identifier for node-type e.g Roadm, xponder"; - config false; - mandatory true; - } - leaf clli { - type string; - description - "Common Language Location Identifier."; - } - uses org-openroadm-physical-types:node-info; - leaf ipAddress { - type ietf-inet-types:ip-address; - description - "IP Address of device"; - } - leaf prefix-length { - type uint8 { - range "0..128"; - } - description - "The length of the subnet prefix"; - } - leaf defaultGateway { - type ietf-inet-types:ip-address; - description - "Default Gateway"; - } - leaf source { - type enumeration { - enum "static" { - value 1; - } - enum "dhcp" { - value 2; - } - } - config false; - } - leaf current-ipAddress { - type ietf-inet-types:ip-address; - config false; - description - "Current IP Address of device"; - } - leaf current-prefix-length { - type uint8 { - range "0..128"; - } - config false; - description - "The current length of the subnet prefix"; - } - leaf current-defaultGateway { - type ietf-inet-types:ip-address; - config false; - description - "Current Default Gateway"; - } - leaf macAddress { - type ietf-yang-types:mac-address; - description - "MAC Address of device"; - config false; - } - leaf softwareVersion { - type string; - config false; - description - "Software version"; - } - leaf template { - type string; - description - "Template information used in the deployment."; - } - leaf current-datetime { - type ietf-yang-types:date-and-time; - config false; - description - "The current system date and time in UTC. Format: YYYY-MM-DDTHH:MM:SS.mm+ "; - } - container geoLocation { - description - "GPS location"; - leaf latitude { - type decimal64 { - fraction-digits 16; - range "-90 .. 90"; - } - description - "[From wikipedia] Latitude is an angle (defined below) - which ranges from 0° at the Equator to 90° (North or - South) at the poles"; - } - leaf longitude { - type decimal64 { - fraction-digits 16; - range "-180 .. 180"; - } - description - "[From wikipedia] The longitude is measured as the - angle east or west from the Prime Meridian, ranging - from 0° at the Prime Meridian to +180° eastward and - −180° westward."; - } - } - } - - grouping slot-info { - description - "slots information. To be populated by NE during retrieval."; - leaf slot-name { - type string; - description - "The name of this slot."; - } - leaf label { - type string; - description - "Faceplate label"; - } - leaf provisioned-circuit-pack { - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - description - "The supported circuit-pack. It will be empty if no provision on this slot."; - } - } - grouping shelves { - list shelves { - key "shelf-name"; - uses shelf; - } - } - grouping shelf { - leaf shelf-name { - description - "Unique identifier for this shelf within a device"; - type string; - } - leaf shelf-type { - description - "The shelf type: describe the shelf with a unique string."; - type string; - mandatory true; - } - leaf rack { - description - "Reflect the shelf physical location data including floor, aisle, bay values."; - type string; - } - leaf shelf-position { - description - "Reflect the shelf vertical position within an equipment bay."; - type string; - } - leaf administrative-state { - description - "Admin State of the shelf"; - type org-openroadm-equipment-states-types:admin-states; - } - uses org-openroadm-physical-types:common-info; - leaf equipment-state { - type org-openroadm-equipment-states-types:states; - description - "equipment state for the shelf, used to track the lifecycle state."; - } - leaf due-date { - type ietf-yang-types:date-and-time; - description - "due date for the shelf."; - } - list slots { - description - "List of slots on this shelf. To be populated by NE during retrieval."; - key "slot-name"; - config false; - uses slot-info; - } - } - - grouping circuit-packs { - list circuit-packs { - description - "List of circuit packs. This includes common equipment, like fans, power supplies, etc."; - key "circuit-pack-name"; - leaf circuit-pack-type { - description - "Type of circuit-pack"; - type string; - mandatory true; - } - leaf circuit-pack-product-code { - description - "Product Code for the circuit-pack"; - type string; - } - uses circuit-pack; - } - } - - grouping circuit-pack { - leaf circuit-pack-name { - description - "Unique identifier for this circuit-pack within a device"; - type string; - } - leaf administrative-state { - description - "Administrative state of circuit-pack"; - type org-openroadm-equipment-states-types:admin-states; - } - uses org-openroadm-physical-types:common-info; - container circuit-pack-category { - description - "General type of circuit-pack"; - uses org-openroadm-common-types:equipment-type; - config false; - } - leaf equipment-state { - description - "Equipment state, which complements operational state."; - type org-openroadm-equipment-states-types:states; - } - leaf circuit-pack-mode { - description - "Circuit-pack mode allowed. e.g. NORMAL or REGEN"; - type string; - default "NORMAL"; - } - leaf shelf { - type leafref { - path "/org-openroadm-device/shelves/shelf-name"; - } - mandatory true; - } - leaf slot { - type string; - mandatory true; - } - leaf subSlot { - type string; - mandatory false; - } - leaf due-date { - type ietf-yang-types:date-and-time; - description - "due date for this circuit-pack."; - } - container parent-circuit-pack { - description - "In the case of circuit packs that contain other equipment (modules or pluggables), this captures the hierarchy of that equipment. It is a vendor specific design decision if the ports for single-port pluggables are modeled as children of the parent circuit-pack, or as children of the pluggable circuit-pack contained in the parent circuit-pack. For modules with multiple ports, it is recommended that ports be children of the module and not the carrier, to help in fault correlation and isolation in the case of a module failure."; - uses circuit-pack-name; - leaf cp-slot-name { - type string; - description - "Slot name on parent-circuit-pack."; - } - } - list cp-slots { - description - "List of circuit-pack slots on this circuit-pack. To be populated by NE during retrieval."; - key "slot-name"; - config false; - uses slot-info; - } - list ports { - key "port-name"; - description - "List of ports on this circuit-pack. For single port pluggables, the port may be modeled against the pluggable itself, or against the parent-circuit-pack. For mulit-port pluggables, it is recommended that ports be modeled against the module itself. Modeling ports as close to the equipment hierarchy as possible will help in fault correlation and isolation since common failures associated with supporting equipment can be used to help identify symptomatic failures on the contained ports."; - uses port; - container roadm-port { - when "../port-qual='roadm-external'"; - uses org-openroadm-port-types:roadm-port; - } - container transponder-port { - when "../port-qual='xpdr-network' or ../port-qual='xpdr-client'"; - uses org-openroadm-port-types:common-port; - } - container otdr-port { - when "../port-qual='otdr'"; - description - "Settings for otdr port."; - leaf launch-cable-length { - type uint32; - default "30"; - units "m"; - } - leaf port-direction { - type org-openroadm-common-types:direction; - } - } - } - } - - grouping connection { - description - "Grouping used to define connections."; - leaf connection-number { - type string; - } - leaf wavelength-number { - type uint32; - mandatory true; - description - "wavelength-number, can be used to access wavelength-map - to get wavelength value in nm."; - } - leaf opticalControlMode { - description - "Whether connection is currently in power or gain/loss mode"; - type org-openroadm-common-types:optical-control-mode; - reference "openroadm.org: Open ROADM MSA Specification."; - default "off"; - } - leaf target-output-power { - type org-openroadm-common-types:power-dBm; - description - "The output target power for this connection. When set, the ROADM will work to ensure that current-output-power reaches this level."; - } - container source { - leaf src-if { - type leafref { - path "/org-openroadm-device/interface/name"; - } - mandatory true; - } - } - container destination { - leaf dst-if { - type leafref { - path "/org-openroadm-device/interface/name"; - } - mandatory true; - } - } - } - - grouping degree { - leaf degree-number { - type uint16; - must "not( current() > /org-openroadm-device/info/max-degrees) and current() > 0" { - error-message "Degree not supported by device "; - description - "Validating if the degree is supported by device"; - } - } - leaf max-wavelengths { - type uint16; - description - "maximum number of wavelengths"; - config false; - mandatory true; - } - list circuit-packs { - key "index"; - description - "list for Cards associated with a degree"; - leaf index { - type uint32; - } - uses circuit-pack-name { - refine "circuit-pack-name" { - mandatory true; - } - } - } - list connection-ports { - description - "Port associated with degree: One if bi-directional; two if uni-directional"; - key "index"; - leaf index { - type uint32; - } - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - container otdr-port { - description - "otdr port associated with degree."; - uses port-name; - } - } - - grouping external-links { - description - "YANG definitions for external links.. - - physical links between ROADMs and between the ROADMs and XPonders, which can be added and removed maually."; - list external-link { - key "external-link-name"; - uses external-link; - } - } - - grouping external-link { - leaf external-link-name { - type string; - } - container source { - uses org-openroadm-resource-types:device-id { - refine "node-id" { - mandatory true; - } - } - uses org-openroadm-resource-types:port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - container destination { - uses org-openroadm-resource-types:device-id { - refine "node-id" { - mandatory true; - } - } - uses org-openroadm-resource-types:port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - } - - grouping internal-links { - list internal-link { - key "internal-link-name"; - config false; - uses internal-link; - } - } - - grouping internal-link { - leaf internal-link-name { - type string; - } - container source { - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - container destination { - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - } - - grouping physical-links { - description - "YANG definitions for physical links. - - phyical links between cards within a ROADM, which are populated by the ROADM and cannot be added or removed manually. "; - list physical-link { - key "physical-link-name"; - uses physical-link; - } - } - - grouping physical-link { - leaf physical-link-name { - type string; - } - container source { - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - container destination { - uses port-name { - refine "circuit-pack-name" { - mandatory true; - } - refine "port-name" { - mandatory true; - } - } - } - } - - grouping srg { - leaf max-add-drop-ports { - type uint16; - config false; - mandatory true; - } - leaf srg-number { - type uint16; - must "not(current()>/org-openroadm-device/info/max-srgs) and current()>0" { - error-message "invalid SRG"; - description - "Validating if the srg is supported by add/drop group"; - } - } - leaf wavelengthDuplication { - description - "Whether the SRG can handle duplicate wavelengths and if so to what extent."; - config false; - mandatory true; - type enumeration { - enum "onePerSRG" { - description - "The SRG cannot handle wavelength duplication. Attempting to provision a connection on this SRG that uses the same wavelength as an existing service will result in failure."; - value 1; - } - enum "onePerDegree" { - description - "The SRG can handle wavelength duplication, but only one per degree. Attempting to provision a connection on this SRG that uses the same wavelength as an existing service will succeed, so long as the connections are not using the same degree."; - value 2; - } - } - } - list circuit-packs { - key "index"; - description - "list for Cards associated with an add/drop group and srg"; - leaf index { - type uint32; - } - uses circuit-pack-name { - refine "circuit-pack-name" { - mandatory true; - } - } - } - } - - grouping degree-number { - leaf degree-number { - description - "Degree identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/degree/degree-number"; - } - } - } - - grouping circuit-pack-name { - leaf circuit-pack-name { - description - "Circuit-Pack identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - } - } - - grouping port-name { - uses circuit-pack-name; - leaf port-name { - description - "Port identifier. Unique within the context of a circuit-pack."; - type leafref { - path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name"; - } - } - } - - grouping srg-number { - leaf srg-number { - description - "Shared Risk Group identifier. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/shared-risk-group/srg-number"; - } - } - } - - grouping supporting-port-name { - leaf supporting-circuit-pack-name { - description - "Identifier of the supporting circuit-pack."; - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - mandatory true; - } - leaf supporting-port { - description - "Identifier of the supporting port."; - mandatory true; - type leafref { - path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../supporting-circuit-pack-name]/ports/port-name"; - } - } - } - - grouping interface-name { - leaf interface-name { - description - "Name of an interface. Unique within the context of a device."; - type leafref { - path "/org-openroadm-device/interface/name"; - } - config false; - } - } - - grouping interfaces-grp { - description - "OpenROADM Interface configuration parameters."; - list interface { - key "name"; - description - "The list of configured interfaces on the device."; - leaf name { - type string; - description - "The name of the interface."; - } - leaf description { - type string; - description - "A textual description of the interface."; - } - leaf type { - type identityref { - base org-openroadm-interfaces:interface-type; - } - mandatory true; - description - "The type of the interface."; - } - leaf administrative-state { - type org-openroadm-equipment-states-types:admin-states; - } - leaf operational-state { - type org-openroadm-common-types:state; - config false; - } - leaf circuit-id { - type string { - length "0..45"; - } - description - "circuit identifier/user label, - can be used in alarm correlation and/or connection management "; - } - leaf supporting-interface { - type leafref { - path "/org-openroadm-device/interface/name"; - } - } - uses supporting-port-name; - } - } - - grouping port { - description - "Grouping of attributes related to a port object."; - leaf port-name { - type string; - mandatory true; - description - "Identifier for a port, unique within a circuit pack"; - } - leaf port-type { - type string; - description - "Type of the pluggable or fixed port."; - } - leaf port-qual { - type enumeration { - enum "roadm-internal" { - value 1; - } - enum "roadm-external" { - value 2; - } - enum "xpdr-network" { - value 3; - } - enum "xpdr-client" { - value 4; - } - enum "otdr" { - value 5; - } - } - } - leaf port-wavelength-type { - type org-openroadm-port-types:port-wavelength-types; - config false; - description - "Type of port - single, multiple-wavelength, etc."; - } - leaf port-direction { - type org-openroadm-common-types:direction; - config false; - mandatory true; - description - "Whether port is uni (tx/rx) or bi-directional and"; - } - leaf label { - type string; - config false; - description - "Faceplate label"; - } - leaf circuit-id{ - type string{ - length "0..45"; - } - description - "circuit identifier/user label, - can be used in alarm correlation and/or connection management "; - - } - leaf administrative-state { - type org-openroadm-equipment-states-types:admin-states; - description - "Administrative state of port. The value of this field independant of the state of its contained and containing resources. Setting this a port to administratively down will impact both its operational state, as well the operational state of its contained resources. If this port is an endpoint to a connection, internal-link, physical-link, etc, then administratevely disabling this port will impact the operational state of those items unless they are using some form of port-protection schema."; - default "outOfService"; - } - leaf operational-state { - type org-openroadm-common-types:state; - config false; - mandatory true; - description - "Operational state of a port"; - } - leaf-list supported-interface-capability { - description - "Interface types supported on this port"; - config false; - type identityref { - base org-openroadm-port-types:supported-if-capability; - } - } - leaf logical-connection-point { - type string; - description - "delete or replace with list logical-ports or connections?"; - } - container partner-port { - config false; - description - "For ports which are not identified as having a direction of bidirectional, this field is used to identify the port which corresponds to the reverse direction. A port pair should include a port for each direction (tx, rx) and report their mate as partner-port."; - uses port-name; - } - container parent-port { - config false; - description - "In the case of port hierarchy, this is the parent port, which is also modeled as port within this circuit-pack. This is used in the case of a port that supports a parallel connector that contains subports. The parent-port of the subport will be the port that contains this subport. This can be used to help isolate faults when a single fault on a parallel connector introduces symptomatic failures on the contained subports."; - uses port-name; - } - list interfaces { - config false; - description - "List of the interfaces this port supports. This is a list of names of instances in the flat instance list"; - uses interface-name; - } - } - - uses org-openroadm-device-container; - - grouping org-openroadm-device-container { - container org-openroadm-device { - container info { - uses device-common; - leaf max-degrees { - type uint16; - description - "Max. number of degrees supported by device"; - config false; - } - leaf max-srgs { - type uint16; - description - "Max. number of SRGs in an add/drop group"; - config false; - } - } - container users { - description - "Stores a list of users"; - uses org-openroadm-user-mgmt:user-profile; - } - container pending-sw { - config false; - uses org-openroadm-swdl:sw-bank; - } - uses shelves; - uses circuit-packs; - uses interfaces-grp; - container protocols { - description - "Contains the supported protocols"; - } - container wavelength-map { - description - "The wavelength-number and center frequency, wavelength mapping"; - config false; - uses org-openroadm-wavelength-map:wavelength-map-g; - } - uses internal-links; - uses physical-links; - uses external-links; - list degree { - when "/org-openroadm-device/info/node-type='rdm'"; - key "degree-number"; - uses degree; - } - list shared-risk-group { - when "/org-openroadm-device/info/node-type='rdm'"; - key "srg-number"; - uses srg; - } - list roadm-connections { - when "/org-openroadm-device/info/node-type='rdm'"; - key "connection-number"; - uses connection; - } - list connection-map { - key "connection-map-number"; - config false; - leaf connection-map-number { - description - "Unique identifier for this connection-map entry"; - type uint32; - } - container source { - leaf circuit-pack-name { - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - mandatory true; - } - leaf port-name { - description - "Port identifier. Unique within the context of a circuit-pack."; - type leafref { - path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name"; - } - mandatory true; - } - } - list destination { - key "circuit-pack-name port-name"; - min-elements 1; - leaf circuit-pack-name { - type leafref { - path "/org-openroadm-device/circuit-packs/circuit-pack-name"; - } - mandatory true; - } - leaf port-name { - description - "Port identifier. Unique within the context of a circuit-pack."; - type leafref { - path "/org-openroadm-device/circuit-packs[circuit-pack-name=current()/../circuit-pack-name]/ports/port-name"; - } - mandatory true; - } - } - } - } - } - - grouping common-session-parms { - description - "Common session parameters to identify a - management session."; - - leaf username { - type string; - mandatory true; - description - "Name of the user for the session."; - } - - leaf session-id { - type ietf-nc:session-id-or-zero-type; - mandatory true; - description - "Identifier of the session. - A NETCONF session MUST be identified by a non-zero value. - A non-NETCONF session MAY be identified by the value zero."; - } - - leaf source-host { - type ietf-inet-types:ip-address; - description - "Address of the remote host for the session."; - } - } - grouping changed-by-parms { - description - "Common parameters to identify the source - of a change event, such as a configuration - or capability change."; - - container changed-by { - description - "Indicates the source of the change. - If caused by internal action, then the - empty leaf 'server' will be present. - If caused by a management session, then - the name, remote host address, and session ID - of the session that made the change will be reported."; - choice server-or-user { - leaf server { - type empty; - description - "If present, the change was caused - by the server."; - } - - case by-user { - uses common-session-parms; - } - } // choice server-or-user - } // container changed-by-parms - } - notification change-notification { - description - "The Notification that a resource has been added, modified or removed. - This notification can be triggered by changes in configuration and operational data. - It shall contain the changed field pointed by the xpath. - Typically it is not intended for frequently changing volatile data e.g. PM, power levels"; - - leaf change-time { - description "The time the change occurs."; - type ietf-yang-types:date-and-time; - } - uses changed-by-parms; - - leaf datastore { - type enumeration { - enum running { - description "The datastore has changed."; - } - enum startup { - description "The datastore has changed"; - } - } - default "running"; - description - "Indicates which configuration datastore has changed."; - } - list edit { - description - "An edit (change) record SHOULD be present for each distinct - edit operation that the server has detected on - the target datastore. This list MAY be omitted - if the detailed edit operations are not known. - The server MAY report entries in this list for - changes not made by a NETCONF session."; - - leaf target { - type instance-identifier; - description - "Topmost node associated with the configuration or operationa change. - A server SHOULD set this object to the node within - the datastore that is being altered. A server MAY - set this object to one of the ancestors of the actual - node that was changed, or omit this object, if the - exact node is not known."; - } - leaf operation { - type ietf-nc:edit-operation-type; - description - "Type of edit operation performed. - A server MUST set this object to the NETCONF edit - operation performed on the target datastore."; - } - } // list edit - } // notification change-notification -} \ No newline at end of file diff --git a/tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang b/tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang deleted file mode 100644 index 11ce8f55b..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-equipment-states-types.yang +++ /dev/null @@ -1,130 +0,0 @@ -module org-openroadm-equipment-states-types { - namespace "http://org/openroadm/equipment/states/types"; - prefix org-openroadm-equipment-states-types; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for types of states of equipment (slot/subslot). - - 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 2016-10-14 { - description - "Version 1.2"; - } - - typedef admin-states { - type enumeration { - enum "inService" { - value 1; - } - enum "outOfService" { - value 2; - } - enum "maintenance" { - value 3; - } - } - } - - typedef states { - type enumeration { - enum "reserved-for-facility-planned" { - value 1; - description - "equipment is planned for use by a service"; - } - enum "not-reserved-planned" { - value 2; - description - "equipment is planned by not reserved for any purpose"; - } - enum "reserved-for-maintenance-planned" { - value 3; - description - "equipment is planned for use as a maintenance spare"; - } - enum "reserved-for-facility-unvalidated" { - value 4; - description - "equipment is reserved for use by a service but not - validated against planned equipment"; - } - enum "not-reserved-unvalidated" { - value 5; - description - "equipment is not reserved for any purpose and - not validated against planned equipment"; - } - enum "unknown-unvalidated" { - value 6; - description - "unknown equipment not validated against planned equipment"; - } - enum "reserved-for-maintenance-unvalidated" { - value 7; - description - "equipment is to be used for use as a maintenance spare - but not validated against planned equipment"; - } - enum "reserved-for-facility-available" { - value 8; - description - "reserved for use by a service and available"; - } - enum "not-reserved-available" { - value 9; - description - "not reserved for use by a service and available"; - } - enum "reserved-for-maintenance-available" { - value 10; - description - "reserved as a maintenance spare and available"; - } - enum "reserved-for-reversion-inuse" { - value 11; - description - "equipiment that is reserved as part of a home path - for a service that has been temporarily re-routed"; - } - enum "not-reserved-inuse" { - value 12; - description - "equipment in use for a service"; - } - enum "reserved-for-maintenance-inuse" { - value 13; - description - "maintenance spare equipment that is in use as a - maintenance spare"; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang deleted file mode 100644 index 869a2c9cc..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-ethernet-interfaces.yang +++ /dev/null @@ -1,145 +0,0 @@ -module org-openroadm-ethernet-interfaces { - namespace "http://org/openroadm/ethernet-interfaces"; - prefix org-openroadm-eth-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - import org-openroadm-interfaces { - prefix openROADM-if; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for device facility ethernet interfaces. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - grouping eth-attributes { - leaf speed { - type uint32; - description - "Set speed of the interface, unit mbps. - This is for ETH facility. "; - } - leaf fec { - type enumeration { - enum off; - enum rsfec; - } - description "Forward Error Correction Choices. "; - } - leaf duplex { - type enumeration { - enum "half" { - value 0; - description - "half duplex"; - } - enum "full" { - value 1; - description - "full duplex"; - } - } - default "full"; - description - "Set duplex selections."; - } - leaf mtu { - type uint32 { - range "1518..9000"; - } - default "1522"; - description - "Set Maximum Frame Size."; - } - leaf auto-negotiation { - type enumeration { - enum "enabled" { - value 1; - description - "Auto Negotiation enabled"; - } - enum "disabled" { - value 0; - description - "Auto Negotiation disabled"; - } - } - default "enabled"; - description - "Set Auto Negotiation: Enabled/Disabled."; - } - leaf curr-speed { - config false; - type string; - description - "speed (UNKNOWN/AUTO/10/100/1000/10000) corresponding to the interface"; - } - leaf curr-duplex { - config false; - type string; - description - "duplex (HALF/FULL) corresponding to the interface"; - } - } - - grouping ethernet-container { - container ethernet { - description - "Ethernet Interfaces"; - uses eth-attributes; - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - when "org-openroadm-device:type = 'openROADM-if:ethernetCsmacd'"; - uses ethernet-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang b/tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang deleted file mode 100644 index 1e1c8ff10..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-file-transfer.yang +++ /dev/null @@ -1,145 +0,0 @@ -module org-openroadm-file-transfer { - namespace "http://org/openroadm/file-transfer"; - prefix org-openroadm-file-txr; - - import ietf-inet-types { - prefix inet; - } - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for file management related rpcs. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - rpc transfer { - description - "File transfer using FTP/SFTP"; - input { - leaf action { - mandatory true; - description - "Type of action - download/upload."; - type enumeration { - enum "upload" { - description - "Specify the upload action. The server sends - the file identified by the local-file-path - to the remote-file-path."; - } - enum "download" { - description - "Specify the download action. The server retrieves - the file identified by the remote-file-path - to the local-file-path."; - } - } - } - leaf local-file-path { - type string; - mandatory true; - description - "Local file path. - Ex: /var/shared/example.txt"; - } - leaf remote-file-path { - type inet:uri; - mandatory true; - description - "Remote file path. - A URI for the remote file path. - - Format:sftp://user[:password]@host[:port]/path. - Ex: sftp://test:verify@[2001:db8:0:1::10]:22/home/user/sample"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc show-file { - description - "Show one or more files in the specified directory."; - input { - leaf filename { - type string { - length "1..255"; - } - description - "Specify file(s) to be listed (* is allowed as wild-card). "; - } - } - output { - leaf status { - type enumeration { - enum "Successful" { - value 1; - } - enum "Failed" { - value 2; - } - } - mandatory true; - description - "Successful or Failed"; - } - leaf-list status-message { - type string; - description - "Gives a more detailed reason for success / failure"; - } - } - } - rpc delete-file { - description - "Delete one or more files in the specified directory."; - input { - leaf filename { - type string { - length "1..255"; - } - mandatory true; - description - "Specify file(s) to be deleted (* is allowed as wild-card)."; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-fwdl.yang b/tests/ordmodels_1.2.1/org-openroadm-fwdl.yang deleted file mode 100644 index 95225f3f9..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-fwdl.yang +++ /dev/null @@ -1,59 +0,0 @@ -module org-openroadm-fwdl { - namespace "http://org/openroadm/fwdl"; - prefix org-openroadm-fwdl; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "This module contains definitions for System Management. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - rpc fw-update { - description - "Fpga data update"; - input { - leaf circuit-pack-name { - type string; - description - "Name of the circuit pack"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-interfaces.yang deleted file mode 100644 index acd74fe6c..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-interfaces.yang +++ /dev/null @@ -1,108 +0,0 @@ -module org-openroadm-interfaces { - namespace "http://org/openroadm/interfaces"; - prefix openROADM-if; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for device facility interfaces. - Reused ietf-interfaces and some interface-type defined in iana-if-type. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - identity interface-type { - description - "Base identity from which specific interface types are - derived."; - } - - identity ethernetCsmacd { - base interface-type; - description - "For all Ethernet-like interfaces, regardless of speed, - as per RFC 3635."; - reference - "RFC 3635 - Definitions of Managed Objects for the - Ethernet-like Interface Types"; - } - - identity ip { - base interface-type; - description - "IP (for APPN HPR in IP networks)."; - } - - identity opticalChannel { - base interface-type; - description - "Optical Channel."; - } - - identity opticalTransport { - base interface-type; - description - "Optical Transport."; - } - - identity otnOdu { - base interface-type; - description - "OTN Optical Data Unit."; - } - - identity otnOtu { - base interface-type; - description - "OTN Optical channel Transport Unit."; - } - - identity openROADMOpticalMultiplex { - base interface-type; - description - "Optical Transport Multiplex type for openROADM"; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-layerRate.yang b/tests/ordmodels_1.2.1/org-openroadm-layerRate.yang deleted file mode 100644 index e9c7eb03b..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-layerRate.yang +++ /dev/null @@ -1,89 +0,0 @@ -module org-openroadm-layerRate { - namespace "http://org/openroadm/layerRate"; - prefix org-openroadm-layerRate; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of layer rates. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping layer-rate { - description - "Set list of layer rates, plus the ability to report layer rates not yet in set list."; - leaf type { - type layer-rate-enum; - mandatory true; - } - leaf extension { - type string; - mandatory false; - } - } - - typedef layer-rate-enum { - type enumeration { - enum "vendorExtension" { - value 1; - description - "vendor extension"; - } - enum "layer2" { - value 2; - description - "2"; - } - enum "layer3" { - value 3; - description - "3"; - } - enum "layer4" { - value 4; - description - "4"; - } - enum "layer5" { - value 5; - description - "5"; - } - enum "layer6" { - value 6; - description - "6"; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-lldp.yang b/tests/ordmodels_1.2.1/org-openroadm-lldp.yang deleted file mode 100644 index d7813304a..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-lldp.yang +++ /dev/null @@ -1,302 +0,0 @@ -module org-openroadm-lldp { - namespace "http://org/openroadm/lldp"; - prefix org-openroadm-lldp; - - import ietf-inet-types { - prefix inet; - } - import org-openroadm-device { - prefix org-openroadm-device; - } - import iana-afn-safi { - prefix ianaaf; - } - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } - import ietf-yang-types { - prefix yang; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for lldp protocol. - - 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 2016-10-14 { - description - "Version 1.2"; - } - grouping nbr-info-grp { - description - "Display LLDP Neighbour "; - - leaf remoteSysName { - type string; - description - "remote neighbour system name"; - } - leaf remoteMgmtAddressSubType { - type ianaaf:address-family; - description - "remote neighbour Management Address Subtype Enumeration"; - } - leaf remoteMgmtAddress { - type inet:ip-address; - description - "remote neighbour management address"; - } - leaf remotePortIdSubType { - type enumeration { - enum "other" { - value 0; - description - "reserved"; - } - enum "ifalias" { - value 1; - description - "Interface Alias (IfAlias - IETF RFC 2863) "; - } - enum "portcomponent" { - value 2; - description - "Port component (EntPhysicalAlias IETF RFC 4133)"; - } - enum "macaddress" { - value 3; - description - "MAC address (IEEE Std 802) "; - } - enum "networkaddress" { - value 4; - description - "Network Address"; - } - enum "ifname" { - value 5; - description - "Interface Name (ifName - IETF RFC 2863)"; - } - enum "agentcircuitid" { - value 6; - description - "Agent Circuit Id (IETF RFC 3046)"; - } - enum "local" { - value 7; - description - "Locally assigned"; - } - } - description - "remote neighbour Port ID Subtype Enumeration"; - } - leaf remotePortId { - type string; - description - "remote neighbour port Id"; - } - leaf remoteChassisIdSubType { - type enumeration { - enum "reserved" { - value 0; - description - "reserved"; - } - enum "chassiscomponent" { - value 1; - description - "Chassis component (EntPhysicalAlias IETF RFC 4133)"; - } - enum "ifalias" { - value 2; - description - "Interface Alias (IfAlias - IETF RFC 2863) "; - } - enum "portcomponent" { - value 3; - description - "Port component (EntPhysicalAlias IETF RFC 4133)"; - } - enum "macaddress" { - value 4; - description - "MAC address (IEEE Std 802) "; - } - enum "networkaddress" { - value 5; - description - "Network Address"; - } - enum "ifname" { - value 6; - description - "Interface Name (ifName - IETF RFC 2863)"; - } - enum "local" { - value 7; - description - "Locally assigned"; - } - } - description - "Chassis ID Subtype Enumeration"; - } - leaf remoteChassisId { - type string; - description - "remote neighbour Chassis Id"; - } - } - - grouping lldp-container { - container lldp { - description - "LLDP configurable and retrievable"; - container global-config { - description - "LLDP global configurations"; - leaf adminStatus { - type enumeration { - enum "disable" { - value 0; - description - "Disable the LLDP feature per NE"; - } - enum "enable" { - value 1; - description - "Enable the LLDP feature per NE"; - } - } - description - "LLDP feature Enable/Disable per NE"; - default "enable"; - } - leaf msgTxInterval { - type uint16 { - range "5..32768"; - } - description - "LLDP frame Retransmit Interval in seconds"; - default "30"; - } - leaf msgTxHoldMultiplier { - type uint8 { - range "2..10"; - } - description - "TTL value for the TLVs transmitter over wire in seconds"; - default "4"; - } - } - list port-config { - description - "LLDP port configurations"; - key "ifName"; - leaf ifName { - type leafref { - path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface/org-openroadm-device:name"; - } - description - "Ethernet interface name where LLDP runs"; - } - leaf adminStatus { - type enumeration { - enum "disable" { - value 0; - description - "Disables the LLDP frames transmit and receive on specific interface"; - } - enum "txandrx" { - value 1; - description - "Enable Transmit and Receive LLDP frames on specific interface"; - } - } - description - "LLDP enable per port basis"; - default "txandrx"; - } - } - container nbr-list { - description - "LLDP Oper data - Neighbour List information"; - config false; - list if-name { - key "ifName"; - leaf ifName { - type string; - description - "Ethernet interface name where LLDP runs"; - } - uses nbr-info-grp; - } - } - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:protocols" { - when "/org-openroadm-device:org-openroadm-device/org-openroadm-device:info/org-openroadm-device:node-type='rdm'"; - uses lldp-container; - } - - notification lldp-nbr-info-change { - description "LLDP: Neighbor Information Changed - remoteSysName - remoteSysMgmtAddressSubType - remoteSysMgmtAddress - remotePortIdSubType - remotePortId - remoteChassisIdSubType - remoteChassisId - All of the above attributes are sent in event"; - leaf notification-type { - type org-openroadm-resource-types:resource-notification-type; - } - leaf resource-type { - type org-openroadm-resource-types:resource-type-enum; - description - "resource-type for this notification is interface"; - } - leaf resource { - type string; - description - "resource interface-name"; - } - container nbr-info { - uses nbr-info-grp; - } - leaf event-time { - type yang:date-and-time; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang deleted file mode 100644 index 4f50786b2..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-maintenance-loopback.yang +++ /dev/null @@ -1,75 +0,0 @@ -module org-openroadm-maintenance-loopback { - namespace "http://org/openroadm/maintenance-loopback"; - prefix org-openroadm-maint-loopback; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for maintenance loopback. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping maint-loopback { - container maint-loopback { - leaf enabled { - type boolean; - default "false"; - description - "loopback operation enable flag"; - } - leaf type { - when "../enabled = 'true'"; - type enumeration { - enum "fac" { - value 0; - description - "pre-FEC Loopback in the facility direction"; - } - enum "term" { - value 1; - description - "Loopback in the terminal direction"; - } - enum "fac2" { - value 2; - description - "post-FEC Loopback in the facility direction"; - } - } - default "fac"; - description - "Set Loopback type (or direction)."; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang deleted file mode 100644 index 67d980b07..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-maintenance-testsignal.yang +++ /dev/null @@ -1,134 +0,0 @@ -module org-openroadm-maintenance-testsignal { - namespace "http://org/openroadm/maintenance-testsignal"; - prefix org-openroadm-maint-testsignal; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for maintenance testsignal. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping maint-testsignal { - container maint-testsignal { - leaf enabled { - type boolean; - default "false"; - description - "testsignal enabled flag"; - } - leaf testPattern { - when "../enabled = 'true'"; - type enumeration { - enum "PRBS" { - value 0; - description - "Unframed, inverted PN-31 pattern or PRBS31 pattern per IEEE 802.3 clause 50.3.8.2 (inverted PN-31at line rate)"; - } - enum "PRBS31" { - value 1; - description - "PRBS31 with standard mapping per G.709"; - } - enum "PRBS23" { - value 2; - description - "SONET/SDH Framed,inverted PN-23 pattern."; - } - enum "PRZEROS" { - value 3; - description - "pseudo-random with zeros data pattern per IEEE 802.3 clause 49.2.8"; - } - enum "IDLE" { - value 4; - description - "Scrambled IDLE test-pattern per IEEE 802.3ba"; - } - } - description - "Set test signal pattern"; - } - leaf type { - when "../enabled = 'true'"; - type enumeration { - enum "fac" { - value 0; - description - "test signal in the facility direction"; - } - enum "term" { - value 1; - description - "test signal in the terminal direction"; - } - } - default "fac"; - description - "Set test signal type (or direction)."; - } - leaf bitErrors { - when "../enabled = 'true' and ../type = 'fac'"; - type uint32 { - range "0..4294967295"; - } - config false; - description - "bit errors for test signal in facility direction."; - } - leaf bitErrorsTerminal { - when "../enabled = 'true' and ../type = 'term'"; - type uint32 { - range "0..4294967295"; - } - config false; - description - "bit errors for test signal in terminal direction."; - } - leaf syncSeconds { - when "../enabled = 'true' and ../type = 'fac'"; - type string; - config false; - description - "number of seconds the received facility test signal is in sync."; - } - leaf syncSecondsTerminal { - when "../enabled = 'true' and ../type = 'term'"; - type string; - config false; - description - "number of seconds the received terminal test signal is in sync."; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-maintenance.yang b/tests/ordmodels_1.2.1/org-openroadm-maintenance.yang deleted file mode 100644 index 5c6e1ff2b..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-maintenance.yang +++ /dev/null @@ -1,87 +0,0 @@ -module org-openroadm-maintenance { - namespace "http://org/openroadm/maintenance"; - prefix org-openroadm-mainteance; - - import org-openroadm-resource { - prefix org-openroadm-resource; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of maintenace operations. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping maintenance { - leaf id { - description - "Uniquely identify maintenance activity"; - type string; - mandatory true; - } - container resource { - description - "Resource under maintenance"; - uses org-openroadm-resource:resource; - } - leaf operation { - type maintenance-operation; - } - } - - container maintenance-list { - description - "A list of active maintenance operations. Adding an entry to this list creates an active maintenance operation. Removing an entry from this terminates a maintenance activity"; - list maintenance { - key "id"; - uses maintenance; - } - } - - typedef maintenance-operation { - description - "Maintenance Operation."; - type enumeration { - enum "terminalLoopback" { - value 1; - } - enum "facilityLoopback" { - value 2; - } - enum "testSignal" { - value 3; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang deleted file mode 100644 index 563596bb8..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-optical-channel-interfaces.yang +++ /dev/null @@ -1,184 +0,0 @@ -module org-openroadm-optical-channel-interfaces { - namespace "http://org/openroadm/optical-channel-interfaces"; - prefix org-openroadm-optical-channel-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - import org-openroadm-interfaces { - prefix openROADM-if; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for device facility och interfaces. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - identity rate-identity { - description - "A unique rate identification"; - } - - identity R200G { - base rate-identity; - description - "Identity for 200G Rate"; - } - - identity R100G { - base rate-identity; - description - "Identity for 100G Rate"; - } - - identity R10.7G { - base rate-identity; - description - "Identity for 10.7G Rate"; - } - - identity R11.1G { - base rate-identity; - description - "Identity for 11.1G Rate"; - } - - grouping och-attributes { - description - "Optical Channel attributes"; - leaf rate { - type identityref { - base rate-identity; - } - description - "rate"; - } - leaf wavelength-number { - type uint32; - } - leaf modulation-format { - type enumeration { - enum "bpsk" { - value 0; - description - "binary phase-shift keying"; - } - enum "dc-dp-bpsk" { - value 1; - description - "DC dual-polarization binary phase-shift keying"; - } - enum "qpsk" { - value 2; - description - "quadrature phase-shift keying"; - } - enum "dp-qpsk" { - value 3; - description - "dual-polarization binary phase-shift keying"; - } - enum "qam16" { - value 4; - description - "quadrature amplitude modulation 16"; - } - enum "dp-qam16" { - value 5; - description - "dual-polarization quadrature amplitude modulation 16"; - } - enum "dc-dp-qam16" { - value 6; - description - "DC dual-polarization quadrature amplitude modulation 16"; - } - enum "qam8" { - value 7; - description - "quadrature amplitude modulation 8"; - } - enum "dp-qam8" { - value 8; - description - "dual-polarization quadrature amplitude modulation 8"; - } - enum "dc-dp-qam8" { - value 9; - description - "DC dual-polarization quadrature amplitude modulation 8"; - } - } - description - "modulation format"; - } - leaf transmit-power { - type org-openroadm-common-types:power-dBm; - description - "The target transmit power for this channel. When set, the xponder will work to ensure that port-current-power reaches this level. Applicable only to channel on top of xpdr-network port"; - } - } - - grouping och-container { - container och { - description - "Optical Channel (OCh): - Models the optical channel interfaces for an Optical White Box."; - uses och-attributes; - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - when "org-openroadm-device:type = 'openROADM-if:opticalChannel'"; - uses och-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang deleted file mode 100644 index 55032413e..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-optical-multiplex-interfaces.yang +++ /dev/null @@ -1,66 +0,0 @@ -module org-openroadm-optical-multiplex-interfaces { - namespace "http://org/openroadm/optical-multiplex-interfaces"; - prefix org-openroadm-optical-multiplex-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "This module contains YANG definitions - for the Optical multiplex Interfaces (OMS). - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - description - "Optical Multiplex Section (OMS) - allow setting of OMS in the openROADM interfaces tree."; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang deleted file mode 100644 index 060e4d7d7..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-optical-transport-interfaces.yang +++ /dev/null @@ -1,144 +0,0 @@ -module org-openroadm-optical-transport-interfaces { - namespace "http://org/openroadm/optical-transport-interfaces"; - prefix org-openroadm-optical-transport-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - import org-openroadm-interfaces { - prefix openROADM-if; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "This module contains YANG definitions - for the Optical Transport Interfaces. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - grouping ots-attributes { - description - "Optical Transport Section (OTS) attributes"; - leaf fiber-type { - type enumeration { - enum "smf" { - value 0; - description - "Single Mode Fiber"; - } - enum "eleaf" { - value 1; - description - "ELEAF"; - } - enum "oleaf" { - value 2; - description - "OLEAF"; - } - enum "dsf" { - value 3; - description - "DSF"; - } - enum "truewave" { - value 4; - description - "TRUEWAVE Reduced Slope"; - } - enum "truewavec" { - value 5; - description - "TRUEWAVE Classic"; - } - enum "nz-dsf" { - value 6; - description - "NZ-DSF"; - } - enum "ull" { - value 7; - description - "Ultra Low Loss (ULL)"; - } - } - default "smf"; - description - "fiber type - Default : SMF "; - } - leaf span-loss-receive { - description - "Span loss on the receiver side. Set by the controller and used by device to set AMP gain."; - type org-openroadm-common-types:ratio-dB; - } - leaf span-loss-transmit { - description - "Span loss on the transmitter side. Set by the controller and used by device to configure MSA compliant channel launch power"; - type org-openroadm-common-types:ratio-dB; - } - } - - grouping ots-container { - container ots { - description - "Optical Transport Section (OTS): - Models the optical interfaces for an Optical White Box. - The network side is represented by the OTS/OMS."; - uses ots-attributes; - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - when "org-openroadm-device:type = 'openROADM-if:opticalTransport'"; - uses ots-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang deleted file mode 100644 index 3b49effb1..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-otn-odu-interfaces.yang +++ /dev/null @@ -1,387 +0,0 @@ -module org-openroadm-otn-odu-interfaces { - namespace "http://org/openroadm/otn-odu-interfaces"; - prefix org-openroadm-otn-odu-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - import org-openroadm-interfaces { - prefix openROADM-if; - } - import org-openroadm-maintenance-testsignal { - prefix org-openroadm-maint-testsignal; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for device facility otnodu interfaces. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - identity odu-rate-identity { - description - "A unique rate identification of the ODUk."; - } - - identity ODU4 { - base odu-rate-identity; - description - "Identity for an ODU4"; - } - - identity ODU3 { - base odu-rate-identity; - description - "Identity for an ODU3"; - } - - identity ODU2 { - base odu-rate-identity; - description - "Identity for an ODU2"; - } - - identity ODU2e { - base odu-rate-identity; - description - "Identity for an ODU2e"; - } - - identity ODU1 { - base odu-rate-identity; - description - "Identity for an ODU1"; - } - - identity ODU0 { - base odu-rate-identity; - description - "Identity for an ODU0"; - } - - identity ODUflex { - base odu-rate-identity; - description - "Identity for an ODUflex"; - } - - identity odtu-type-identity { - description - "A unique identification for the MSI odtu type."; - } - - identity ODTU4.ts-Allocated { - base odtu-type-identity; - description - "OPU4 MSI - ODTU4.ts, TS is occupied/allocated"; - } - - identity ODTU4.1 { - base odtu-type-identity; - description - "ODTU4.1 MSI type"; - } - - identity ODTU4.2 { - base odtu-type-identity; - description - "ODTU4.2 MSI type"; - } - - identity ODTU4.8 { - base odtu-type-identity; - description - "ODTU4.8 MSI type"; - } - - identity ODTU4.31 { - base odtu-type-identity; - description - "ODTU4.31 MSI type"; - } - - identity ODTU01 { - base odtu-type-identity; - description - "ODTU01 MSI type"; - } - - identity ODTU12 { - base odtu-type-identity; - description - "ODTU12 MSI type"; - } - - identity ODTU13 { - base odtu-type-identity; - description - "ODTU13 MSI type"; - } - - identity ODTU23 { - base odtu-type-identity; - description - "ODTU23 MSI type"; - } - - identity ODTU2.ts { - base odtu-type-identity; - description - "ODTU2.ts MSI type"; - } - - identity ODTU3.ts { - base odtu-type-identity; - description - "ODTU3.ts MSI type"; - } - - identity unallocated { - base odtu-type-identity; - description - "Unallocated MSI type"; - } - - grouping msi-entry { - leaf trib-slot { - type uint16; - description - "tributary slot (TS)"; - } - leaf odtu-type { - type identityref { - base odtu-type-identity; - } - description - "ODTU type, part of the MSI (Multiplex Structure Identifier)"; - } - leaf trib-port { - type uint8; - description - "Tributray Port Number (0-based), part of the MSI"; - } - leaf trib-port-payload { - type string; - description - "interface name being mapped to trib-port"; - } - } - - grouping odu-attributes { - description - "ODU attributes"; - leaf rate { - type identityref { - base odu-rate-identity; - } - description - "rate identity of the ODU. 'identityref' is used - to allow to extend for future higher rates"; - } - leaf monitoring-mode { - type enumeration { - enum "not-terminated" { - description - "Not Terminated: no detection or generation. - Overhead is passed through the interface transparently in receive direction"; - } - enum "terminated" { - description - "Terminated: detection and generation enabled. - Overhead is erased (replaced with all zeros) in receive direction"; - } - enum "monitored" { - description - "Monitored: detection enabled. - Overhead is passed through the interface transparently in receive direction"; - } - } - description - "Monitoring mode of the ODU Overhead"; - } - leaf proactive-delay-measurement-enabled { - type boolean; - description - "enable/disable proactive Delay Measurement"; - } - list tcm { - key "layer"; - uses tcm-attributes; - max-elements "6"; - description - "Tandem Connection Management"; - } - uses opu; - } - - grouping opu { - container opu { - when "../monitoring-mode = 'terminated' or ../monitoring-mode = 'monitored'"; - description - "Optical Channel Payload Unit (OPU)"; - leaf payload-type { - type string { - length "2"; - pattern "[0-9a-fA-F]*"; - } - description - "Payload Type"; - } - leaf rx-payload-type { - type string { - length "2"; - pattern "[0-9a-fA-F]*"; - } - description - "Received Payload Type"; - } - leaf exp-payload-type { - type string { - length "2"; - pattern "[0-9a-fA-F]*"; - } - description - "Expected Payload Type"; - } - leaf payload-interface { - type string; - description - "Expected Payload of OPU. It designates client interface name"; - } - container msi { - when "../payload-type = '20' or ../payload-type = '21'"; - list tx-msi { - key "trib-slot"; - uses msi-entry; - description - "Transmit MSI"; - } - list rx-msi { - key "trib-slot"; - uses msi-entry; - description - "Receive MSI"; - } - list exp-msi { - key "trib-slot"; - uses msi-entry; - description - "Expected MSI"; - } - } - } - } - - grouping tcm-attributes { - description - "Tandem Connection Monitoring (TCM) attributes"; - leaf layer { - type uint8 { - range "1..6"; - } - description - "TCM layer"; - } - leaf monitoring-mode { - type enumeration { - enum "not-terminated" { - description - "Not Terminated: no detection or generation. - Overhead is passed through the interface transparently in receive direction - unless extension is set for erase"; - } - enum "terminated" { - description - "Terminated: detection and generation enabled. - Overhead is erased (replaced with all zeros) in receive direction, unless - extension is set to passthrough"; - } - enum "monitored" { - description - "Monitored: detection enabled. - Overhead is passed through the interface transparently in receive direction - unless extension is set for erase"; - } - } - description - "Monitoring mode of the TCM layer"; - } - leaf ltc-act-enabled { - type boolean; - description - "enable/disable alarm transfer on detection of Loss of Tandem Connection (LTC)"; - } - leaf proactive-delay-measurement-enabled { - type boolean; - description - "enable/disable proactive Delay Measurement"; - } - } - - grouping odu-container { - container odu { - presence "Attribute Nodes for Optical Data Unit (ODU)"; - description - "Optical Channel Data Unit (ODU)"; - uses odu-attributes { - refine "opu/rx-payload-type" { - config false; - } - refine "opu/msi" { - config false; - } - } - uses org-openroadm-maint-testsignal:maint-testsignal; - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - when "org-openroadm-device:type = 'openROADM-if:otnOdu'"; - uses odu-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang b/tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang deleted file mode 100644 index 4fe3bb355..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-otn-otu-interfaces.yang +++ /dev/null @@ -1,185 +0,0 @@ -module org-openroadm-otn-otu-interfaces { - namespace "http://org/openroadm/otn-otu-interfaces"; - prefix org-openroadm-otn-otu-interfaces; - - import org-openroadm-device { - prefix org-openroadm-device; - } - import org-openroadm-interfaces { - prefix openROADM-if; - } - import org-openroadm-maintenance-loopback { - prefix org-openroadm-maint-loopback; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for device facility otnotu interfaces. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - identity otu-rate-identity { - description - "A unique rate identification of the OTU."; - } - - identity OTU4 { - base otu-rate-identity; - description - "Identity for an OTU4"; - } - - identity OTU3 { - base otu-rate-identity; - description - "Identity for an OTU3"; - } - - identity OTU2 { - base otu-rate-identity; - description - "Identity for an OTU2"; - } - - identity OTU2e { - base otu-rate-identity; - description - "Identity for an OTU2e"; - } - - identity OTU1 { - base otu-rate-identity; - description - "Identity for an OTU1"; - } - - identity OTU0 { - base otu-rate-identity; - description - "Identity for an OTU0"; - } - - identity OTUflex { - base otu-rate-identity; - description - "Identity for an OTUflex"; - } - - grouping otu-attributes { - description - "OTU attributes"; - leaf rate { - type identityref { - base otu-rate-identity; - } - description - "rate identity of the OTU. 'identityref' is used - to allow to extend for future higher rates"; - } - leaf fec { - type enumeration { - enum "off" { - value 0; - description - "fec off"; - } - enum "rsfec" { - value 1; - description - "rsfec"; - } - enum "sdfeca1" { - value 2; - description - "Clariphy SDFEC"; - } - enum "efec" { - value 3; - description - "G.975.1 I.4"; - } - enum "ufec" { - value 4; - description - "G.975.1 I.7"; - } - enum "sdfec" { - value 5; - description - "Soft decision FEC"; - } - enum "sdfecb1" { - value 6; - description - "SDFEC with SCFEC"; - } - enum "scfec" { - value 7; - description - "Stair case FEC"; - } - } - description - "Forward Error Correction"; - } - } - - grouping otu-container { - container otu { - description - "Optical Channel Transport Unit (OTU)"; - uses otu-attributes; - uses org-openroadm-maint-loopback:maint-loopback; - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface" { - when "org-openroadm-device:type = 'openROADM-if:otnOtu'"; - uses otu-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-physical-types.yang b/tests/ordmodels_1.2.1/org-openroadm-physical-types.yang deleted file mode 100644 index 4251018c6..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-physical-types.yang +++ /dev/null @@ -1,117 +0,0 @@ -module org-openroadm-physical-types { - namespace "http://org/openroadm/physical/types"; - prefix org-openroadm-physical-types; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import ietf-yang-types { - prefix yang; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of physical types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping node-info { - description - "Physical inventory data used by the node"; - leaf vendor { - description - "Vendor of the equipment"; - type string; - config false; - mandatory true; - } - leaf model { - type string; - description - "Physical resource model information."; - config false; - mandatory true; - } - leaf serial-id { - description - "Product Code for this physical resource"; - type string; - config false; - mandatory true; - } - } - - grouping common-info { - description - "Physical inventory data used by all other entities"; - uses node-info; - leaf type { - description - "The specific type of this physical resource - ie the type of - shelf, type of circuit-pack, etc."; - type string; - config false; - } - leaf product-code { - description - "Product Code for this physical resource"; - type string; - config false; - } - leaf manufacture-date { - description - "Manufactor date of physical resource"; - type yang:date-and-time; - config false; - } - leaf clei { - description - "CLEI for this physical resource"; - type string; - config false; - } - leaf hardware-version { - description - "The version of the hardware."; - type string; - config false; - } - leaf operational-state { - description - "Operational state of the physical resource"; - type org-openroadm-common-types:state; - config false; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-pm-types.yang b/tests/ordmodels_1.2.1/org-openroadm-pm-types.yang deleted file mode 100644 index d2820d382..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-pm-types.yang +++ /dev/null @@ -1,278 +0,0 @@ -module org-openroadm-pm-types { - namespace "http://org/openroadm/pm-types"; - prefix org-openroadm-pm-types; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of performance management types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - typedef pm-granularity { - description - "Granularity of PM bin"; - type enumeration { - enum "notApplicable" { - description - "This is for total statistic counters on devices that support - them."; - value 1; - } - enum "15min" { - value 2; - } - enum "24Hour" { - value 3; - } - } - } - - typedef pm-data-type { - type union { - type uint64; - type decimal64 { - fraction-digits 2; - } - type decimal64 { - fraction-digits 17; - } - } - } - - grouping pm-measurement { - description - "Set of parameters related to a PM Measurement"; - container pmParameterName { - uses pm-names; - } - leaf pmParameterValue { - type pm-data-type; - mandatory true; - config false; - } - leaf pmParameterUnit { - description - "Unit PM parameter has been measured - frames, packets, u, etc"; - type string; - mandatory false; - } - leaf location { - description - "Location PM parameter measurement"; - type enumeration { - enum "notApplicable" { - value 1; - } - enum "nearEnd" { - value 2; - } - enum "farEnd" { - value 3; - } - } - mandatory false; - } - leaf direction { - description - "Direction PM parameter measurement"; - type org-openroadm-common-types:pm-direction; - mandatory false; - } - leaf validity { - description - "Validity of data"; - type enumeration { - enum "complete" { - value 1; - } - enum "partial" { - value 2; - } - enum "suspect" { - value 3; - } - } - mandatory false; - config false; - } - } - - grouping pm-names { - description - "Name of PM parameter. Consisists of a set list of parameters, - plus an extension field to support addition parameters."; - leaf type { - type pm-names-enum; - mandatory true; - } - leaf extension { - description - "name of parameter, when enum value set to vendorExtension because - name not found in pm-names-enum"; - type string; - mandatory false; - } - } - - typedef pm-names-enum { - type enumeration { - enum "vendorExtension" { - value 1; - description - "vendor extension"; - } - enum "bitErrorRate" { - value 2; - description - "Bit error rate (BER)"; - } - enum "opticalPowerOutput" { - value 3; - description - "Optical Power Output (OPOUT-OTS). Total optical power includes Variable Optical Attenuator (VOA) attenuation"; - } - enum "opticalReturnLoss" { - value 4; - description - "Optical Return Loss (ORL-OTS) - at MW port(s) B"; - } - enum "opticalPowerInput" { - value 5; - description - "Optical Power Input (OPIN-OTS). Total optical power"; - } - enum "opticalPower" { - value 6; - description - "Optical Power Receive (OPR-OTS); Optical Power Transmit (OPT-OSC)"; - } - enum "opticalChannelPowerTransmit" { - value 7; - description - "Optical Channel Power Transmit (OPT-OCH). Individual channel power includes Variable Optical Attenuator (VOA) attenuation"; - } - enum "codeViolations" { - value 8; - description - "Code Violations (CV-PCS). 8B/10B errors"; - reference "IEEE 802.3ah, Section 45.2.1.44"; - } - enum "erroredSecondsSection" { - value 9; - description - "Errored Seconds Section (ES-PCS)"; - reference "IEEE 802.3ah, Section 45.2.1.46"; - } - enum "severlyErrorSeconds" { - value 10; - description - "Severely Errored Seconds (SES-PCS)"; - reference "IEEE 802.3ah, Section 45.2.1.48"; - } - enum "unavailableSecondsPCS" { - value 11; - description - "Unavailable Seconds PCS (UAS-PCS)"; - reference "IEEE 802.3ah, Section 45.2.1.52"; - } - enum "inFrames" { - value 12; - description - "In frames (INFRAMES-E)"; - } - enum "inFramesErrored" { - value 13; - description - "In frames errored (INFRAMESERR-E)"; - } - enum "outFrames" { - value 14; - description - "Out frames (OUTFRAMES-E)"; - } - enum "erroredSecondsEthernet" { - value 15; - description - "Errored Seconds Ethernet (ES-E)"; - reference "IEEE 802.3ah, Section 45.2.1.46"; - } - enum "severelyErroredSecondsEthernet" { - value 16; - description - "Severly Errored Seconds, Ethernet (SES-E)"; - reference "IEEE 802.3ah, Section 45.2.1.48"; - } - enum "unavailableSecondsEthernet" { - value 17; - description - "Unavailable Seconds, Ethernet (UAS-E)"; - reference "IEEE 802.3ah, Section 45.2.1.52"; - } - enum "erroredBlockCount" { - value 18; - description - "Errored block count"; - reference "G.798 : 6.5.1.1"; - } - enum "delay" { - value 19; - description - "Number of frames between a DMValue toggle event and the received DMp signal value toggle event"; - reference "G.798"; - } - enum "defectSeconds" { - value 20; - description - "Defect Seconds (DS)"; - reference ""; - } - enum "backwardIncomingAlignmentError" { - value 21; - description - "Backward Incoming Alignment Error (BIAE)"; - reference "Ref: G.798: 14.5.1.1.2"; - } - enum "incomingAlignmentError" { - value 22; - description - "Incoming Alignment Error (IAE)"; - reference "Ref: G.798: 14.5.1.1.2"; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-pm.yang b/tests/ordmodels_1.2.1/org-openroadm-pm.yang deleted file mode 100644 index 8a75c58a2..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-pm.yang +++ /dev/null @@ -1,189 +0,0 @@ -module org-openroadm-pm { - namespace "http://org/openroadm/pm"; - prefix org-openroadm-pm; - - import ietf-yang-types { - prefix yang; - } - import org-openroadm-resource { - prefix org-openroadm-resource; - } - import org-openroadm-layerRate { - prefix org-openroadm-layerRate; - } - import org-openroadm-pm-types { - prefix org-openroadm-pm-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of performance management. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping current-pm { - description - "PM Data with current values - both realtime (granularity=notApplicable) and binned (granularity=15 minute, 24h))"; - leaf id { - type string; - mandatory true; - config false; - } - container resource { - uses org-openroadm-resource:resource; - } - container layerRate { - uses org-openroadm-layerRate:layer-rate; - } - list measurements { - container measurement { - uses org-openroadm-pm-types:pm-measurement; - } - } - leaf retrievalTime { - type yang:date-and-time; - mandatory true; - config false; - } - leaf granularity { - type org-openroadm-pm-types:pm-granularity; - } - } - - container currentPmlist { - description - "List of current PMs."; - list currentPm { - key "id"; - uses current-pm; - } - config false; - } - - grouping historical-pm { - description - "PM Data with historical values - binned (granularity=15 minute, 24h))"; - leaf id { - type string; - mandatory true; - config false; - } - container resource { - uses org-openroadm-resource:resource; - } - container layerRate { - uses org-openroadm-layerRate:layer-rate; - } - list binned-pm { - key "bin-number"; - uses bin-pm; - } - leaf granularity { - type org-openroadm-pm-types:pm-granularity; - } - } - - grouping bin-pm { - description - "PM Data with historical values"; - leaf bin-number { - type uint16 { - range "1..max"; - } - mandatory true; - config false; - } - list measurements { - container measurement { - uses org-openroadm-pm-types:pm-measurement; - } - } - leaf completionTime { - type yang:date-and-time; - mandatory true; - config false; - } - } - - container historicalPmlist { - description - "List of historical PM"; - list historicalPm { - key "id"; - uses historical-pm; - } - config false; - } - rpc clear-pm { - description "Command to initialize PM data"; - input { - uses org-openroadm-resource:resource; - leaf pm-type { - default "current"; - type enumeration { - enum "current" { - value 1; - } - enum "all" { - value 2; - } - } - } - leaf granularity { - default "15min"; - type org-openroadm-pm-types:pm-granularity; - } - } - output { - leaf status { - type enumeration { - enum "Successful" { - value 1; - } - enum "Failed" { - value 2; - } - } - mandatory true; - description - "Successful or Failed"; - } - leaf status-message { - type string; - description - "Gives a more detailed reason for success / failure"; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-port-types.yang b/tests/ordmodels_1.2.1/org-openroadm-port-types.yang deleted file mode 100644 index e4c647815..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-port-types.yang +++ /dev/null @@ -1,150 +0,0 @@ -module org-openroadm-port-types { - namespace "http://org/openroadm/port/types"; - prefix org-openroadm-port-types; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for port types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - identity supported-if-capability { - description - "Base identity from which specific supported interfaces are derived"; - } - - identity if-100GE { - base supported-if-capability; - } - - identity if-OMS { - base supported-if-capability; - } - - identity if-OTS { - base supported-if-capability; - } - - identity if-OCH { - base supported-if-capability; - } - - identity supported-xpdr-capability { - description - "Base identity from which specific supported xponder are derived"; - } - - identity Transponder { - base supported-xpdr-capability; - } - - identity Regen { - base supported-xpdr-capability; - } - - typedef port-wavelength-types { - type enumeration { - enum "wavelength" { - value 1; - description - "Port on a transponder."; - } - enum "multi-wavelegnth" { - value 2; - description - "Port on a ROADM."; - } - } - description - "Port types."; - } - - grouping common-port { - leaf port-power-capability-min-rx { - type org-openroadm-common-types:power-dBm; - config false; - description - "Based on port capabilities, the minimum power in the system spec for this port to - provide optimum function in rx direction"; - } - leaf port-power-capability-min-tx { - type org-openroadm-common-types:power-dBm; - config false; - description - "Based on port capabilities, the minimum power in the system spec for this port to - provide optimum function in tx direction."; - } - leaf port-power-capability-max-rx { - type org-openroadm-common-types:power-dBm; - config false; - description - "Based on port capabilities, the maximum power in the system spec for this port to - provide optimum function in rx direction."; - } - leaf port-power-capability-max-tx { - type org-openroadm-common-types:power-dBm; - config false; - description - "Based on port capabilities, the maximum power in the system spec for this port to - provide optimum function in tx direction."; - } - leaf-list capable-wavelengths { - type uint32; - config false; - description - "List of wavelengths this port is capable of supporting. - can be used to access wavelength-map to get the wavelength value in nm"; - } - } - grouping roadm-port { - uses common-port; - leaf-list available-wavelengths { - type uint32; - config false; - description - "List of available (capable and unused) wavelengths on this port. - can be used to access wavelength-map to get the wavelength value in nm"; - } - leaf-list used-wavelengths { - type uint32; - config false; - description - "List of used available wavelength-numbers on this port."; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang b/tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang deleted file mode 100644 index eaa0d2a47..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-probable-cause.yang +++ /dev/null @@ -1,522 +0,0 @@ -module org-openroadm-probable-cause { - namespace "http://org/openroadm/probableCause"; - prefix org-openroadm-probable-cause; - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of Probable Causes. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping probable-cause { - leaf cause { - type probable-cause-enum; - mandatory true; - } - leaf extension { - type string; - mandatory false; - } - leaf direction { - description - "Direction indication of the alarm."; - type org-openroadm-common-types:direction; - } - leaf location { - description - "location indication of the alarm."; - type enumeration { - enum "NEND" { - value 1; - description - "Near End location"; - } - enum "FEND" { - value 2; - description - "Far End location"; - } - } - } - } - - typedef probable-cause-enum { - type enumeration { - enum "vendorExtension" { - value 1; - description - "vendorExtension"; - } - enum "openConnectionIndication" { - value 2; - description - "Open connection indication (OCI)"; - reference "G.798"; - } - enum "alarmIndicationSignal" { - value 3; - description - "Alarm indication signal"; - reference "G.798"; - } - enum "lossOfSignal" { - value 4; - description - "Loss of Signal"; - } - enum "opticalLineFail" { - value 5; - description - "Optical Line Fail"; - } - enum "opticalPowerDegraded" { - value 6; - description - "Optical Line Fail"; - } - enum "automaticLaserShutdown" { - value 7; - description - "Optical Line Fail"; - } - enum "serverSignalFail" { - value 8; - description - "Server Signal Fail (SSF)"; - reference "G.798"; - } - enum "lossofTandemConnection" { - value 9; - description - "Loss of Tandem Connection (LTC)"; - reference "G.798"; - } - enum "lockedDefect" { - value 10; - description - "Locked defect (LCK)"; - reference "G.798"; - } - enum "trailTraceIdentifierMismatch" { - value 11; - description - "Trail trace Identifier Mismatch (TIM)"; - reference "G.798"; - } - enum "degradedEffect" { - value 12; - description - "Degraded defect (DEG)"; - reference "G.798"; - } - enum "backwardsDefectIndication" { - value 13; - description - "Backward Defect Indication (BDI)"; - reference "G.798"; - } - enum "otsSpanlossPowerOutOfSpecificationHigh" { - value 14; - } - enum "automaticShutoffDisabled" { - value 15; - } - enum "postBlockManualLaserShutdown" { - value 16; - } - enum "portLossOfLight" { - value 17; - } - enum "reflectionTooHigh" { - value 18; - } - enum "shutoffThresholdCrossed" { - value 19; - } - enum "preBlockSpanAdjustmentInProgress" { - value 20; - } - enum "postBlockSpanAdjustmentInProgress" { - value 21; - } - enum "payloadMissingIndication" { - value 22; - description - "Will be applicable to ROADM when OSC signaling supported in future (G.709 2016-06 Figure 15-1A, 1B)"; - } - enum "forwardDefectIndication" { - value 23; - description - "Will be applicable to ROADM when OSC signaling supported in future (G.709 2016-06 Figure 15-1A, 1B)"; - } - enum "oscPowerOutOfSpecificationHigh" { - value 24; - } - enum "oscPowerOutOfSpecificationLow" { - value 25; - } - enum "powerOutOfSpecificationHigh" { - value 26; - } - enum "lossOfSynchronization" { - value 27; - } - enum "linkDown" { - value 28; - } - enum "equipmentFault" { - value 29; - } - enum "equipmentRemoved" { - value 30; - } - enum "equipmentMismatch" { - value 31; - } - enum "equipmentWarmup" { - value 32; - } - enum "equipmentLedOn" { - value 33; - } - enum "equipmentInterConnectFailure" { - value 34; - } - enum "equipmentMiscabledConnection" { - value 35; - } - enum "softwareVersionMismatch" { - value 36; - } - enum "softwareStageInProgress" { - value 37; - } - enum "databaseCorruption" { - value 38; - } - enum "databaseLockedSoftwareUpgradeInProgress" { - value 39; - } - enum "databaseLockedDbRestoreInProgress" { - value 40; - } - enum "databaseLockedSysInitInProgress" { - value 41; - } - enum "databaseLockedDbAlarmPresent" { - value 42; - } - enum "databaseLockedIlfViolation" { - value 43; - } - enum "databaseVersionMismatch" { - value 44; - } - enum "databaseLockedShelfProvModePresent" { - value 45; - } - enum "firmwareVersionMismatch" { - value 46; - } - enum "firmwareBackwardCompatibleLimited" { - value 47; - } - enum "firmwareBackwardCompatibleAll" { - value 48; - } - enum "incompatibleFirmware" { - value 49; - } - enum "firmwareDownloadOrActivationFailure" { - value 50; - } - enum "firmwareInitInProgress" { - value 51; - } - enum "softwareReset" { - value 52; - } - enum "fanCoolingFail" { - value 53; - } - enum "administrativeDown" { - value 54; - } - enum "lampTest" { - value 55; - } - enum "powerProblemA" { - value 56; - } - enum "powerProblemB" { - value 57; - } - enum "shelfProvisioningMode" { - value 58; - } - enum "sysNameChanged" { - value 59; - } - enum "sysNtpNotSynchronized" { - value 60; - } - enum "ilfViolationMajor" { - value 61; - } - enum "ilfViolationCritical" { - value 62; - } - enum "lossOfFrame" { - value 63; - } - enum "lossOfMultiframe" { - value 64; - } - enum "backwardIncomingAlignmentError" { - value 65; - } - enum "incomingAlignmentError" { - value 66; - } - enum "payloadMismatch" { - value 67; - } - enum "clientSignalFailDefect" { - value 68; - } - enum "backwardIncomingAlignmentErrorTCM1" { - value 69; - } - enum "backwardIncomingAlignmentErrorTCM2" { - value 70; - } - enum "backwardIncomingAlignmentErrorTCM3" { - value 71; - } - enum "backwardIncomingAlignmentErrorTCM4" { - value 72; - } - enum "backwardIncomingAlignmentErrorTCM5" { - value 73; - } - enum "backwardIncomingAlignmentErrorTCM6" { - value 74; - } - enum "incomingAlignmentErrorTCM1" { - value 75; - } - enum "incomingAlignmentErrorTCM2" { - value 76; - } - enum "incomingAlignmentErrorTCM3" { - value 77; - } - enum "incomingAlignmentErrorTCM4" { - value 78; - } - enum "incomingAlignmentErrorTCM5" { - value 79; - } - enum "incomingAlignmentErrorTCM6" { - value 80; - } - enum "backwardsDefectIndicationTCM1" { - value 81; - } - enum "backwardsDefectIndicationTCM2" { - value 82; - } - enum "backwardsDefectIndicationTCM3" { - value 83; - } - enum "backwardsDefectIndicationTCM4" { - value 84; - } - enum "backwardsDefectIndicationTCM5" { - value 85; - } - enum "backwardsDefectIndicationTCM6" { - value 86; - } - enum "degradedDefectTCM1" { - value 87; - } - enum "degradedDefectTCM2" { - value 88; - } - enum "degradedDefectTCM3" { - value 89; - } - enum "degradedDefectTCM4" { - value 90; - } - enum "degradedDefectTCM5" { - value 91; - } - enum "degradedDefectTCM6" { - value 92; - } - enum "trailTraceIdentifierMisMatchTCM1" { - value 93; - } - enum "trailTraceIdentifierMisMatchTCM2" { - value 94; - } - enum "trailTraceIdentifierMisMatchTCM3" { - value 95; - } - enum "trailTraceIdentifierMisMatchTCM4" { - value 96; - } - enum "trailTraceIdentifierMisMatchTCM5" { - value 97; - } - enum "trailTraceIdentifierMisMatchTCM6" { - value 98; - } - enum "alarmIndicationSignalTCM1" { - value 99; - } - enum "alarmIndicationSignalTCM2" { - value 100; - } - enum "alarmIndicationSignalTCM3" { - value 101; - } - enum "alarmIndicationSignalTCM4" { - value 102; - } - enum "alarmIndicationSignalTCM5" { - value 103; - } - enum "alarmIndicationSignalTCM6" { - value 104; - } - enum "openConnectionIndicationTCM1" { - value 105; - } - enum "openConnectionIndicationTCM2" { - value 106; - } - enum "openConnectionIndicationTCM3" { - value 107; - } - enum "openConnectionIndicationTCM4" { - value 108; - } - enum "openConnectionIndicationTCM5" { - value 109; - } - enum "openConnectionIndicationTCM6" { - value 110; - } - enum "lockedDefectTCM1" { - value 111; - } - enum "lockedDefectTCM2" { - value 112; - } - enum "lockedDefectTCM3" { - value 113; - } - enum "lockedDefectTCM4" { - value 114; - } - enum "lockedDefectTCM5" { - value 115; - } - enum "lockedDefectTCM6" { - value 116; - } - enum "lossofTandemConnectionTCM1" { - value 117; - } - enum "lossofTandemConnectionTCM2" { - value 118; - } - enum "lossofTandemConnectionTCM3" { - value 119; - } - enum "lossofTandemConnectionTCM4" { - value 120; - } - enum "lossofTandemConnectionTCM5" { - value 121; - } - enum "lossofTandemConnectionTCM6" { - value 122; - } - enum "highBER" { - value 123; - } - enum "localFault" { - value 124; - } - enum "remoteFault" { - value 125; - } - enum "lossOfAlignment" { - value 126; - } - enum "lossOfFECAlignment" { - value 127; - } - enum "facilityLoopbackActive" { - value 128; - } - enum "facilityLoopback2Active" { - value 129; - } - enum "terminalLoopbackActive" { - value 130; - } - enum "facilityTestsignalActive" { - value 131; - } - enum "terminalTestsignalActive" { - value 132; - } - enum "automaticLaserShutdownDisabled" { - value 133; - } - enum "certificateNotInstalled" { - value 134; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-resource-types.yang b/tests/ordmodels_1.2.1/org-openroadm-resource-types.yang deleted file mode 100644 index bb6a80a92..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-resource-types.yang +++ /dev/null @@ -1,252 +0,0 @@ -module org-openroadm-resource-types { - namespace "http://org/openroadm/resource/types"; - prefix org-openroadm-resource-types; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of common resource types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping resource-type { - leaf type { - type resource-type-enum; - mandatory true; - } - leaf extension { - type string; - mandatory false; - } - } - - typedef resource-type-enum { - type enumeration { - enum "other" { - value 1; - description - "Resource of type not found in list."; - } - enum "device" { - value 2; - description - "device - ROAMD, Xponder, etc"; - } - enum "degree" { - value 3; - description - "degree"; - } - enum "shared-risk-group" { - value 4; - description - "shared-risk-group"; - } - enum "connection" { - value 5; - description - "connection"; - } - enum "connection-map" { - value 6; - description - "connection-map"; - } - enum "port" { - value 7; - description - "port"; - } - enum "circuit-pack" { - value 8; - description - "circuit pack"; - } - enum "internal-link" { - value 9; - description - "internal-link"; - } - enum "physical-link" { - value 10; - description - "physical-link"; - } - enum "interface" { - value 11; - description - "interface"; - } - enum "shelf" { - value 12; - description - "shelf"; - } - enum "service" { - value 13; - description - "service"; - } - } - } - - grouping device-id { - description - "Device identifier. Unique within the Controller."; - leaf node-id { - description - "Node Id is a globally unique identifier for a device. - Same as leafref value in model, if applicable."; - type string; - } - } - - grouping circuit-pack-name { - leaf circuit-pack-name { - description - "Circuit-Pack identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type string; - mandatory true; - } - } - - grouping port-name { - uses circuit-pack-name; - leaf port-name { - description - "Port identifier. Unique within the context of a circuit-pack. - Same as leafref value in model, if applicable."; - type string; - } - } - - grouping physical-link-name { - leaf physical-link-name { - description - "Physical Link identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type string; - mandatory true; - } - } - - grouping internal-link-name { - leaf internal-link-name { - description - "Internal Link identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type string; - mandatory true; - } - } - - grouping connection-number { - leaf connection-number { - description - "Connection identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type string; - } - } - - grouping degree-number { - leaf degree-number { - description - "Degree identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type uint16; - } - } - - grouping srg-number { - leaf srg-number { - description - "Shared Risk Group identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type uint16; - } - } - - grouping shelf-name { - leaf shelf-name { - description - "Shelf-id identifier. Unique within the context of a device. - Same as leafref value in model, if applicable."; - type string; - mandatory true; - } - } - - grouping service-name { - leaf service-name { - description - "Service identifier. Unique within the context of a network. - Same as leafref value in model, if applicable."; - type string; - mandatory true; - } - } - - grouping interface-name { - leaf interface-name { - description - "Interface identifier."; - type string; - mandatory true; - } - } - - typedef resource-notification-type { - description - "Type of notification about a resource"; - type enumeration { - enum "resourceCreation" { - value 1; - description - "A new instance of a resource has been created."; - } - enum "resourceModification" { - value 2; - description - "An exhisting instance of a resource has been modified. This shall be triggered by changes in configuration, state, status etc. - It shall not be triggered by changes in performance measurements, power and temperature readings or any other data that is highlyvolatile. "; - } - enum "resourceDeletion" { - value 3; - description - "An exhisting instance of a resource has been removed."; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-resource.yang b/tests/ordmodels_1.2.1/org-openroadm-resource.yang deleted file mode 100644 index 25cb9f182..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-resource.yang +++ /dev/null @@ -1,109 +0,0 @@ -module org-openroadm-resource { - namespace "http://org/openroadm/resource"; - prefix org-openroadm-resource; - - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of resources. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping resource { - description - "This resource identifier is intended to provide a generic identifer - for any resource that can be used without specific knowledge of - the resource."; - container device { - description - "Device of the resource, used only when the system using this - model report on more than one device. "; - uses org-openroadm-resource-types:device-id; - } - container resource { - choice resource { - case circuit-pack { - uses org-openroadm-resource-types:circuit-pack-name; - } - case port { - container port { - uses org-openroadm-resource-types:port-name; - } - } - case connection { - uses org-openroadm-resource-types:connection-number { - refine connection-number { - mandatory true; - } - } - } - case physical-link { - uses org-openroadm-resource-types:physical-link-name; - } - case internal-link { - uses org-openroadm-resource-types:internal-link-name; - } - case shelf { - uses org-openroadm-resource-types:shelf-name; - } - case srg { - uses org-openroadm-resource-types:srg-number { - refine srg-number { - mandatory true; - } - } - } - case degree { - uses org-openroadm-resource-types:degree-number { - refine degree-number { - mandatory true; - } - } - } - case service { - uses org-openroadm-resource-types:service-name; - } - case interface { - uses org-openroadm-resource-types:interface-name; - } - } - } - container resourceType { - uses org-openroadm-resource-types:resource-type; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang b/tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang deleted file mode 100644 index e8f5a1ed6..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-routing-constraints.yang +++ /dev/null @@ -1,128 +0,0 @@ -module org-openroadm-routing-constraints { - namespace "http://org/openroadm/routing/constrains"; - prefix org-openroadm-routing-constraints; - - organization - "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of routing constraints. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping routing-constraints { - container hard-constraints { - uses constraints; - } - container soft-constraints { - uses constraints; - } - } - - grouping constraints { - leaf-list customer-code { - type string; - } - choice co-routing-or-general { - case general { - container diversity { - uses diversity-existing-service-contraints; - } - container exclude { - uses common-constraints; - leaf-list supporting-service-name { - description - "Supporting service(s) to exclude from this route."; - type string; - } - } - container include { - uses common-constraints; - leaf-list supporting-service-name { - description - "Supporting service(s) to include in this route."; - type string; - } - } - container latency { - description - "Maximum latency allowed"; - leaf max-latency { - type uint32; - units "ms"; - } - } - } - case co-routing { - container co-routing { - leaf-list existing-service { - type string; - description - "Diverse from existing services identified by facility CLFI"; - } - } - } - } - } - - grouping common-constraints { - leaf-list fiber-bundle { - type string; - } - leaf-list site { - type string; - } - leaf-list node-id { - type string; - } - } - - grouping diversity-existing-service-contraints { - leaf-list existing-service { - type string; - description - "Diverse from existing services identified by facility CLFI"; - } - container existing-service-applicability { - leaf site { - type boolean; - } - leaf node { - type boolean; - } - leaf srlg { - type boolean; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-rstp.yang b/tests/ordmodels_1.2.1/org-openroadm-rstp.yang deleted file mode 100644 index 0bec3d913..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-rstp.yang +++ /dev/null @@ -1,310 +0,0 @@ -module org-openroadm-rstp { - namespace "http://org/openroadm/rstp"; - prefix org-openroadm-rstp; - - import org-openroadm-device { - prefix org-openroadm-device; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for rstp protocol. - - - 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 2016-10-14 { - description - "Version 1.2"; - } - - typedef bridge-id-type { - type string; - description - "Unique Bridge Identifier"; - } - - grouping rstp-common-bridge-config { - leaf bridge-priority { - description - "Bridge Priority Value"; - type uint32 { - range "0..61440"; - } - default "32768"; - } - leaf shutdown { - description - "Bridge admin state"; - type empty; - } - leaf hold-time { - description - "The time interval during which no more than two - BPDUs transmitted by this node in seconds - not used in rstp mode (in seconds)"; - type uint32 { - range "1..10"; - } - default "2"; - } - leaf hello-time { - description - "The time between the transmission of BPDU's by this node on any - port, when role is rooti (in seconds)"; - type uint32 { - range "1..10"; - } - default "2"; - } - leaf max-age { - description - "The value that all bridges use for MaxAge when this bridge - is acting as the root"; - type uint32 { - range "6..40"; - } - default "20"; - } - leaf forward-delay { - description - "The port on the Switch spends this time in the listening - state while moving from the blocking state to the forwarding state (in seconds)"; - type uint32 { - range "4..30"; - } - default "15"; - } - leaf transmit-hold-count { - description - "Maximum BPDU transmission rate"; - type uint32 { - range "1..10"; - } - default "2"; - } - } - - grouping rstp-root-bridge-attr { - leaf root-bridge-port { - description - "Port id of the root port"; - type uint32; - } - leaf root-path-cost { - description - "The cost of the path to the root as - seen from this bridge"; - type uint32; - } - leaf root-bridge-priority { - description - "Root Bridge Priority Value"; - type uint32; - } - leaf root-bridge-id { - description - "Root Bridge identifier"; - type bridge-id-type; - } - leaf root-hold-time { - description - "The time interval during which no more than two - BPDUs transmitted by this node in seconds at root node (in seconds)"; - type uint32; - } - leaf root-hello-time { - description - "The time between the transmission of BPDU's used at root node (in seconds)"; - type uint32; - } - leaf root-max-age { - description - "The value that all bridges use for MaxAge used at root node"; - type uint32; - } - leaf root-forward-delay { - description - "The time in seconds spent on the listening state used at root node (in seconds)"; - type uint32; - } - } - - grouping rstp-bridge-port-state-attr { - list rstp-bridge-port-table { - max-elements "15"; - description - "This table contains port-specific information for rstp state attributes"; - key "ifname"; - leaf ifname { - description - "Interface name of the port"; - type string { - length "1..255"; - } - } - leaf bridge-port-state { - description - "The port's current state"; - type enumeration { - enum "discarding"; - enum "blocked"; - enum "learning"; - enum "forwarding"; - enum "unknown"; - } - } - leaf bridge-port-role { - description - "The role payed by this port in the bridge"; - type enumeration { - enum "designated"; - enum "root"; - enum "alternate"; - enum "disabled"; - enum "backup"; - enum "unknown"; - } - } - leaf bridge-port-id { - description - "Unique port id of this port"; - type uint32; - } - leaf oper-edge-bridge-port { - description - "The operational value of the Edge Port parameter"; - type empty; - } - leaf designated-bridge-port { - description - "Port id of the designated port"; - type uint32; - } - leaf designated-bridgeid { - description - "The Bridge Identifier of the bridge that this port considers - to be the Designated Bridge for this port's segment"; - type bridge-id-type; - } - } - } - - grouping rstp-bridge-port-attr { - list rstp-bridge-port-table { - max-elements "15"; - description - "Table contains port-specific information for rstp config"; - key "ifname"; - leaf ifname { - description - "Interface name of the port"; - type leafref { - path "/org-openroadm-device:org-openroadm-device/org-openroadm-device:interface/org-openroadm-device:name"; - } - } - leaf cost { - description - "The contribution of this port to the path cost of - paths towards the spanning tree root which include this port also"; - type uint32 { - range "2000..200000"; - } - default "20000"; - } - leaf priority { - description - "The value of the priority field"; - type uint32 { - range "0..240"; - } - } - } - } - - grouping rstp-container { - container rstp { - description - "Open ROADM RSTP top level"; - list rstp-bridge-instance { - max-elements "1"; - description - "rstp bridge instance, max instance = 1"; - key "bridge-name"; - leaf bridge-name { - description - "unique name of the bridge"; - type string { - length "1..255"; - } - } - container rstp-config { - description - "Collection of rstp configuration attributes"; - uses rstp-common-bridge-config; - uses rstp-bridge-port-attr; - } - container rstp-state { - description - "Collection of rstp operational attributes"; - config false; - container rstp-bridge-attr { - description - "Collection of operational rstp bridge attributes"; - uses rstp-root-bridge-attr; - leaf bridge-id { - description - "Bridge identifier of the bridge"; - type bridge-id-type; - } - leaf topo-change-count { - description - "The total number of topology changes"; - type uint32; - } - leaf time-since-topo-change { - description - "Time since last topology changes occured (in seconds)"; - type uint32; - } - } - container rstp-bridge-port-attr { - description - "Collection of operational rstp port related attributes"; - uses rstp-bridge-port-state-attr; - } - } - } - } - } - - augment "/org-openroadm-device:org-openroadm-device/org-openroadm-device:protocols" { - when "/org-openroadm-device:org-openroadm-device/org-openroadm-device:info/org-openroadm-device:node-type='rdm'"; - uses rstp-container; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-service.yang b/tests/ordmodels_1.2.1/org-openroadm-service.yang deleted file mode 100644 index 5be86fa0e..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-service.yang +++ /dev/null @@ -1,547 +0,0 @@ -module org-openroadm-service { - namespace "http://org/openroadm/service"; - prefix org-openroadm-service; - - import ietf-yang-types { - prefix yang; - } - import org-openroadm-routing-constraints { - prefix org-openroadm-routing-constraints; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - } - import org-openroadm-common-service-types { - prefix org-openroadm-common-service-types; - } - - organization - "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of services. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - rpc service-create { - input { - leaf service-name { - type string; - description - "Identifier for the service to be created in - the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network."; - mandatory true; - } - leaf common-id { - type string; - description - "To be used by the ROADM controller to identify the routing constraints received from planning application (PED)."; - } - uses org-openroadm-common-service-types:sdnc-request-header; - leaf connection-type { - type org-openroadm-common-service-types:connection-type; - mandatory true; - } - container service-a-end { - uses org-openroadm-common-service-types:service-endpoint; - } - container service-z-end { - uses org-openroadm-common-service-types:service-endpoint; - } - uses org-openroadm-routing-constraints:routing-constraints; - uses org-openroadm-common-service-types:service-information; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - uses org-openroadm-common-service-types:response-parameters; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent."; - } - rpc service-feasibility-check { - input { - leaf common-id { - type string; - mandatory true; - description - "To be used by the ROADM controller to identify the routing - constraints received from planning application (PED)."; - } - uses org-openroadm-common-service-types:sdnc-request-header; - leaf connection-type { - type org-openroadm-common-service-types:connection-type; - } - container service-a-end { - uses org-openroadm-common-service-types:service-endpoint; - } - container service-z-end { - uses org-openroadm-common-service-types:service-endpoint; - } - uses org-openroadm-routing-constraints:routing-constraints; - uses org-openroadm-common-service-types:service-information; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - uses org-openroadm-common-service-types:response-parameters; - container service-a-end { - uses org-openroadm-common-service-types:service-endpoint; - list equipment-required { - description - "List of required equipment, including equipment type and quantity"; - key "eqipment-identifier"; - leaf eqipment-identifier { - type string; - } - leaf equipment-type { - type string; - } - leaf equipment-quantity { - type uint32; - } - } - } - container service-z-end { - uses org-openroadm-common-service-types:service-endpoint; - list equipment-required { - description - "List of required equipment, including equipment type and quantity"; - key "eqipment-identifier"; - leaf eqipment-identifier { - type string; - } - leaf equipment-type { - type string; - } - leaf equipment-quantity { - type uint32; - } - } - } - list intermediate-sites { - key "clli"; - uses org-openroadm-common-service-types:service-endpoint; - list equipment-required { - description - "List of required equipment, including equipment type and quantity"; - key "eqipment-identifier"; - leaf eqipment-identifier { - type string; - } - leaf equipment-type { - type string; - } - leaf equipment-quantity { - type uint32; - } - } - } - } - description - "Whether a service was possible to be created, and if so - the routing constraints match and the a and z end connection that have - to match"; - } - rpc service-delete { - input { - uses org-openroadm-common-service-types:sdnc-request-header; - container service-delete-req-info { - leaf service-name { - type string; - description - "Identifier for the service to be deleted in - the ROADM network, e.g., CLFI, CLCI, etc."; - mandatory true; - } - leaf due-date { - type yang:date-and-time; - description - "date and time service to be turned down. If missing, now."; - } - leaf tail-retention { - type enumeration { - enum "yes" { - value 1; - description - "tails are left intact "; - } - enum "no" { - value 2; - description - "tails are deleted"; - } - } - mandatory true; - } - } - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent. Once the service has been deleted, it no longer will appear in the service list"; - } - rpc equipment-notification { - input { - uses org-openroadm-common-service-types:sdnc-request-header; - leaf equiptment-id { - type string; - mandatory true; - } - leaf equipment-name { - type string; - } - leaf equipemt-type { - type string; - mandatory true; - } - leaf equipment-vendor { - type string; - mandatory true; - } - leaf equipment-customer { - type string; - } - leaf equipment-clli { - type string; - mandatory true; - } - leaf equipment-ip { - type string; - } - leaf controller-id { - type string; - mandatory true; - } - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - } - rpc temp-service-create { - input { - leaf common-id { - type string; - description - "To be used by the ROADM controller to identify the routing constraints received from planning application (PED)."; - mandatory true; - } - uses org-openroadm-common-service-types:sdnc-request-header; - leaf connection-type { - type org-openroadm-common-service-types:connection-type; - mandatory true; - } - container service-a-end { - uses org-openroadm-common-service-types:service-endpoint; - } - container service-z-end { - uses org-openroadm-common-service-types:service-endpoint; - } - uses org-openroadm-routing-constraints:routing-constraints; - uses org-openroadm-common-service-types:service-information; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - uses org-openroadm-common-service-types:response-parameters; - } - } - rpc temp-service-delete { - input { - leaf common-id { - type string; - mandatory true; - } - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - } - rpc service-roll { - input { - leaf service-name { - type string; - mandatory true; - description - "Identifier for the service to be rolled in - the ROADM network, e.g., CLFI, CLCI, etc."; - } - leaf due-date { - type yang:date-and-time; - description - "date and time service to be rolled"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc service-reconfigure { - input { - leaf service-name { - type string; - mandatory true; - description - "Existing identifier for the service to be - reconfigured in the ROADM network, e.g., CLFI, CLCI, etc."; - } - leaf new-service-name { - type string; - description - "New identifier for the service to be - reconfigured in the ROADM network, e.g., CLFI, CLCI, etc."; - } - leaf common-id { - type string; - description - "To be used by the ROADM controller to identify the routing - constraints received from planning application (PED)."; - } - leaf connection-type { - type org-openroadm-common-service-types:connection-type; - } - container service-a-end { - uses org-openroadm-common-service-types:service-endpoint; - } - container service-z-end { - uses org-openroadm-common-service-types:service-endpoint; - } - uses org-openroadm-routing-constraints:routing-constraints; - uses org-openroadm-common-service-types:service-information; - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent."; - } - rpc service-restoration { - input { - leaf service-name { - type string; - mandatory true; - description - "Identifier for the service to be restored in - the ROADM network, e.g., CLFI, CLCI, etc."; - } - leaf option { - type enumeration { - enum "permanent" { - value 1; - description - "A spare regen can be used to restore the - service permanently without reverting back to the - original regen"; - } - enum "temporary" { - value 2; - description - "a spare regen can be used to restore the - service temporarily. The service needs to be reverted - back to the original regen transponder"; - } - } - mandatory true; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent."; - } - rpc service-reversion { - input { - leaf service-name { - type string; - mandatory true; - description - "Identifier for the service to be reverted - in the ROADM network, e.g., CLFI, CLCI, etc. "; - } - leaf due-date { - type yang:date-and-time; - description - "date and time service to be reverted"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent."; - } - rpc service-reroute { - input { - leaf service-name { - type string; - mandatory true; - description - "Identifier for the service to be re-routed in - the ROADM network, e.g., CLFI, CLCI, etc."; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - uses org-openroadm-routing-constraints:routing-constraints; - } - description - "Whether this request was validated and processed correct. If sucessful, it return the proposed new route. - If acceptable, this request should be followed by a service-reroute-confirm to complete the reroute operation."; - } - rpc service-reroute-confirm { - input { - leaf service-name { - type string; - mandatory true; - description - "Identifier for the service to be re-routed in - the ROADM network, e.g., CLFI, CLCI, etc."; - } - uses org-openroadm-routing-constraints:routing-constraints; - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - description - "Whether this request passed initial validation and was accepted for processing. Once the request completes processing, a - service-rpc-result Notification shall be sent."; - } - rpc network-re-optimization { - input { - leaf service-name { - type string; - description - "Identifier for the service in the ROADM network, - e.g., CLFI, CLCI, etc. whose path is to be checked by the RNC - for re-optimization"; - } - leaf a-end { - type string; - description - "Services whose A-ends are terminated at the - specified office location are to be checked by the RNC for - re-optimization"; - } - leaf z-end { - type string; - description - "Services whose Z-ends are terminated at the - specified office location are to be checked by the RNC for - re-optimization "; - } - leaf pass-through { - type string; - description - "Services that are pass-through (either via - regen or express) at the specified office location are to - be checked by the RNC for re-optimization"; - } - leaf customer-code { - type string; - description - "Services that belong to the specified customer - are to be checked by the RNC for re-optimization "; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - leaf optimization-candidate { - type string; - } - } - } - container service-list { - description - "List of service. Can only be created, deleted, modified, etc. using special RPCs."; - list services { - key "service-name"; - uses org-openroadm-common-service-types:service; - } - } - container temp-service-list { - description - "List of temporary services Can only be created, deleted, modified, etc. using special RPCs."; - list services { - key "common-id"; - uses org-openroadm-common-service-types:service { - refine "service-name" { - mandatory false; - } - } - } - } - notification service-rpc-result { - description - "This Notification indicates result of service RPC"; - leaf notification-type { - type org-openroadm-common-service-types:service-notification-types; - } - uses org-openroadm-common-types:rpc-response-status; - uses org-openroadm-common-service-types:service-notification-result; - } - notification service-traffic-flow { - description - "This Notification indicates that traffic is flowing again on the service after an administrative action has completed"; - leaf service-name { - type string; - description - "Identifier for the service being reported on"; - mandatory true; - } - leaf actual-date { - type yang:date-and-time; - description - "Actual date and time traffic started flowing"; - } - } - notification service-notification { - description - "This Notification that a service has been added, modified or removed. - A resourceCreation notification shall contain the created service in its entirety. - A resourceMofified notification shall contain just the modified field, plus the service identifier - A resourceDeleted notification shall just contain the service identifier"; - leaf notificationType { - type org-openroadm-resource-types:resource-notification-type; - description - "Whether this notification indicates a service creation, service modification or service deletion."; - } - uses org-openroadm-common-service-types:service; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-swdl.yang b/tests/ordmodels_1.2.1/org-openroadm-swdl.yang deleted file mode 100644 index 0fdcdb605..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-swdl.yang +++ /dev/null @@ -1,120 +0,0 @@ -module org-openroadm-swdl { - namespace "http://org/openroadm/de/swdl"; - prefix org-openroadm-swdl; - - import ietf-yang-types { - prefix yang; - } - - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "Yang definitions for System Management. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping sw-bank { - leaf sw-version { - type string; - description - "Gissue of the SW in this bank"; - } - leaf sw-validation-timer { - type string { - pattern "(([0-1][0-9]|2[0-3])-([0-5][0-9])-([0-5][0-9]))"; - } - description - "value of validation timer in hh-mm-ss"; - } - leaf activation-date-time { - type yang:date-and-time; - description - "activation date and time: The date load was activated"; - } - } - - rpc sw-stage { - description - "SW stage - copies the SW from repo to staging bank"; - input { - leaf filename { - type string { - length "10..255"; - } - description - "file name which has the load"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc sw-activate { - description - "Activate new load"; - input { - leaf version { - type string; - description - " software version of the new load which is being activated"; - } - leaf validationTimer { - type string; - description - "validation timer hh-mm-ss"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } - rpc cancel-validation-timer { - description - "Cancel validation timer which user provisioned as part of activate command"; - input { - leaf accept { - type boolean; - default "true"; - description - " TRUE means validation timer is cancelled and new load is accepted"; - } - } - output { - uses org-openroadm-common-types:rpc-response-status; - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-syslog.yang b/tests/ordmodels_1.2.1/org-openroadm-syslog.yang deleted file mode 100644 index cdac3e8c1..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-syslog.yang +++ /dev/null @@ -1,334 +0,0 @@ -module org-openroadm-syslog { - namespace "http://org/openroadm/syslog"; - prefix org-openroadm-syslog; - - import ietf-inet-types { - prefix inet; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "This module contains a collection of YANG definitions - for Syslog configuration. - - 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. - - Also contains code components extracted from IETF Interfaces. These code components - are copyrighted and licensed as follows: - - Copyright (c) 2016 IETF Trust and the persons identified as the document authors. - All rights reserved. - - This document is subject to BCP 78 and the IETF Trust’s Legal Provisions Relating - to IETF Documents (http://trustee.ietf.org/license-info) in effect on the date of - publication of this document. Please review these documents carefully, as they - describe your rights and restrictions with respect to this document. Code Components - extracted from this document must include Simplified BSD License text as described in - Section 4.e of the Trust Legal Provisions and are provided without warranty as - described in the Simplified BSD License."; - reference "RFC 5424: The Syslog Protocol"; - - revision 2016-10-14 { - description - "Version 1.2"; - } - - feature selector-sevop-config { - description - "This feature represents the ability to select messages - using the additional operators equal to, or not equal to - when comparing the Syslog message severity."; - } - - feature selector-match-config { - description - "This feature represents the ability to select messages based - on a Posix 1003.2 regular expression pattern match."; - } - - // copied from draft of ietf-ietf-syslog-types.yang - identity syslog-facility { - description - "The base identity to represent syslog facilities"; - } - - // copied from draft of ietf-ietf-syslog-types.yang; - // extended the enum set to include all and none - typedef severity { - type enumeration { - enum "emergency" { - value 0; - description - "Emergency Level Msg"; - } - enum "alert" { - value 1; - description - "Alert Level Msg"; - } - enum "critical" { - value 2; - description - "Critical Level Msg"; - } - enum "error" { - value 3; - description - "Error Level Msg"; - } - enum "warning" { - value 4; - description - "Warning Level Msg"; - } - enum "notice" { - value 5; - description - "Notification Level Msg"; - } - enum "info" { - value 6; - description - "Informational Level Msg"; - } - enum "debug" { - value 7; - description - "Debugging Level Msg"; - } - enum "all" { - value 8; - description - "This enum describes the case where all severities - are selected."; - } - enum "none" { - value 9; - description - "This enum describes the case where no severities - are selected."; - } - } - description - "The definitions for Syslog message severity as per RFC 5424. - Extended the RFC definition with enums for all and none"; - } - - grouping syslog-severity { - description - "This grouping defines the Syslog severity which is used to - select log messages."; - leaf severity { - type severity; - mandatory true; - description - "This leaf specifies the Syslog message severity. When - severity is specified, the default severity comparison - is all messages of the specified severity and greater are - selected. 'all' is a special case which means all severities - are selected. 'none' is a special case which means that - no selection should occur or disable this filter."; - } - leaf severity-operator { - when - "../severity != 'all' and - ../severity != 'none'" { - description - "The severity-operator is not applicable for severity 'all' or - severity 'none'"; - } - if-feature selector-sevop-config; - type enumeration { - enum "equals-or-higher" { - description - "This enum specifies all messages of the specified - severity and higher are logged according to the - given log-action"; - } - enum "equals" { - description - "This enum specifies all messages that are for - the specified severity are logged according to the - given log-action"; - } - enum "not-equals" { - description - "This enum specifies all messages that are not for - the specified severity are logged according to the - given log-action"; - } - } - default "equals-or-higher"; - description - "This leaf describes the option to specify how the - severity comparison is performed."; - } - } - - grouping syslog-selector { - description - "This grouping defines a Syslog selector which is used to - select log messages for the log-action (buffer, file, - etc). Choose one of the following: - no-log-facility - log-facility [ ...]"; - container log-selector { - description - "This container describes the log selector parameters - for Syslog."; - choice selector-facility { - mandatory true; - description - "This choice describes the option to specify no - facilities, or a specific facility which can be - all for all facilities."; - case no-log-facility { - description - "This case specifies no facilities will match when - comparing the Syslog message facility. This is a - method that can be used to effectively disable a - particular log-action (buffer, file, etc)."; - leaf no-facilities { - type empty; - description - "This leaf specifies that no facilities are selected - for this log-action."; - } - } - case log-facility { - description - "This case specifies one or more specified facilities - will match when comparing the Syslog message facility."; - list log-facility { - key "facility"; - description - "This list describes a collection of Syslog - facilities and severities."; - leaf facility { - type union { - type identityref { - base syslog-facility; - } - type enumeration { - enum "all" { - description - "This enum describes the case where all - facilities are requested."; - } - } - } - description - "The leaf uniquely identifies a Syslog facility."; - } - uses syslog-severity; - } - } - } - } - } - - container syslog { - description - "This container describes the configuration parameters for - Syslog."; - container log-actions { - description - "This container describes the log-action parameters - for Syslog."; - container remote { - description - "This container describes the configuration parameters for - remote logging."; - list destination { - key "name"; - description - "This list describes a collection of remote logging - destinations."; - leaf name { - type string; - description - "An arbitrary name for the endpoint to connect to."; - } - choice transport { - mandatory true; - description - "This choice describes the transport option."; - case tcp { - container tcp { - description - "This container describes the TCP transport - options."; - reference "RFC 6587: Transmission of Syslog Messages over TCP"; - leaf address { - type inet:host; - description - "The leaf uniquely specifies the address of - the remote host. One of the following must - be specified: an ipv4 address, an ipv6 - address, or a host name."; - } - leaf port { - type inet:port-number; - default "514"; - description - "This leaf specifies the port number used to - deliver messages to the remote server."; - } - } - } - case udp { - container udp { - description - "This container describes the UDP transport - options."; - reference "RFC 5426: Transmission of Syslog Messages over UDP"; - leaf address { - type inet:host; - description - "The leaf uniquely specifies the address of - the remote host. One of the following must be - specified: an ipv4 address, an ipv6 address, - or a host name."; - } - leaf port { - type inet:port-number; - default "514"; - description - "This leaf specifies the port number used to - deliver messages to the remote server."; - } - } - } - } - uses syslog-selector; - } - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-tca.yang b/tests/ordmodels_1.2.1/org-openroadm-tca.yang deleted file mode 100644 index 4949508ea..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-tca.yang +++ /dev/null @@ -1,122 +0,0 @@ -module org-openroadm-tca { - namespace "http://org/openroadm/tca"; - prefix org-openroadm-tca; - - import ietf-yang-types { - prefix yang; - } - import org-openroadm-common-types { - prefix org-openroadm-common-types; - } - import org-openroadm-pm-types { - prefix org-openroadm-pm-types; - } - import org-openroadm-resource { - prefix org-openroadm-resource; - } - import org-openroadm-layerRate { - prefix org-openroadm-layerRate; - } - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of Threshold Crossing Alert types. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping tca { - leaf id { - type string; - mandatory true; - } - container resource { - uses org-openroadm-resource:resource; - } - leaf granularity { - type org-openroadm-pm-types:pm-granularity; - } - leaf raiseTime { - type yang:date-and-time; - mandatory true; - config false; - } - container layerRate { - uses org-openroadm-layerRate:layer-rate; - } - leaf severity { - mandatory true; - type org-openroadm-common-types:severity; - description - "Severity of alarm. Based on X.733 perceived severity."; - } - leaf thresholdType { - mandatory false; - type enumeration { - enum "high" { - value 1; - } - enum "low" { - value 2; - } - } - description - "Threshold Crossed"; - } - container thresholdMeasurement { - uses org-openroadm-pm-types:pm-measurement; - } - } - - grouping potential-tca { - leaf lowThresholdValue { - mandatory false; - type uint64; - } - leaf highThresholdValue { - mandatory false; - type uint64; - } - uses tca; - } - - container potential-tca-list { - list tca { - key "id"; - uses potential-tca; - } - } - notification tca-notification { - uses tca; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-topology.yang b/tests/ordmodels_1.2.1/org-openroadm-topology.yang deleted file mode 100644 index f616c6a99..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-topology.yang +++ /dev/null @@ -1,91 +0,0 @@ -module org-openroadm-topology { - namespace "http://org/openroadm/topology"; - prefix org-openroadm-topology; - - import org-openroadm-resource { - prefix org-openroadm-resource; - } - - organization - "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of topology. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping topology { - description - "Topology reports the individual hops along the service in the A to Z direction and Z to A directions. This includes both ports internal to a device and those - at its edge that are available for externally connections. It includes both physical and logical ports. - Physical ports are ordered with the logical ports that run over them as follows: - a.\tOn ingress to a node/card, physical then logical - b.\tOn egress to a node/card, logical then physical"; - list aToZ { - key "id"; - leaf id { - description - "Unigue identifier for this topology component within this service"; - type string; - } - uses hop; - } - list zToA { - key "id"; - leaf id { - description - "Unigue identifier for this topology component within this service"; - type string; - } - uses hop; - } - } - - grouping hop { - leaf hop-type { - type enumeration { - enum "node-external" { - description - "The given resource is on the edge of the node, and used in relationships to resources outside of the node."; - value 1; - } - enum "node-internal" { - description - "The given resource is internally to the node"; - value 2; - } - } - } - uses org-openroadm-resource:resource; - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang b/tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang deleted file mode 100644 index fb5fa6d9e..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-user-mgmt.yang +++ /dev/null @@ -1,109 +0,0 @@ -module org-openroadm-user-mgmt { - namespace "http://org/openroadm/user-mgmt"; - prefix org-openroadm-user-mgmt; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions of user managements. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping user-profile { - list user { - key "name"; - description - "The list of local users configured on this device."; - leaf name { - type string; - description - "The user name string identifying this entry."; - } - leaf password { - type string; - description - "The password for this entry. This shouldn't be in clear text"; - } - leaf group { - type enumeration { - enum "sudo"; - } - description - "The group to which the user is associated to."; - } - } - } - - rpc chg-password { - input { - leaf currentPassword { - type string; - description - "provide the current password"; - mandatory true; - } - leaf newPassword { - type string; - description - "provide a new password"; - mandatory true; - } - leaf newPasswordConfirm { - type string; - description - "re-enter the new password "; - mandatory true; - } - } - output { - leaf status { - type enumeration { - enum "Successful" { - value 1; - } - enum "Failed" { - value 2; - } - } - mandatory true; - description - "Successful or Failed"; - } - leaf status-message { - type string; - description - "Gives a more detailed reason for success / failure"; - } - } - } -} diff --git a/tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang b/tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang deleted file mode 100644 index 451cae63a..000000000 --- a/tests/ordmodels_1.2.1/org-openroadm-wavelength-map.yang +++ /dev/null @@ -1,71 +0,0 @@ -module org-openroadm-wavelength-map { - namespace "http://org/openroadm/wavelength-map"; - prefix org-openroadm-wavelength-map; - - organization "Open ROADM MSA"; - contact - "OpenROADM.org"; - description - "YANG definitions for mapping wavelength-number to center frequency and wavelength value. - - 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 2016-10-14 { - description - "Version 1.2"; - } - - grouping wavelength-map-g { - list wavelengths { - key "wavelength-number"; - leaf wavelength-number { - type uint32; - } - config false; - leaf center-frequency { - type decimal64 { - fraction-digits 3; - range "191.350..196.100"; - } - units "THz"; - description - "Frequency of the transmit optical channel - Domain range: 191.350THz .. 196.100THz "; - } - leaf wavelength { - type decimal64 { - fraction-digits 2; - range "1528.77..1566.72"; - } - units "nm"; - description - "Lambda corresponding to transmit frequency - Domain range: 1528.72nm .. 1566.72nm "; - } - } - } -} diff --git a/tests/pom.xml b/tests/pom.xml deleted file mode 100644 index 61bc63384..000000000 --- a/tests/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent - 4.0.10 - - - - org.opendaylight.transportpce - stubs-aggregator - 0.4.0-SNAPSHOT - ${project.artifactId} - pom - - - stubmodels - stubpce - stubrenderer - - - diff --git a/tests/sample_configs/openroadm/2.1/oper-ROADMB.xml b/tests/sample_configs/openroadm/2.1/oper-ROADMB.xml index 819281d6a..b810543b3 100644 --- a/tests/sample_configs/openroadm/2.1/oper-ROADMB.xml +++ b/tests/sample_configs/openroadm/2.1/oper-ROADMB.xml @@ -1,4174 +1,4174 @@ - - - - - ROADMB - 2 - rdm - NodeB - vendorA - 2 - 0002 - 127.0.0.13 - 28 - 127.0.0.20 - static - 127.0.0.13 - 28 - 127.0.0.20 - bb:bb:bb:bb:bb:bb - 1 - 2 - 9 - - - - openroadm - openroadm - sudo - - - - 1 - - - sdegE - pizza - XYZ - 2 - inService - vendorA - 1 - 00002 - xxxxx - degE - 01 - inService - not-reserved-available - 2016-10-25T09:00:00-00:00 - - 0 - - 2/0 - - - - sdegW - pizza - XYZ - 3 - inService - vendorA - 1 - 00003 - xxxxx - degW - 01 - inService - not-reserved-available - 2016-10-25T09:00:00-00:00 - - 0 - - 3/0 - - - - ssrg - pizza - XYZ - 4 - inService - vendorA - 1 - 00004 - xxxxx - srgW - 01 - inService - not-reserved-available - 2016-10-25T09:00:00-00:00 - - 0 - - 4/0 - - - - 2/0 - WSSDEG - inService - vendorA - WSS9 - 2017-08-08T10:47:04.698808+00:00 - wss1 - inService - not-reserved-available - NORMAL - 2 - 0 - 0 - - OSC-SLOT - - 2/0/OSC-PLUG - - - ETH-PLUG - - 2/0/ETH-PLUG - - - C1 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C2 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C3 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C4 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C5 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C6 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C7 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C8 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - C9 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-CTP-TXRX - - - L1 - LINE - roadm-external - multi-wavelength - bidirectional - 1 - inService - inService - DEG1-TTP-TXRX - - -35.0 - -9.0 - 14.0 - 21.82 - - - - LOG1 - Logical - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - OSC-DEMUX - OSC - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 2/0/OSC-PLUG - port - inService - vendorA - SFP/SFP+ - 00000163600843 - oooooo - 2017-08-08T10:47:04.698808+00:00 - oscplug - 01 - not-reserved-available - NORMAL - 2 - 0 - 0 - - 2/0 - OSC-SLOT - - - OSC-PORT - 1GEX - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 2/0/ETH-PLUG - port - inService - VENDORA - GIGAETHMGT - 2017-08-08T10:47:04.698808+00:00 - ETHE - inService - not-reserved-available - NORMAL - 2 - 0 - 0 - - 2/0 - ETH-PLUG - - - ETH-PLUG - 1GEX - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 3/0 - WSSDEG - inService - vendorA - WSS9 - 2017-08-08T10:47:04.698808+00:00 - wss2 - inService - not-reserved-available - NORMAL - 3 - 0 - 0 - - OSC-SLOT - - 3/0/OSC-PLUG - - - ETH-PLUG - - 3/0/ETH-PLUG - - - C1 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C2 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C3 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C4 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C5 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C6 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C7 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C8 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - C9 - Client - roadm-internal - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-CTP-TXRX - - - L1 - LINE - roadm-external - multi-wavelength - bidirectional - 1 - inService - inService - DEG2-TTP-TXRX - - -35.0 - -9.0 - 14.0 - 21.82 - - - - LOG1 - Logical - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - OSC-DEMUX - OSC - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 3/0/OSC-PLUG - port - inService - vendorA - SFP/SFP+ - 00000163600843 - oooooo - 2017-08-08T10:47:04.698808+00:00 - oscplug - 01 - not-reserved-available - NORMAL - 3 - 0 - 0 - - 3/0 - OSC-SLOT - - - OSC-PORT - 1GEX - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 3/0/ETH-PLUG - port - inService - VENDORA - GIGAETHMGT - 2017-08-08T10:47:04.698808+00:00 - ETHW - inService - not-reserved-available - NORMAL - 3 - 0 - 0 - - 3/0 - ETH-PLUG - - - ETH-PLUG - 1GEX - roadm-internal - multi-wavelength - bidirectional - inService - inService - - - - 4/0 - ADDDROP - inService - vendorA - 16CX4D - cccccccc - inService - not-reserved-available - NORMAL - 4 - 0 - 0 - - C1 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP1 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C10 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP10 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C11 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP11 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C12 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP12 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C13 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP13 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C14 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP14 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C15 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP15 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C16 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP16 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C2 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP2 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C3 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP3 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C4 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP4 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C5 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP5 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C6 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP6 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C7 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP7 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C8 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP8 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C9 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG1-PP9 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - AD-DEG1 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG1-CP-TXRX - - - AD-DEG2 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG1-CP-TXRX - - - AD-DEG3 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG1-CP-TXRX - - - AD-DEG4 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG1-CP-TXRX - - - - 5/0 - ADDDROP - inService - vendorA - 16CX4D - cccccccc - inService - not-reserved-available - NORMAL - 4 - 0 - 0 - - C1 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP1 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C10 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP10 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C11 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP11 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C12 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP12 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C13 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP13 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C14 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP14 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C15 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP15 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C16 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP16 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C2 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP2 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C3 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP3 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C4 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP4 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C5 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG5-PP5 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C6 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP6 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C7 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP7 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C8 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP8 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - C9 - Client - roadm-external - wavelength - bidirectional - inService - inService - SRG3-PP9 - - -15.0 - -28.0 - 10.0 - 15.0 - - - - AD-DEG1 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG3-CP-TXRX - - - AD-DEG2 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG3-CP-TXRX - - - AD-DEG3 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG3-CP-TXRX - - - AD-DEG4 - Edge - roadm-internal - multi-wavelength - bidirectional - inService - inService - SRG3-CP-TXRX - - - - oms-2/0/0/L1 - openROADM-if:openROADMOpticalMultiplex - inService - inService - ots-2/0/0/L1 - 2/0 - L1 - - - oms-3/0/0/L1 - openROADM-if:openROADMOpticalMultiplex - inService - inService - Link-1 - ots-3/0/0/L1 - 3/0 - L1 - - - ots-2/0/0/L1 - openROADM-if:opticalTransport - inService - inService - 2/0 - L1 - - smf - 10 - 10 - - - - ots-3/0/0/L1 - openROADM-if:opticalTransport - inService - inService - 3/0 - L1 - - smf - 25.0 - 25.0 - - - - eth-2/0/ETH-PLUG - openROADM-if:ethernetCsmacd - inService - inService - 2/0/ETH-PLUG - ETH-PLUG - - 1000 - full - 1800 - enabled - 1000 - FULL - - - - eth-3/0/ETH-PLUG - openROADM-if:ethernetCsmacd - inService - inService - 3/0/ETH-PLUG - ETH-PLUG - - 1000 - full - 1800 - enabled - 1000 - FULL - - - - - - enable - 20 - 4 - - - eth-2/0/ETH-PLUG - txandrx - - - eth-3/0/ETH-PLUG - txandrx - - - - eth-2/0/ETH-PLUG - ROADMA - ipV4 - 1.1.1.1 - ifalias - eth-3/0/ETH-PLUG - chassiscomponent - 1? - - - eth-3/0/ETH-PLUG - ROADMC - ipV4 - 1.1.1.1 - ifalias - eth-2/0/ETH-PLUG - chassiscomponent - 1? - - - - - - - 1 - 196.1 - 1528.77 - - - 2 - 196.05 - 1529.16 - - - 3 - 196.0 - 1529.55 - - - 4 - 195.95 - 1529.94 - - - 5 - 195.9 - 1530.33 - - - 6 - 195.85 - 1530.72 - - - 7 - 195.8 - 1531.11 - - - 8 - 195.75 - 1531.5 - - - 9 - 195.7 - 1531.89 - - - 10 - 195.65 - 1532.28 - - - 11 - 195.6 - 1532.67 - - - 12 - 195.55 - 1533.06 - - - 13 - 195.5 - 1533.45 - - - 14 - 195.45 - 1533.84 - - - 15 - 195.4 - 1534.23 - - - 16 - 195.35 - 1534.62 - - - 17 - 195.3 - 1535.01 - - - 18 - 195.25 - 1535.4 - - - 19 - 195.2 - 1535.79 - - - 20 - 195.15 - 1536.18 - - - 21 - 195.1 - 1536.57 - - - 22 - 195.05 - 1536.96 - - - 23 - 195.0 - 1537.35 - - - 24 - 194.95 - 1537.74 - - - 25 - 194.9 - 1538.13 - - - 26 - 194.85 - 1538.52 - - - 27 - 194.8 - 1538.91 - - - 28 - 194.75 - 1539.3 - - - 29 - 194.7 - 1539.69 - - - 30 - 194.65 - 1540.08 - - - 31 - 194.6 - 1540.47 - - - 32 - 194.55 - 1540.86 - - - 33 - 194.5 - 1541.25 - - - 34 - 194.45 - 1541.64 - - - 35 - 194.4 - 1542.03 - - - 36 - 194.35 - 1542.42 - - - 37 - 194.3 - 1542.81 - - - 38 - 194.25 - 1543.2 - - - 39 - 194.2 - 1543.59 - - - 40 - 194.15 - 1543.98 - - - 41 - 194.1 - 1544.37 - - - 42 - 194.05 - 1544.76 - - - 43 - 194.0 - 1545.15 - - - 44 - 193.95 - 1545.54 - - - 45 - 193.9 - 1545.93 - - - 46 - 193.85 - 1546.32 - - - 47 - 193.8 - 1546.71 - - - 48 - 193.75 - 1547.1 - - - 49 - 193.7 - 1547.49 - - - 50 - 193.65 - 1547.88 - - - 51 - 193.6 - 1548.27 - - - 52 - 193.55 - 1548.66 - - - 53 - 193.5 - 1549.05 - - - 54 - 193.45 - 1549.44 - - - 55 - 193.4 - 1549.83 - - - 56 - 193.35 - 1550.22 - - - 57 - 193.3 - 1550.61 - - - 58 - 193.25 - 1551.0 - - - 59 - 193.2 - 1551.39 - - - 60 - 193.15 - 1551.78 - - - 61 - 193.1 - 1552.17 - - - 62 - 193.05 - 1552.56 - - - 63 - 193.0 - 1552.95 - - - 64 - 192.95 - 1553.34 - - - 65 - 192.9 - 1553.73 - - - 66 - 192.85 - 1554.12 - - - 67 - 192.8 - 1554.51 - - - 68 - 192.75 - 1554.9 - - - 69 - 192.7 - 1555.29 - - - 70 - 192.65 - 1555.68 - - - 71 - 192.6 - 1556.07 - - - 72 - 192.55 - 1556.46 - - - 73 - 192.5 - 1556.85 - - - 74 - 192.45 - 1557.24 - - - 75 - 192.4 - 1557.63 - - - 76 - 192.35 - 1558.02 - - - 77 - 192.3 - 1558.41 - - - 78 - 192.25 - 1558.8 - - - 79 - 192.2 - 1559.19 - - - 80 - 192.15 - 1559.58 - - - 81 - 192.1 - 1559.97 - - - 82 - 192.05 - 1560.36 - - - 83 - 192.0 - 1560.75 - - - 84 - 191.95 - 1561.14 - - - 85 - 191.9 - 1561.53 - - - 86 - 191.85 - 1561.92 - - - 87 - 191.8 - 1562.31 - - - 88 - 191.75 - 1562.7 - - - 89 - 191.7 - 1563.09 - - - 90 - 191.65 - 1563.48 - - - 91 - 191.6 - 1563.87 - - - 92 - 191.55 - 1564.26 - - - 93 - 191.5 - 1564.65 - - - 94 - 191.45 - 1565.04 - - - 95 - 191.4 - 1565.43 - - - 96 - 191.35 - 1565.82 - - - - 2/0/C1-to-2/0/L1 - - 2/0 - C1 - - - 2/0 - L1 - - - - 2/0/C2-to-2/0/L1 - - 2/0 - C2 - - - 2/0 - L1 - - - - 2/0/C3-to-2/0/L1 - - 2/0 - C3 - - - 2/0 - L1 - - - - 2/0/C4-to-2/0/L1 - - 2/0 - C4 - - - 2/0 - L1 - - - - 2/0/C5-to-2/0/L1 - - 2/0 - C5 - - - 2/0 - L1 - - - - 2/0/C6-to-2/0/L1 - - 2/0 - C6 - - - 2/0 - L1 - - - - 2/0/C7-to-2/0/L1 - - 2/0 - C7 - - - 2/0 - L1 - - - - 2/0/C8-to-2/0/L1 - - 2/0 - C8 - - - 2/0 - L1 - - - - 2/0/C9-to-2/0/L1 - - 2/0 - C9 - - - 2/0 - L1 - - - - 2/0/L1-to-2/0/C1 - - 2/0 - L1 - - - 2/0 - C1 - - - - 2/0/L1-to-2/0/C2 - - 2/0 - L1 - - - 2/0 - C2 - - - - 2/0/L1-to-2/0/C3 - - 2/0 - L1 - - - 2/0 - C3 - - - - 2/0/L1-to-2/0/C4 - - 2/0 - L1 - - - 2/0 - C4 - - - - 2/0/L1-to-2/0/C5 - - 2/0 - L1 - - - 2/0 - C5 - - - - 2/0/L1-to-2/0/C6 - - 2/0 - L1 - - - 2/0 - C6 - - - - 2/0/L1-to-2/0/C7 - - 2/0 - L1 - - - 2/0 - C7 - - - - 2/0/L1-to-2/0/C8 - - 2/0 - L1 - - - 2/0 - C8 - - - - 2/0/L1-to-2/0/C9 - - 2/0 - L1 - - - 2/0 - C9 - - - - 3/0/C1-to-3/0/L1 - - 3/0 - C1 - - - 3/0 - L1 - - - - 3/0/C2-to-3/0/L1 - - 3/0 - C2 - - - 3/0 - L1 - - - - 3/0/C3-to-3/0/L1 - - 3/0 - C3 - - - 3/0 - L1 - - - - 3/0/C4-to-3/0/L1 - - 3/0 - C4 - - - 3/0 - L1 - - - - 3/0/C5-to-3/0/L1 - - 3/0 - C5 - - - 3/0 - L1 - - - - 3/0/C6-to-3/0/L1 - - 3/0 - C6 - - - 3/0 - L1 - - - - 3/0/C7-to-3/0/L1 - - 3/0 - C7 - - - 3/0 - L1 - - - - 3/0/C8-to-3/0/L1 - - 3/0 - C8 - - - 3/0 - L1 - - - - 3/0/C9-to-3/0/L1 - - 3/0 - C9 - - - 3/0 - L1 - - - - 3/0/L1-to-3/0/C1 - - 3/0 - L1 - - - 3/0 - C1 - - - - 3/0/L1-to-3/0/C2 - - 3/0 - L1 - - - 3/0 - C2 - - - - 3/0/L1-to-3/0/C3 - - 3/0 - L1 - - - 3/0 - C3 - - - - 3/0/L1-to-3/0/C4 - - 3/0 - L1 - - - 3/0 - C4 - - - - 3/0/L1-to-3/0/C5 - - 3/0 - L1 - - - 3/0 - C5 - - - - 3/0/L1-to-3/0/C6 - - 3/0 - L1 - - - 3/0 - C6 - - - - 3/0/L1-to-3/0/C7 - - 3/0 - L1 - - - 3/0 - C7 - - - - 3/0/L1-to-3/0/C8 - - 3/0 - L1 - - - 3/0 - C8 - - - - 3/0/L1-to-3/0/C9 - - 3/0 - L1 - - - 3/0 - C9 - - - - 4/0/C1-to-4/0/ADD-DEG1 - - 4/0 - C1 - - - 4/0 - ADD-DEG1 - - - - 4/0/C1-to-4/0/ADD-DEG2 - - 4/0 - C1 - - - 4/0 - ADD-DEG2 - - - - 4/0/C1-to-4/0/ADD-DEG3 - - 4/0 - C1 - - - 4/0 - ADD-DEG3 - - - - 4/0/C1-to-4/0/ADD-DEG4 - - 4/0 - C1 - - - 4/0 - ADD-DEG4 - - - - 4/0/C2-to-4/0/ADD-DEG1 - - 4/0 - C2 - - - 4/0 - ADD-DEG1 - - - - 4/0/C2-to-4/0/ADD-DEG2 - - 4/0 - C2 - - - 4/0 - ADD-DEG2 - - - - 4/0/C2-to-4/0/ADD-DEG3 - - 4/0 - C2 - - - 4/0 - ADD-DEG3 - - - - 4/0/C2-to-4/0/ADD-DEG4 - - 4/0 - C2 - - - 4/0 - ADD-DEG4 - - - - 4/0/C3-to-4/0/ADD-DEG1 - - 4/0 - C3 - - - 4/0 - ADD-DEG1 - - - - 4/0/C3-to-4/0/ADD-DEG2 - - 4/0 - C3 - - - 4/0 - ADD-DEG2 - - - - 4/0/C3-to-4/0/ADD-DEG3 - - 4/0 - C3 - - - 4/0 - ADD-DEG3 - - - - 4/0/C3-to-4/0/ADD-DEG4 - - 4/0 - C3 - - - 4/0 - ADD-DEG4 - - - - 4/0/C4-to-4/0/ADD-DEG1 - - 4/0 - C4 - - - 4/0 - ADD-DEG1 - - - - 4/0/C4-to-4/0/ADD-DEG2 - - 4/0 - C4 - - - 4/0 - ADD-DEG2 - - - - 4/0/C4-to-4/0/ADD-DEG3 - - 4/0 - C4 - - - 4/0 - ADD-DEG3 - - - - 4/0/C4-to-4/0/ADD-DEG4 - - 4/0 - C4 - - - 4/0 - ADD-DEG4 - - - - 4/0/C5-to-4/0/ADD-DEG1 - - 4/0 - C5 - - - 4/0 - ADD-DEG1 - - - - 4/0/C5-to-4/0/ADD-DEG2 - - 4/0 - C5 - - - 4/0 - ADD-DEG2 - - - - 4/0/C5-to-4/0/ADD-DEG3 - - 4/0 - C5 - - - 4/0 - ADD-DEG3 - - - - 4/0/C5-to-4/0/ADD-DEG4 - - 4/0 - C5 - - - 4/0 - ADD-DEG4 - - - - 4/0/C6-to-4/0/ADD-DEG1 - - 4/0 - C6 - - - 4/0 - ADD-DEG1 - - - - 4/0/C6-to-4/0/ADD-DEG2 - - 4/0 - C6 - - - 4/0 - ADD-DEG2 - - - - 4/0/C6-to-4/0/ADD-DEG3 - - 4/0 - C6 - - - 4/0 - ADD-DEG3 - - - - 4/0/C6-to-4/0/ADD-DEG4 - - 4/0 - C6 - - - 4/0 - ADD-DEG4 - - - - 4/0/C7-to-4/0/ADD-DEG1 - - 4/0 - C7 - - - 4/0 - ADD-DEG1 - - - - 4/0/C7-to-4/0/ADD-DEG2 - - 4/0 - C7 - - - 4/0 - ADD-DEG2 - - - - 4/0/C7-to-4/0/ADD-DEG3 - - 4/0 - C7 - - - 4/0 - ADD-DEG3 - - - - 4/0/C7-to-4/0/ADD-DEG4 - - 4/0 - C7 - - - 4/0 - ADD-DEG4 - - - - 4/0/C8-to-4/0/ADD-DEG1 - - 4/0 - C8 - - - 4/0 - ADD-DEG1 - - - - 4/0/C8-to-4/0/ADD-DEG2 - - 4/0 - C8 - - - 4/0 - ADD-DEG2 - - - - 4/0/C8-to-4/0/ADD-DEG3 - - 4/0 - C8 - - - 4/0 - ADD-DEG3 - - - - 4/0/C8-to-4/0/ADD-DEG4 - - 4/0 - C8 - - - 4/0 - ADD-DEG4 - - - - 4/0/C9-to-4/0/ADD-DEG1 - - 4/0 - C9 - - - 4/0 - ADD-DEG1 - - - - 4/0/C9-to-4/0/ADD-DEG2 - - 4/0 - C9 - - - 4/0 - ADD-DEG2 - - - - 4/0/C9-to-4/0/ADD-DEG3 - - 4/0 - C9 - - - 4/0 - ADD-DEG3 - - - - 4/0/C9-to-4/0/ADD-DEG4 - - 4/0 - C9 - - - 4/0 - ADD-DEG4 - - - - 4/0/C10-to-4/0/ADD-DEG1 - - 4/0 - C10 - - - 4/0 - ADD-DEG1 - - - - 4/0/C10-to-4/0/ADD-DEG2 - - 4/0 - C10 - - - 4/0 - ADD-DEG2 - - - - 4/0/C10-to-4/0/ADD-DEG3 - - 4/0 - C10 - - - 4/0 - ADD-DEG3 - - - - 4/0/C10-to-4/0/ADD-DEG4 - - 4/0 - C10 - - - 4/0 - ADD-DEG4 - - - - 4/0/C11-to-4/0/ADD-DEG1 - - 4/0 - C11 - - - 4/0 - ADD-DEG1 - - - - 4/0/C11-to-4/0/ADD-DEG2 - - 4/0 - C11 - - - 4/0 - ADD-DEG2 - - - - 4/0/C11-to-4/0/ADD-DEG3 - - 4/0 - C11 - - - 4/0 - ADD-DEG3 - - - - 4/0/C11-to-4/0/ADD-DEG4 - - 4/0 - C11 - - - 4/0 - ADD-DEG4 - - - - 4/0/C12-to-4/0/ADD-DEG1 - - 4/0 - C12 - - - 4/0 - ADD-DEG1 - - - - 4/0/C12-to-4/0/ADD-DEG2 - - 4/0 - C12 - - - 4/0 - ADD-DEG2 - - - - 4/0/C12-to-4/0/ADD-DEG3 - - 4/0 - C12 - - - 4/0 - ADD-DEG3 - - - - 4/0/C12-to-4/0/ADD-DEG4 - - 4/0 - C12 - - - 4/0 - ADD-DEG4 - - - - 4/0/C13-to-4/0/ADD-DEG1 - - 4/0 - C13 - - - 4/0 - ADD-DEG1 - - - - 4/0/C13-to-4/0/ADD-DEG2 - - 4/0 - C13 - - - 4/0 - ADD-DEG2 - - - - 4/0/C13-to-4/0/ADD-DEG3 - - 4/0 - C13 - - - 4/0 - ADD-DEG3 - - - - 4/0/C13-to-4/0/ADD-DEG4 - - 4/0 - C13 - - - 4/0 - ADD-DEG4 - - - - 4/0/C14-to-4/0/ADD-DEG1 - - 4/0 - C14 - - - 4/0 - ADD-DEG1 - - - - 4/0/C14-to-4/0/ADD-DEG2 - - 4/0 - C14 - - - 4/0 - ADD-DEG2 - - - - 4/0/C14-to-4/0/ADD-DEG3 - - 4/0 - C14 - - - 4/0 - ADD-DEG3 - - - - 4/0/C14-to-4/0/ADD-DEG4 - - 4/0 - C14 - - - 4/0 - ADD-DEG4 - - - - 4/0/C15-to-4/0/ADD-DEG1 - - 4/0 - C15 - - - 4/0 - ADD-DEG1 - - - - 4/0/C15-to-4/0/ADD-DEG2 - - 4/0 - C15 - - - 4/0 - ADD-DEG2 - - - - 4/0/C15-to-4/0/ADD-DEG3 - - 4/0 - C15 - - - 4/0 - ADD-DEG3 - - - - 4/0/C15-to-4/0/ADD-DEG4 - - 4/0 - C15 - - - 4/0 - ADD-DEG4 - - - - 4/0/C16-to-4/0/ADD-DEG1 - - 4/0 - C16 - - - 4/0 - ADD-DEG1 - - - - 4/0/C16-to-4/0/ADD-DEG2 - - 4/0 - C16 - - - 4/0 - ADD-DEG2 - - - - 4/0/C16-to-4/0/ADD-DEG3 - - 4/0 - C16 - - - 4/0 - ADD-DEG3 - - - - 4/0/C16-to-4/0/ADD-DEG4 - - 4/0 - C16 - - - 4/0 - ADD-DEG4 - - - - 4/0/ADD-DEG1-to-4/0/C1 - - 4/0 - ADD-DEG1 - - - 4/0 - C1 - - - - 4/0/ADD-DEG1-to-4/0/C2 - - 4/0 - ADD-DEG1 - - - 4/0 - C2 - - - - 4/0/ADD-DEG1-to-4/0/C3 - - 4/0 - ADD-DEG1 - - - 4/0 - C3 - - - - 4/0/ADD-DEG1-to-4/0/C4 - - 4/0 - ADD-DEG1 - - - 4/0 - C4 - - - - 4/0/ADD-DEG1-to-4/0/C5 - - 4/0 - ADD-DEG1 - - - 4/0 - C5 - - - - 4/0/ADD-DEG1-to-4/0/C6 - - 4/0 - ADD-DEG1 - - - 4/0 - C6 - - - - 4/0/ADD-DEG1-to-4/0/C7 - - 4/0 - ADD-DEG1 - - - 4/0 - C7 - - - - 4/0/ADD-DEG1-to-4/0/C8 - - 4/0 - ADD-DEG1 - - - 4/0 - C8 - - - - 4/0/ADD-DEG1-to-4/0/C9 - - 4/0 - ADD-DEG1 - - - 4/0 - C9 - - - - 4/0/ADD-DEG1-to-4/0/C10 - - 4/0 - ADD-DEG1 - - - 4/0 - C10 - - - - 4/0/ADD-DEG1-to-4/0/C11 - - 4/0 - ADD-DEG1 - - - 4/0 - C11 - - - - 4/0/ADD-DEG1-to-4/0/C12 - - 4/0 - ADD-DEG1 - - - 4/0 - C12 - - - - 4/0/ADD-DEG1-to-4/0/C13 - - 4/0 - ADD-DEG1 - - - 4/0 - C13 - - - - 4/0/ADD-DEG1-to-4/0/C14 - - 4/0 - ADD-DEG1 - - - 4/0 - C14 - - - - 4/0/ADD-DEG1-to-4/0/C15 - - 4/0 - ADD-DEG1 - - - 4/0 - C15 - - - - 4/0/ADD-DEG1-to-4/0/C16 - - 4/0 - ADD-DEG1 - - - 4/0 - C16 - - - - 4/0/ADD-DEG2-to-4/0/C1 - - 4/0 - ADD-DEG2 - - - 4/0 - C1 - - - - 4/0/ADD-DEG2-to-4/0/C2 - - 4/0 - ADD-DEG2 - - - 4/0 - C2 - - - - 4/0/ADD-DEG2-to-4/0/C3 - - 4/0 - ADD-DEG2 - - - 4/0 - C3 - - - - 4/0/ADD-DEG2-to-4/0/C4 - - 4/0 - ADD-DEG2 - - - 4/0 - C4 - - - - 4/0/ADD-DEG2-to-4/0/C5 - - 4/0 - ADD-DEG2 - - - 4/0 - C5 - - - - 4/0/ADD-DEG2-to-4/0/C6 - - 4/0 - ADD-DEG2 - - - 4/0 - C6 - - - - 4/0/ADD-DEG2-to-4/0/C7 - - 4/0 - ADD-DEG2 - - - 4/0 - C7 - - - - 4/0/ADD-DEG2-to-4/0/C8 - - 4/0 - ADD-DEG2 - - - 4/0 - C8 - - - - 4/0/ADD-DEG2-to-4/0/C9 - - 4/0 - ADD-DEG2 - - - 4/0 - C9 - - - - 4/0/ADD-DEG2-to-4/0/C10 - - 4/0 - ADD-DEG2 - - - 4/0 - C10 - - - - 4/0/ADD-DEG2-to-4/0/C11 - - 4/0 - ADD-DEG2 - - - 4/0 - C11 - - - - 4/0/ADD-DEG2-to-4/0/C12 - - 4/0 - ADD-DEG2 - - - 4/0 - C12 - - - - 4/0/ADD-DEG2-to-4/0/C13 - - 4/0 - ADD-DEG2 - - - 4/0 - C13 - - - - 4/0/ADD-DEG2-to-4/0/C14 - - 4/0 - ADD-DEG2 - - - 4/0 - C14 - - - - 4/0/ADD-DEG2-to-4/0/C15 - - 4/0 - ADD-DEG2 - - - 4/0 - C15 - - - - 4/0/ADD-DEG2-to-4/0/C16 - - 4/0 - ADD-DEG2 - - - 4/0 - C16 - - - - 4/0/ADD-DEG3-to-4/0/C1 - - 4/0 - ADD-DEG3 - - - 4/0 - C1 - - - - 4/0/ADD-DEG3-to-4/0/C2 - - 4/0 - ADD-DEG3 - - - 4/0 - C2 - - - - 4/0/ADD-DEG3-to-4/0/C3 - - 4/0 - ADD-DEG3 - - - 4/0 - C3 - - - - 4/0/ADD-DEG3-to-4/0/C4 - - 4/0 - ADD-DEG3 - - - 4/0 - C4 - - - - 4/0/ADD-DEG3-to-4/0/C5 - - 4/0 - ADD-DEG3 - - - 4/0 - C5 - - - - 4/0/ADD-DEG3-to-4/0/C6 - - 4/0 - ADD-DEG3 - - - 4/0 - C6 - - - - 4/0/ADD-DEG3-to-4/0/C7 - - 4/0 - ADD-DEG3 - - - 4/0 - C7 - - - - 4/0/ADD-DEG3-to-4/0/C8 - - 4/0 - ADD-DEG3 - - - 4/0 - C8 - - - - 4/0/ADD-DEG3-to-4/0/C9 - - 4/0 - ADD-DEG3 - - - 4/0 - C9 - - - - 4/0/ADD-DEG3-to-4/0/C10 - - 4/0 - ADD-DEG3 - - - 4/0 - C10 - - - - 4/0/ADD-DEG3-to-4/0/C11 - - 4/0 - ADD-DEG3 - - - 4/0 - C11 - - - - 4/0/ADD-DEG3-to-4/0/C12 - - 4/0 - ADD-DEG3 - - - 4/0 - C12 - - - - 4/0/ADD-DEG3-to-4/0/C13 - - 4/0 - ADD-DEG3 - - - 4/0 - C13 - - - - 4/0/ADD-DEG3-to-4/0/C14 - - 4/0 - ADD-DEG3 - - - 4/0 - C14 - - - - 4/0/ADD-DEG3-to-4/0/C15 - - 4/0 - ADD-DEG3 - - - 4/0 - C15 - - - - 4/0/ADD-DEG3-to-4/0/C16 - - 4/0 - ADD-DEG3 - - - 4/0 - C16 - - - - 4/0/ADD-DEG4-to-4/0/C1 - - 4/0 - ADD-DEG4 - - - 4/0 - C1 - - - - 4/0/ADD-DEG4-to-4/0/C2 - - 4/0 - ADD-DEG4 - - - 4/0 - C2 - - - - 4/0/ADD-DEG4-to-4/0/C3 - - 4/0 - ADD-DEG4 - - - 4/0 - C3 - - - - 4/0/ADD-DEG4-to-4/0/C4 - - 4/0 - ADD-DEG4 - - - 4/0 - C4 - - - - 4/0/ADD-DEG4-to-4/0/C5 - - 4/0 - ADD-DEG4 - - - 4/0 - C5 - - - - 4/0/ADD-DEG4-to-4/0/C6 - - 4/0 - ADD-DEG4 - - - 4/0 - C6 - - - - 4/0/ADD-DEG4-to-4/0/C7 - - 4/0 - ADD-DEG4 - - - 4/0 - C7 - - - - 4/0/ADD-DEG4-to-4/0/C8 - - 4/0 - ADD-DEG4 - - - 4/0 - C8 - - - - 4/0/ADD-DEG4-to-4/0/C9 - - 4/0 - ADD-DEG4 - - - 4/0 - C9 - - - - 4/0/ADD-DEG4-to-4/0/C10 - - 4/0 - ADD-DEG4 - - - 4/0 - C10 - - - - 4/0/ADD-DEG4-to-4/0/C11 - - 4/0 - ADD-DEG4 - - - 4/0 - C11 - - - - 4/0/ADD-DEG4-to-4/0/C12 - - 4/0 - ADD-DEG4 - - - 4/0 - C12 - - - - 4/0/ADD-DEG4-to-4/0/C13 - - 4/0 - ADD-DEG4 - - - 4/0 - C13 - - - - 4/0/ADD-DEG4-to-4/0/C14 - - 4/0 - ADD-DEG4 - - - 4/0 - C14 - - - - 4/0/ADD-DEG4-to-4/0/C15 - - 4/0 - ADD-DEG4 - - - 4/0 - C15 - - - - 4/0/ADD-DEG4-to-4/0/C16 - - 4/0 - ADD-DEG4 - - - 4/0 - C16 - - - - phylink-1 - - 2/0 - C1 - - - 4/0 - ADD-DEG1 - - - - phylink-2 - - 4/0 - ADD-DEG1 - - - 2/0 - C1 - - - - phylink-3 - - 3/0 - C1 - - - 4/0 - ADD-DEG2 - - - - phylink-4 - - 4/0 - ADD-DEG2 - - - 3/0 - C1 - - - - phylink-5 - - 2/0 - C9 - - - 3/0 - C9 - - - - phylink-6 - - 3/0 - C9 - - - 2/0 - C9 - - - - 1 - 96 - - 1 - 2/0 - - - 2 - 2/0/OSC-PLUG - - - 3 - 2/0/ETH-PLUG - - - 1 - 2/0 - L1 - - - - 2 - 96 - - 1 - 3/0 - - - 2 - 3/0/OSC-PLUG - - - 3 - 3/0/ETH-PLUG - - - 1 - 3/0 - L1 - - - - 1 - 16 - onePerSRG - - 1 - 4/0 - - - - 3 - 16 - onePerSRG - - 1 - 5/0 - - - - 1 - - 2/0 - L1 - - - 4/0 - C1 - - - 4/0 - C2 - - - 4/0 - C3 - - - 4/0 - C4 - - - 4/0 - C5 - - - 4/0 - C6 - - - 4/0 - C7 - - - 4/0 - C8 - - - 4/0 - C9 - - - 4/0 - C10 - - - 4/0 - C11 - - - 4/0 - C12 - - - 4/0 - C13 - - - 4/0 - C14 - - - 4/0 - C15 - - - 4/0 - C16 - - - - 2 - - 4/0 - C1 - - - 2/0 - E1 - - - - 3 - - 4/0 - C2 - - - 2/0 - E1 - - - - 4 - - 4/0 - C3 - - - 2/0 - E1 - - - - 5 - - 4/0 - C4 - - - 2/0 - E1 - - - - 6 - - 4/0 - C5 - - - 2/0 - E1 - - - - 7 - - 4/0 - C6 - - - 2/0 - E1 - - - - 8 - - 4/0 - C7 - - - 2/0 - E1 - - - - 9 - - 4/0 - C8 - - - 2/0 - E1 - - - - 10 - - 4/0 - C9 - - - 2/0 - E1 - - - - 11 - - 4/0 - C10 - - - 2/0 - E1 - - - - 12 - - 4/0 - C11 - - - 2/0 - E1 - - - - 13 - - 4/0 - C12 - - - 2/0 - E1 - - - - 14 - - 4/0 - C13 - - - 2/0 - E1 - - - - 15 - - 4/0 - C14 - - - 2/0 - E1 - - - - 16 - - 4/0 - C15 - - - 2/0 - E1 - - - - 17 - - 4/0 - C16 - - - 2/0 - E1 - - - - 18 - - 3/0 - L1 - - - 4/0 - C1 - - - 4/0 - C2 - - - 4/0 - C3 - - - 4/0 - C4 - - - 4/0 - C5 - - - 4/0 - C6 - - - 4/0 - C7 - - - 4/0 - C8 - - - 4/0 - C9 - - - 4/0 - C10 - - - 4/0 - C11 - - - 4/0 - C12 - - - 4/0 - C13 - - - 4/0 - C14 - - - 4/0 - C15 - - - 4/0 - C16 - - - - 19 - - 4/0 - C1 - - - 3/0 - E1 - - - - 20 - - 4/0 - C2 - - - 3/0 - E1 - - - - 21 - - 4/0 - C3 - - - 3/0 - E1 - - - - 22 - - 4/0 - C4 - - - 3/0 - E1 - - - - 23 - - 4/0 - C5 - - - 3/0 - E1 - - - - 24 - - 4/0 - C6 - - - 3/0 - E1 - - - - 25 - - 4/0 - C7 - - - 3/0 - E1 - - - - 26 - - 4/0 - C8 - - - 3/0 - E1 - - - - 27 - - 4/0 - C9 - - - 3/0 - E1 - - - - 28 - - 4/0 - C10 - - - 3/0 - E1 - - - - 29 - - 4/0 - C11 - - - 3/0 - E1 - - - - 30 - - 4/0 - C12 - - - 3/0 - E1 - - - - 31 - - 4/0 - C13 - - - 3/0 - E1 - - - - 32 - - 4/0 - C14 - - - 3/0 - E1 - - - - 33 - - 4/0 - C15 - - - 3/0 - E1 - - - - 34 - - 4/0 - C16 - - - 3/0 - E1 - - - - + + + + + ROADMB + 2 + rdm + NodeB + vendorA + 2 + 0002 + 127.0.0.13 + 28 + 127.0.0.20 + static + 127.0.0.13 + 28 + 127.0.0.20 + bb:bb:bb:bb:bb:bb + 1 + 2 + 9 + + + + openroadm + openroadm + sudo + + + + 1 + + + sdegE + pizza + XYZ + 2 + inService + vendorA + 1 + 00002 + xxxxx + degE + 01 + inService + not-reserved-available + 2016-10-25T09:00:00-00:00 + + 0 + + 2/0 + + + + sdegW + pizza + XYZ + 3 + inService + vendorA + 1 + 00003 + xxxxx + degW + 01 + inService + not-reserved-available + 2016-10-25T09:00:00-00:00 + + 0 + + 3/0 + + + + ssrg + pizza + XYZ + 4 + inService + vendorA + 1 + 00004 + xxxxx + srgW + 01 + inService + not-reserved-available + 2016-10-25T09:00:00-00:00 + + 0 + + 4/0 + + + + 2/0 + WSSDEG + inService + vendorA + WSS9 + 2017-08-08T10:47:04.698808+00:00 + wss1 + inService + not-reserved-available + NORMAL + 2 + 0 + 0 + + OSC-SLOT + + 2/0/OSC-PLUG + + + ETH-PLUG + + 2/0/ETH-PLUG + + + C1 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C2 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C3 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C4 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C5 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C6 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C7 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C8 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + C9 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-CTP-TXRX + + + L1 + LINE + roadm-external + multi-wavelength + bidirectional + 1 + inService + inService + DEG1-TTP-TXRX + + -35.0 + -9.0 + 14.0 + 21.82 + + + + LOG1 + Logical + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + OSC-DEMUX + OSC + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 2/0/OSC-PLUG + port + inService + vendorA + SFP/SFP+ + 00000163600843 + oooooo + 2017-08-08T10:47:04.698808+00:00 + oscplug + 01 + not-reserved-available + NORMAL + 2 + 0 + 0 + + 2/0 + OSC-SLOT + + + OSC-PORT + 1GEX + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 2/0/ETH-PLUG + port + inService + VENDORA + GIGAETHMGT + 2017-08-08T10:47:04.698808+00:00 + ETHE + inService + not-reserved-available + NORMAL + 2 + 0 + 0 + + 2/0 + ETH-PLUG + + + ETH-PLUG + 1GEX + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 3/0 + WSSDEG + inService + vendorA + WSS9 + 2017-08-08T10:47:04.698808+00:00 + wss2 + inService + not-reserved-available + NORMAL + 3 + 0 + 0 + + OSC-SLOT + + 3/0/OSC-PLUG + + + ETH-PLUG + + 3/0/ETH-PLUG + + + C1 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C2 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C3 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C4 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C5 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C6 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C7 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C8 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + C9 + Client + roadm-internal + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-CTP-TXRX + + + L1 + LINE + roadm-external + multi-wavelength + bidirectional + 1 + inService + inService + DEG2-TTP-TXRX + + -35.0 + -9.0 + 14.0 + 21.82 + + + + LOG1 + Logical + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + OSC-DEMUX + OSC + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 3/0/OSC-PLUG + port + inService + vendorA + SFP/SFP+ + 00000163600843 + oooooo + 2017-08-08T10:47:04.698808+00:00 + oscplug + 01 + not-reserved-available + NORMAL + 3 + 0 + 0 + + 3/0 + OSC-SLOT + + + OSC-PORT + 1GEX + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 3/0/ETH-PLUG + port + inService + VENDORA + GIGAETHMGT + 2017-08-08T10:47:04.698808+00:00 + ETHW + inService + not-reserved-available + NORMAL + 3 + 0 + 0 + + 3/0 + ETH-PLUG + + + ETH-PLUG + 1GEX + roadm-internal + multi-wavelength + bidirectional + inService + inService + + + + 4/0 + ADDDROP + inService + vendorA + 16CX4D + cccccccc + inService + not-reserved-available + NORMAL + 4 + 0 + 0 + + C1 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP1 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C10 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP10 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C11 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP11 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C12 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP12 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C13 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP13 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C14 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP14 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C15 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP15 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C16 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP16 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C2 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP2 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C3 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP3 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C4 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP4 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C5 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP5 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C6 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP6 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C7 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP7 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C8 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP8 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C9 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG1-PP9 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + AD-DEG1 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG1-CP-TXRX + + + AD-DEG2 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG1-CP-TXRX + + + AD-DEG3 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG1-CP-TXRX + + + AD-DEG4 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG1-CP-TXRX + + + + 5/0 + ADDDROP + inService + vendorA + 16CX4D + cccccccc + inService + not-reserved-available + NORMAL + 4 + 0 + 0 + + C1 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP1 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C10 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP10 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C11 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP11 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C12 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP12 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C13 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP13 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C14 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP14 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C15 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP15 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C16 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP16 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C2 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP2 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C3 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP3 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C4 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP4 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C5 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG5-PP5 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C6 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP6 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C7 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP7 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C8 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP8 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + C9 + Client + roadm-external + wavelength + bidirectional + inService + inService + SRG3-PP9 + + -15.0 + -28.0 + 10.0 + 15.0 + + + + AD-DEG1 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG3-CP-TXRX + + + AD-DEG2 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG3-CP-TXRX + + + AD-DEG3 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG3-CP-TXRX + + + AD-DEG4 + Edge + roadm-internal + multi-wavelength + bidirectional + inService + inService + SRG3-CP-TXRX + + + + oms-2/0/0/L1 + openROADM-if:openROADMOpticalMultiplex + inService + inService + ots-2/0/0/L1 + 2/0 + L1 + + + oms-3/0/0/L1 + openROADM-if:openROADMOpticalMultiplex + inService + inService + Link-1 + ots-3/0/0/L1 + 3/0 + L1 + + + ots-2/0/0/L1 + openROADM-if:opticalTransport + inService + inService + 2/0 + L1 + + smf + 10 + 10 + + + + ots-3/0/0/L1 + openROADM-if:opticalTransport + inService + inService + 3/0 + L1 + + smf + 25.0 + 25.0 + + + + eth-2/0/ETH-PLUG + openROADM-if:ethernetCsmacd + inService + inService + 2/0/ETH-PLUG + ETH-PLUG + + 1000 + full + 1800 + enabled + 1000 + FULL + + + + eth-3/0/ETH-PLUG + openROADM-if:ethernetCsmacd + inService + inService + 3/0/ETH-PLUG + ETH-PLUG + + 1000 + full + 1800 + enabled + 1000 + FULL + + + + + + enable + 20 + 4 + + + eth-2/0/ETH-PLUG + txandrx + + + eth-3/0/ETH-PLUG + txandrx + + + + eth-2/0/ETH-PLUG + ROADMA + ipV4 + 1.1.1.1 + ifalias + eth-3/0/ETH-PLUG + chassiscomponent + 1? + + + eth-3/0/ETH-PLUG + ROADMC + ipV4 + 1.1.1.1 + ifalias + eth-2/0/ETH-PLUG + chassiscomponent + 1? + + + + + + + 1 + 196.1 + 1528.77 + + + 2 + 196.05 + 1529.16 + + + 3 + 196.0 + 1529.55 + + + 4 + 195.95 + 1529.94 + + + 5 + 195.9 + 1530.33 + + + 6 + 195.85 + 1530.72 + + + 7 + 195.8 + 1531.11 + + + 8 + 195.75 + 1531.5 + + + 9 + 195.7 + 1531.89 + + + 10 + 195.65 + 1532.28 + + + 11 + 195.6 + 1532.67 + + + 12 + 195.55 + 1533.06 + + + 13 + 195.5 + 1533.45 + + + 14 + 195.45 + 1533.84 + + + 15 + 195.4 + 1534.23 + + + 16 + 195.35 + 1534.62 + + + 17 + 195.3 + 1535.01 + + + 18 + 195.25 + 1535.4 + + + 19 + 195.2 + 1535.79 + + + 20 + 195.15 + 1536.18 + + + 21 + 195.1 + 1536.57 + + + 22 + 195.05 + 1536.96 + + + 23 + 195.0 + 1537.35 + + + 24 + 194.95 + 1537.74 + + + 25 + 194.9 + 1538.13 + + + 26 + 194.85 + 1538.52 + + + 27 + 194.8 + 1538.91 + + + 28 + 194.75 + 1539.3 + + + 29 + 194.7 + 1539.69 + + + 30 + 194.65 + 1540.08 + + + 31 + 194.6 + 1540.47 + + + 32 + 194.55 + 1540.86 + + + 33 + 194.5 + 1541.25 + + + 34 + 194.45 + 1541.64 + + + 35 + 194.4 + 1542.03 + + + 36 + 194.35 + 1542.42 + + + 37 + 194.3 + 1542.81 + + + 38 + 194.25 + 1543.2 + + + 39 + 194.2 + 1543.59 + + + 40 + 194.15 + 1543.98 + + + 41 + 194.1 + 1544.37 + + + 42 + 194.05 + 1544.76 + + + 43 + 194.0 + 1545.15 + + + 44 + 193.95 + 1545.54 + + + 45 + 193.9 + 1545.93 + + + 46 + 193.85 + 1546.32 + + + 47 + 193.8 + 1546.71 + + + 48 + 193.75 + 1547.1 + + + 49 + 193.7 + 1547.49 + + + 50 + 193.65 + 1547.88 + + + 51 + 193.6 + 1548.27 + + + 52 + 193.55 + 1548.66 + + + 53 + 193.5 + 1549.05 + + + 54 + 193.45 + 1549.44 + + + 55 + 193.4 + 1549.83 + + + 56 + 193.35 + 1550.22 + + + 57 + 193.3 + 1550.61 + + + 58 + 193.25 + 1551.0 + + + 59 + 193.2 + 1551.39 + + + 60 + 193.15 + 1551.78 + + + 61 + 193.1 + 1552.17 + + + 62 + 193.05 + 1552.56 + + + 63 + 193.0 + 1552.95 + + + 64 + 192.95 + 1553.34 + + + 65 + 192.9 + 1553.73 + + + 66 + 192.85 + 1554.12 + + + 67 + 192.8 + 1554.51 + + + 68 + 192.75 + 1554.9 + + + 69 + 192.7 + 1555.29 + + + 70 + 192.65 + 1555.68 + + + 71 + 192.6 + 1556.07 + + + 72 + 192.55 + 1556.46 + + + 73 + 192.5 + 1556.85 + + + 74 + 192.45 + 1557.24 + + + 75 + 192.4 + 1557.63 + + + 76 + 192.35 + 1558.02 + + + 77 + 192.3 + 1558.41 + + + 78 + 192.25 + 1558.8 + + + 79 + 192.2 + 1559.19 + + + 80 + 192.15 + 1559.58 + + + 81 + 192.1 + 1559.97 + + + 82 + 192.05 + 1560.36 + + + 83 + 192.0 + 1560.75 + + + 84 + 191.95 + 1561.14 + + + 85 + 191.9 + 1561.53 + + + 86 + 191.85 + 1561.92 + + + 87 + 191.8 + 1562.31 + + + 88 + 191.75 + 1562.7 + + + 89 + 191.7 + 1563.09 + + + 90 + 191.65 + 1563.48 + + + 91 + 191.6 + 1563.87 + + + 92 + 191.55 + 1564.26 + + + 93 + 191.5 + 1564.65 + + + 94 + 191.45 + 1565.04 + + + 95 + 191.4 + 1565.43 + + + 96 + 191.35 + 1565.82 + + + + 2/0/C1-to-2/0/L1 + + 2/0 + C1 + + + 2/0 + L1 + + + + 2/0/C2-to-2/0/L1 + + 2/0 + C2 + + + 2/0 + L1 + + + + 2/0/C3-to-2/0/L1 + + 2/0 + C3 + + + 2/0 + L1 + + + + 2/0/C4-to-2/0/L1 + + 2/0 + C4 + + + 2/0 + L1 + + + + 2/0/C5-to-2/0/L1 + + 2/0 + C5 + + + 2/0 + L1 + + + + 2/0/C6-to-2/0/L1 + + 2/0 + C6 + + + 2/0 + L1 + + + + 2/0/C7-to-2/0/L1 + + 2/0 + C7 + + + 2/0 + L1 + + + + 2/0/C8-to-2/0/L1 + + 2/0 + C8 + + + 2/0 + L1 + + + + 2/0/C9-to-2/0/L1 + + 2/0 + C9 + + + 2/0 + L1 + + + + 2/0/L1-to-2/0/C1 + + 2/0 + L1 + + + 2/0 + C1 + + + + 2/0/L1-to-2/0/C2 + + 2/0 + L1 + + + 2/0 + C2 + + + + 2/0/L1-to-2/0/C3 + + 2/0 + L1 + + + 2/0 + C3 + + + + 2/0/L1-to-2/0/C4 + + 2/0 + L1 + + + 2/0 + C4 + + + + 2/0/L1-to-2/0/C5 + + 2/0 + L1 + + + 2/0 + C5 + + + + 2/0/L1-to-2/0/C6 + + 2/0 + L1 + + + 2/0 + C6 + + + + 2/0/L1-to-2/0/C7 + + 2/0 + L1 + + + 2/0 + C7 + + + + 2/0/L1-to-2/0/C8 + + 2/0 + L1 + + + 2/0 + C8 + + + + 2/0/L1-to-2/0/C9 + + 2/0 + L1 + + + 2/0 + C9 + + + + 3/0/C1-to-3/0/L1 + + 3/0 + C1 + + + 3/0 + L1 + + + + 3/0/C2-to-3/0/L1 + + 3/0 + C2 + + + 3/0 + L1 + + + + 3/0/C3-to-3/0/L1 + + 3/0 + C3 + + + 3/0 + L1 + + + + 3/0/C4-to-3/0/L1 + + 3/0 + C4 + + + 3/0 + L1 + + + + 3/0/C5-to-3/0/L1 + + 3/0 + C5 + + + 3/0 + L1 + + + + 3/0/C6-to-3/0/L1 + + 3/0 + C6 + + + 3/0 + L1 + + + + 3/0/C7-to-3/0/L1 + + 3/0 + C7 + + + 3/0 + L1 + + + + 3/0/C8-to-3/0/L1 + + 3/0 + C8 + + + 3/0 + L1 + + + + 3/0/C9-to-3/0/L1 + + 3/0 + C9 + + + 3/0 + L1 + + + + 3/0/L1-to-3/0/C1 + + 3/0 + L1 + + + 3/0 + C1 + + + + 3/0/L1-to-3/0/C2 + + 3/0 + L1 + + + 3/0 + C2 + + + + 3/0/L1-to-3/0/C3 + + 3/0 + L1 + + + 3/0 + C3 + + + + 3/0/L1-to-3/0/C4 + + 3/0 + L1 + + + 3/0 + C4 + + + + 3/0/L1-to-3/0/C5 + + 3/0 + L1 + + + 3/0 + C5 + + + + 3/0/L1-to-3/0/C6 + + 3/0 + L1 + + + 3/0 + C6 + + + + 3/0/L1-to-3/0/C7 + + 3/0 + L1 + + + 3/0 + C7 + + + + 3/0/L1-to-3/0/C8 + + 3/0 + L1 + + + 3/0 + C8 + + + + 3/0/L1-to-3/0/C9 + + 3/0 + L1 + + + 3/0 + C9 + + + + 4/0/C1-to-4/0/ADD-DEG1 + + 4/0 + C1 + + + 4/0 + ADD-DEG1 + + + + 4/0/C1-to-4/0/ADD-DEG2 + + 4/0 + C1 + + + 4/0 + ADD-DEG2 + + + + 4/0/C1-to-4/0/ADD-DEG3 + + 4/0 + C1 + + + 4/0 + ADD-DEG3 + + + + 4/0/C1-to-4/0/ADD-DEG4 + + 4/0 + C1 + + + 4/0 + ADD-DEG4 + + + + 4/0/C2-to-4/0/ADD-DEG1 + + 4/0 + C2 + + + 4/0 + ADD-DEG1 + + + + 4/0/C2-to-4/0/ADD-DEG2 + + 4/0 + C2 + + + 4/0 + ADD-DEG2 + + + + 4/0/C2-to-4/0/ADD-DEG3 + + 4/0 + C2 + + + 4/0 + ADD-DEG3 + + + + 4/0/C2-to-4/0/ADD-DEG4 + + 4/0 + C2 + + + 4/0 + ADD-DEG4 + + + + 4/0/C3-to-4/0/ADD-DEG1 + + 4/0 + C3 + + + 4/0 + ADD-DEG1 + + + + 4/0/C3-to-4/0/ADD-DEG2 + + 4/0 + C3 + + + 4/0 + ADD-DEG2 + + + + 4/0/C3-to-4/0/ADD-DEG3 + + 4/0 + C3 + + + 4/0 + ADD-DEG3 + + + + 4/0/C3-to-4/0/ADD-DEG4 + + 4/0 + C3 + + + 4/0 + ADD-DEG4 + + + + 4/0/C4-to-4/0/ADD-DEG1 + + 4/0 + C4 + + + 4/0 + ADD-DEG1 + + + + 4/0/C4-to-4/0/ADD-DEG2 + + 4/0 + C4 + + + 4/0 + ADD-DEG2 + + + + 4/0/C4-to-4/0/ADD-DEG3 + + 4/0 + C4 + + + 4/0 + ADD-DEG3 + + + + 4/0/C4-to-4/0/ADD-DEG4 + + 4/0 + C4 + + + 4/0 + ADD-DEG4 + + + + 4/0/C5-to-4/0/ADD-DEG1 + + 4/0 + C5 + + + 4/0 + ADD-DEG1 + + + + 4/0/C5-to-4/0/ADD-DEG2 + + 4/0 + C5 + + + 4/0 + ADD-DEG2 + + + + 4/0/C5-to-4/0/ADD-DEG3 + + 4/0 + C5 + + + 4/0 + ADD-DEG3 + + + + 4/0/C5-to-4/0/ADD-DEG4 + + 4/0 + C5 + + + 4/0 + ADD-DEG4 + + + + 4/0/C6-to-4/0/ADD-DEG1 + + 4/0 + C6 + + + 4/0 + ADD-DEG1 + + + + 4/0/C6-to-4/0/ADD-DEG2 + + 4/0 + C6 + + + 4/0 + ADD-DEG2 + + + + 4/0/C6-to-4/0/ADD-DEG3 + + 4/0 + C6 + + + 4/0 + ADD-DEG3 + + + + 4/0/C6-to-4/0/ADD-DEG4 + + 4/0 + C6 + + + 4/0 + ADD-DEG4 + + + + 4/0/C7-to-4/0/ADD-DEG1 + + 4/0 + C7 + + + 4/0 + ADD-DEG1 + + + + 4/0/C7-to-4/0/ADD-DEG2 + + 4/0 + C7 + + + 4/0 + ADD-DEG2 + + + + 4/0/C7-to-4/0/ADD-DEG3 + + 4/0 + C7 + + + 4/0 + ADD-DEG3 + + + + 4/0/C7-to-4/0/ADD-DEG4 + + 4/0 + C7 + + + 4/0 + ADD-DEG4 + + + + 4/0/C8-to-4/0/ADD-DEG1 + + 4/0 + C8 + + + 4/0 + ADD-DEG1 + + + + 4/0/C8-to-4/0/ADD-DEG2 + + 4/0 + C8 + + + 4/0 + ADD-DEG2 + + + + 4/0/C8-to-4/0/ADD-DEG3 + + 4/0 + C8 + + + 4/0 + ADD-DEG3 + + + + 4/0/C8-to-4/0/ADD-DEG4 + + 4/0 + C8 + + + 4/0 + ADD-DEG4 + + + + 4/0/C9-to-4/0/ADD-DEG1 + + 4/0 + C9 + + + 4/0 + ADD-DEG1 + + + + 4/0/C9-to-4/0/ADD-DEG2 + + 4/0 + C9 + + + 4/0 + ADD-DEG2 + + + + 4/0/C9-to-4/0/ADD-DEG3 + + 4/0 + C9 + + + 4/0 + ADD-DEG3 + + + + 4/0/C9-to-4/0/ADD-DEG4 + + 4/0 + C9 + + + 4/0 + ADD-DEG4 + + + + 4/0/C10-to-4/0/ADD-DEG1 + + 4/0 + C10 + + + 4/0 + ADD-DEG1 + + + + 4/0/C10-to-4/0/ADD-DEG2 + + 4/0 + C10 + + + 4/0 + ADD-DEG2 + + + + 4/0/C10-to-4/0/ADD-DEG3 + + 4/0 + C10 + + + 4/0 + ADD-DEG3 + + + + 4/0/C10-to-4/0/ADD-DEG4 + + 4/0 + C10 + + + 4/0 + ADD-DEG4 + + + + 4/0/C11-to-4/0/ADD-DEG1 + + 4/0 + C11 + + + 4/0 + ADD-DEG1 + + + + 4/0/C11-to-4/0/ADD-DEG2 + + 4/0 + C11 + + + 4/0 + ADD-DEG2 + + + + 4/0/C11-to-4/0/ADD-DEG3 + + 4/0 + C11 + + + 4/0 + ADD-DEG3 + + + + 4/0/C11-to-4/0/ADD-DEG4 + + 4/0 + C11 + + + 4/0 + ADD-DEG4 + + + + 4/0/C12-to-4/0/ADD-DEG1 + + 4/0 + C12 + + + 4/0 + ADD-DEG1 + + + + 4/0/C12-to-4/0/ADD-DEG2 + + 4/0 + C12 + + + 4/0 + ADD-DEG2 + + + + 4/0/C12-to-4/0/ADD-DEG3 + + 4/0 + C12 + + + 4/0 + ADD-DEG3 + + + + 4/0/C12-to-4/0/ADD-DEG4 + + 4/0 + C12 + + + 4/0 + ADD-DEG4 + + + + 4/0/C13-to-4/0/ADD-DEG1 + + 4/0 + C13 + + + 4/0 + ADD-DEG1 + + + + 4/0/C13-to-4/0/ADD-DEG2 + + 4/0 + C13 + + + 4/0 + ADD-DEG2 + + + + 4/0/C13-to-4/0/ADD-DEG3 + + 4/0 + C13 + + + 4/0 + ADD-DEG3 + + + + 4/0/C13-to-4/0/ADD-DEG4 + + 4/0 + C13 + + + 4/0 + ADD-DEG4 + + + + 4/0/C14-to-4/0/ADD-DEG1 + + 4/0 + C14 + + + 4/0 + ADD-DEG1 + + + + 4/0/C14-to-4/0/ADD-DEG2 + + 4/0 + C14 + + + 4/0 + ADD-DEG2 + + + + 4/0/C14-to-4/0/ADD-DEG3 + + 4/0 + C14 + + + 4/0 + ADD-DEG3 + + + + 4/0/C14-to-4/0/ADD-DEG4 + + 4/0 + C14 + + + 4/0 + ADD-DEG4 + + + + 4/0/C15-to-4/0/ADD-DEG1 + + 4/0 + C15 + + + 4/0 + ADD-DEG1 + + + + 4/0/C15-to-4/0/ADD-DEG2 + + 4/0 + C15 + + + 4/0 + ADD-DEG2 + + + + 4/0/C15-to-4/0/ADD-DEG3 + + 4/0 + C15 + + + 4/0 + ADD-DEG3 + + + + 4/0/C15-to-4/0/ADD-DEG4 + + 4/0 + C15 + + + 4/0 + ADD-DEG4 + + + + 4/0/C16-to-4/0/ADD-DEG1 + + 4/0 + C16 + + + 4/0 + ADD-DEG1 + + + + 4/0/C16-to-4/0/ADD-DEG2 + + 4/0 + C16 + + + 4/0 + ADD-DEG2 + + + + 4/0/C16-to-4/0/ADD-DEG3 + + 4/0 + C16 + + + 4/0 + ADD-DEG3 + + + + 4/0/C16-to-4/0/ADD-DEG4 + + 4/0 + C16 + + + 4/0 + ADD-DEG4 + + + + 4/0/ADD-DEG1-to-4/0/C1 + + 4/0 + ADD-DEG1 + + + 4/0 + C1 + + + + 4/0/ADD-DEG1-to-4/0/C2 + + 4/0 + ADD-DEG1 + + + 4/0 + C2 + + + + 4/0/ADD-DEG1-to-4/0/C3 + + 4/0 + ADD-DEG1 + + + 4/0 + C3 + + + + 4/0/ADD-DEG1-to-4/0/C4 + + 4/0 + ADD-DEG1 + + + 4/0 + C4 + + + + 4/0/ADD-DEG1-to-4/0/C5 + + 4/0 + ADD-DEG1 + + + 4/0 + C5 + + + + 4/0/ADD-DEG1-to-4/0/C6 + + 4/0 + ADD-DEG1 + + + 4/0 + C6 + + + + 4/0/ADD-DEG1-to-4/0/C7 + + 4/0 + ADD-DEG1 + + + 4/0 + C7 + + + + 4/0/ADD-DEG1-to-4/0/C8 + + 4/0 + ADD-DEG1 + + + 4/0 + C8 + + + + 4/0/ADD-DEG1-to-4/0/C9 + + 4/0 + ADD-DEG1 + + + 4/0 + C9 + + + + 4/0/ADD-DEG1-to-4/0/C10 + + 4/0 + ADD-DEG1 + + + 4/0 + C10 + + + + 4/0/ADD-DEG1-to-4/0/C11 + + 4/0 + ADD-DEG1 + + + 4/0 + C11 + + + + 4/0/ADD-DEG1-to-4/0/C12 + + 4/0 + ADD-DEG1 + + + 4/0 + C12 + + + + 4/0/ADD-DEG1-to-4/0/C13 + + 4/0 + ADD-DEG1 + + + 4/0 + C13 + + + + 4/0/ADD-DEG1-to-4/0/C14 + + 4/0 + ADD-DEG1 + + + 4/0 + C14 + + + + 4/0/ADD-DEG1-to-4/0/C15 + + 4/0 + ADD-DEG1 + + + 4/0 + C15 + + + + 4/0/ADD-DEG1-to-4/0/C16 + + 4/0 + ADD-DEG1 + + + 4/0 + C16 + + + + 4/0/ADD-DEG2-to-4/0/C1 + + 4/0 + ADD-DEG2 + + + 4/0 + C1 + + + + 4/0/ADD-DEG2-to-4/0/C2 + + 4/0 + ADD-DEG2 + + + 4/0 + C2 + + + + 4/0/ADD-DEG2-to-4/0/C3 + + 4/0 + ADD-DEG2 + + + 4/0 + C3 + + + + 4/0/ADD-DEG2-to-4/0/C4 + + 4/0 + ADD-DEG2 + + + 4/0 + C4 + + + + 4/0/ADD-DEG2-to-4/0/C5 + + 4/0 + ADD-DEG2 + + + 4/0 + C5 + + + + 4/0/ADD-DEG2-to-4/0/C6 + + 4/0 + ADD-DEG2 + + + 4/0 + C6 + + + + 4/0/ADD-DEG2-to-4/0/C7 + + 4/0 + ADD-DEG2 + + + 4/0 + C7 + + + + 4/0/ADD-DEG2-to-4/0/C8 + + 4/0 + ADD-DEG2 + + + 4/0 + C8 + + + + 4/0/ADD-DEG2-to-4/0/C9 + + 4/0 + ADD-DEG2 + + + 4/0 + C9 + + + + 4/0/ADD-DEG2-to-4/0/C10 + + 4/0 + ADD-DEG2 + + + 4/0 + C10 + + + + 4/0/ADD-DEG2-to-4/0/C11 + + 4/0 + ADD-DEG2 + + + 4/0 + C11 + + + + 4/0/ADD-DEG2-to-4/0/C12 + + 4/0 + ADD-DEG2 + + + 4/0 + C12 + + + + 4/0/ADD-DEG2-to-4/0/C13 + + 4/0 + ADD-DEG2 + + + 4/0 + C13 + + + + 4/0/ADD-DEG2-to-4/0/C14 + + 4/0 + ADD-DEG2 + + + 4/0 + C14 + + + + 4/0/ADD-DEG2-to-4/0/C15 + + 4/0 + ADD-DEG2 + + + 4/0 + C15 + + + + 4/0/ADD-DEG2-to-4/0/C16 + + 4/0 + ADD-DEG2 + + + 4/0 + C16 + + + + 4/0/ADD-DEG3-to-4/0/C1 + + 4/0 + ADD-DEG3 + + + 4/0 + C1 + + + + 4/0/ADD-DEG3-to-4/0/C2 + + 4/0 + ADD-DEG3 + + + 4/0 + C2 + + + + 4/0/ADD-DEG3-to-4/0/C3 + + 4/0 + ADD-DEG3 + + + 4/0 + C3 + + + + 4/0/ADD-DEG3-to-4/0/C4 + + 4/0 + ADD-DEG3 + + + 4/0 + C4 + + + + 4/0/ADD-DEG3-to-4/0/C5 + + 4/0 + ADD-DEG3 + + + 4/0 + C5 + + + + 4/0/ADD-DEG3-to-4/0/C6 + + 4/0 + ADD-DEG3 + + + 4/0 + C6 + + + + 4/0/ADD-DEG3-to-4/0/C7 + + 4/0 + ADD-DEG3 + + + 4/0 + C7 + + + + 4/0/ADD-DEG3-to-4/0/C8 + + 4/0 + ADD-DEG3 + + + 4/0 + C8 + + + + 4/0/ADD-DEG3-to-4/0/C9 + + 4/0 + ADD-DEG3 + + + 4/0 + C9 + + + + 4/0/ADD-DEG3-to-4/0/C10 + + 4/0 + ADD-DEG3 + + + 4/0 + C10 + + + + 4/0/ADD-DEG3-to-4/0/C11 + + 4/0 + ADD-DEG3 + + + 4/0 + C11 + + + + 4/0/ADD-DEG3-to-4/0/C12 + + 4/0 + ADD-DEG3 + + + 4/0 + C12 + + + + 4/0/ADD-DEG3-to-4/0/C13 + + 4/0 + ADD-DEG3 + + + 4/0 + C13 + + + + 4/0/ADD-DEG3-to-4/0/C14 + + 4/0 + ADD-DEG3 + + + 4/0 + C14 + + + + 4/0/ADD-DEG3-to-4/0/C15 + + 4/0 + ADD-DEG3 + + + 4/0 + C15 + + + + 4/0/ADD-DEG3-to-4/0/C16 + + 4/0 + ADD-DEG3 + + + 4/0 + C16 + + + + 4/0/ADD-DEG4-to-4/0/C1 + + 4/0 + ADD-DEG4 + + + 4/0 + C1 + + + + 4/0/ADD-DEG4-to-4/0/C2 + + 4/0 + ADD-DEG4 + + + 4/0 + C2 + + + + 4/0/ADD-DEG4-to-4/0/C3 + + 4/0 + ADD-DEG4 + + + 4/0 + C3 + + + + 4/0/ADD-DEG4-to-4/0/C4 + + 4/0 + ADD-DEG4 + + + 4/0 + C4 + + + + 4/0/ADD-DEG4-to-4/0/C5 + + 4/0 + ADD-DEG4 + + + 4/0 + C5 + + + + 4/0/ADD-DEG4-to-4/0/C6 + + 4/0 + ADD-DEG4 + + + 4/0 + C6 + + + + 4/0/ADD-DEG4-to-4/0/C7 + + 4/0 + ADD-DEG4 + + + 4/0 + C7 + + + + 4/0/ADD-DEG4-to-4/0/C8 + + 4/0 + ADD-DEG4 + + + 4/0 + C8 + + + + 4/0/ADD-DEG4-to-4/0/C9 + + 4/0 + ADD-DEG4 + + + 4/0 + C9 + + + + 4/0/ADD-DEG4-to-4/0/C10 + + 4/0 + ADD-DEG4 + + + 4/0 + C10 + + + + 4/0/ADD-DEG4-to-4/0/C11 + + 4/0 + ADD-DEG4 + + + 4/0 + C11 + + + + 4/0/ADD-DEG4-to-4/0/C12 + + 4/0 + ADD-DEG4 + + + 4/0 + C12 + + + + 4/0/ADD-DEG4-to-4/0/C13 + + 4/0 + ADD-DEG4 + + + 4/0 + C13 + + + + 4/0/ADD-DEG4-to-4/0/C14 + + 4/0 + ADD-DEG4 + + + 4/0 + C14 + + + + 4/0/ADD-DEG4-to-4/0/C15 + + 4/0 + ADD-DEG4 + + + 4/0 + C15 + + + + 4/0/ADD-DEG4-to-4/0/C16 + + 4/0 + ADD-DEG4 + + + 4/0 + C16 + + + + phylink-1 + + 2/0 + C1 + + + 4/0 + ADD-DEG1 + + + + phylink-2 + + 4/0 + ADD-DEG1 + + + 2/0 + C1 + + + + phylink-3 + + 3/0 + C1 + + + 4/0 + ADD-DEG2 + + + + phylink-4 + + 4/0 + ADD-DEG2 + + + 3/0 + C1 + + + + phylink-5 + + 2/0 + C9 + + + 3/0 + C9 + + + + phylink-6 + + 3/0 + C9 + + + 2/0 + C9 + + + + 1 + 96 + + 1 + 2/0 + + + 2 + 2/0/OSC-PLUG + + + 3 + 2/0/ETH-PLUG + + + 1 + 2/0 + L1 + + + + 2 + 96 + + 1 + 3/0 + + + 2 + 3/0/OSC-PLUG + + + 3 + 3/0/ETH-PLUG + + + 1 + 3/0 + L1 + + + + 1 + 16 + onePerSRG + + 1 + 4/0 + + + + 3 + 16 + onePerSRG + + 1 + 5/0 + + + + 1 + + 2/0 + L1 + + + 4/0 + C1 + + + 4/0 + C2 + + + 4/0 + C3 + + + 4/0 + C4 + + + 4/0 + C5 + + + 4/0 + C6 + + + 4/0 + C7 + + + 4/0 + C8 + + + 4/0 + C9 + + + 4/0 + C10 + + + 4/0 + C11 + + + 4/0 + C12 + + + 4/0 + C13 + + + 4/0 + C14 + + + 4/0 + C15 + + + 4/0 + C16 + + + + 2 + + 4/0 + C1 + + + 2/0 + E1 + + + + 3 + + 4/0 + C2 + + + 2/0 + E1 + + + + 4 + + 4/0 + C3 + + + 2/0 + E1 + + + + 5 + + 4/0 + C4 + + + 2/0 + E1 + + + + 6 + + 4/0 + C5 + + + 2/0 + E1 + + + + 7 + + 4/0 + C6 + + + 2/0 + E1 + + + + 8 + + 4/0 + C7 + + + 2/0 + E1 + + + + 9 + + 4/0 + C8 + + + 2/0 + E1 + + + + 10 + + 4/0 + C9 + + + 2/0 + E1 + + + + 11 + + 4/0 + C10 + + + 2/0 + E1 + + + + 12 + + 4/0 + C11 + + + 2/0 + E1 + + + + 13 + + 4/0 + C12 + + + 2/0 + E1 + + + + 14 + + 4/0 + C13 + + + 2/0 + E1 + + + + 15 + + 4/0 + C14 + + + 2/0 + E1 + + + + 16 + + 4/0 + C15 + + + 2/0 + E1 + + + + 17 + + 4/0 + C16 + + + 2/0 + E1 + + + + 18 + + 3/0 + L1 + + + 4/0 + C1 + + + 4/0 + C2 + + + 4/0 + C3 + + + 4/0 + C4 + + + 4/0 + C5 + + + 4/0 + C6 + + + 4/0 + C7 + + + 4/0 + C8 + + + 4/0 + C9 + + + 4/0 + C10 + + + 4/0 + C11 + + + 4/0 + C12 + + + 4/0 + C13 + + + 4/0 + C14 + + + 4/0 + C15 + + + 4/0 + C16 + + + + 19 + + 4/0 + C1 + + + 3/0 + E1 + + + + 20 + + 4/0 + C2 + + + 3/0 + E1 + + + + 21 + + 4/0 + C3 + + + 3/0 + E1 + + + + 22 + + 4/0 + C4 + + + 3/0 + E1 + + + + 23 + + 4/0 + C5 + + + 3/0 + E1 + + + + 24 + + 4/0 + C6 + + + 3/0 + E1 + + + + 25 + + 4/0 + C7 + + + 3/0 + E1 + + + + 26 + + 4/0 + C8 + + + 3/0 + E1 + + + + 27 + + 4/0 + C9 + + + 3/0 + E1 + + + + 28 + + 4/0 + C10 + + + 3/0 + E1 + + + + 29 + + 4/0 + C11 + + + 3/0 + E1 + + + + 30 + + 4/0 + C12 + + + 3/0 + E1 + + + + 31 + + 4/0 + C13 + + + 3/0 + E1 + + + + 32 + + 4/0 + C14 + + + 3/0 + E1 + + + + 33 + + 4/0 + C15 + + + 3/0 + E1 + + + + 34 + + 4/0 + C16 + + + 3/0 + E1 + + + + diff --git a/tests/setup.cfg b/tests/setup.cfg index f100a50cd..0e2bd2cd4 100644 --- a/tests/setup.cfg +++ b/tests/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = tansportpce-tests +name = transportpce-tests home-page = https://wiki.opendaylight.org/view/TransportPCE:Main [files] diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml deleted file mode 100644 index 3be01860f..000000000 --- a/tests/stubmodels/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 3.0.8 - - - - org.opendaylight.transportpce - transportpce-stubmodels - 0.4.0-SNAPSHOT - bundle - - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-api - ${project.version} - - - - - - - - org.apache.felix - maven-bundle-plugin - 3.0.1 - true - - - {maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties - <_exportcontents> - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.transportpce.stubrenderer.rev170403.service.implementation.request.input,* - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - */target/generated-sources/mdsal-binding/* - * - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - */target/generated-sources/mdsal-binding/* - * - - - - - - diff --git a/tests/stubmodels/src/main/yang/stubpce@2017-04-26.yang b/tests/stubmodels/src/main/yang/stubpce@2017-04-26.yang deleted file mode 100644 index fb142ae9b..000000000 --- a/tests/stubmodels/src/main/yang/stubpce@2017-04-26.yang +++ /dev/null @@ -1,164 +0,0 @@ -module stubpce { - yang-version 1; - namespace "http://org/opendaylight/transportpce/stubpce"; - prefix "org-opendaylight-transportpce-stubpce"; - - - import ietf-yang-types { - prefix yang; - revision-date 2013-07-15; - } - import transportpce-routing-constraints { - prefix transportpce-routing-constraints; - revision-date 2017-04-26; - } - - - import org-openroadm-common-service-types { - prefix org-openroadm-common-service-types; - revision-date 2016-10-14; - } - - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - revision-date 2016-10-14; - } - import transportpce-common-service-path-types { - prefix transportpce-common-service-path-types; - revision-date 2017-04-26; - } - import transportpce-pathDescription { - prefix transportpce-pathDescription; - revision-date 2017-04-26; - } - - - organization - "transportPCE"; - contact - "transportPCE committers - ODL"; - description - "YANG definitions of stubrenderer services (transportPCE). Adapted from service path definition (openroadm). - Copyright © 2017 Orange, Inc. and others. All rights reserved. - - This model is derived from the OpenROADM service definition that includes the following notice: - - - 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"; - } - - rpc path-computation-request { - input { - leaf service-name { - type string; - description - "Identifier for the service to be created in - the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network."; - mandatory true; - } - leaf resource-reserve { - type boolean; - description - "indicates if resources (from local PCE topology) must be reserved until further notice (cancel-resource-reserve or topology update)"; - mandatory true; - } - uses transportpce-common-service-path-types:service-handler-header; - container service-a-end { - uses transportpce-common-service-path-types:service-endpoint-sp; - } - container service-z-end { - uses transportpce-common-service-path-types:service-endpoint-sp; - } - uses transportpce-routing-constraints:routing-constraints-sp; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - uses transportpce-common-service-path-types:response-parameters-sp; - } - } - - rpc cancel-resource-reserve { - input { - leaf service-name { - type string; - mandatory true; - } - uses transportpce-common-service-path-types:service-handler-header; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - } - - 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; - } - } - - grouping stubpce-path-description { - leaf path-name { - type string; - description - "Identifier for the pathDescription to be created in - the ROADM network, e.g., CLFI, CLCI, etc."; - mandatory true; - } - uses transportpce-pathDescription:path-description; - } - - container path-description-list { - description - "List of pathDescription. Can only be created, deleted, modified, etc. using special RPCs."; - list pathDescriptions { - key "path-name"; - uses stubpce-path-description; - } - } - - notification service-path-rpc-result { - description - "This Notification indicates result of service RPC"; - leaf notification-type { - type transportpce-common-service-path-types:service-path-notification-types; - } - container path-description { - uses transportpce-pathDescription:path-description; - } - uses transportpce-common-service-path-types:rpc-response-status-ex; - uses org-openroadm-common-service-types:service-notification-result; - } -} diff --git a/tests/stubmodels/src/main/yang/stubrenderer@2017-04-26.yang b/tests/stubmodels/src/main/yang/stubrenderer@2017-04-26.yang deleted file mode 100644 index c1ded4598..000000000 --- a/tests/stubmodels/src/main/yang/stubrenderer@2017-04-26.yang +++ /dev/null @@ -1,138 +0,0 @@ -module stubrenderer { - yang-version 1; - namespace "http://org/opendaylight/transportpce/stubrenderer"; - prefix "org-opendaylight-transportpce-stubrenderer"; - - import ietf-yang-types { - prefix yang; - revision-date 2013-07-15; - } - import transportpce-routing-constraints { - prefix transportpce-routing-constraints; - revision-date 2017-04-26; - } - - - import org-openroadm-common-service-types { - prefix org-openroadm-common-service-types; - revision-date 2016-10-14; - } - - import org-openroadm-resource-types { - prefix org-openroadm-resource-types; - revision-date 2016-10-14; - } - import transportpce-common-service-path-types { - prefix transportpce-common-service-path-types; - revision-date 2017-04-26; - } - import transportpce-pathDescription { - prefix transportpce-pathDescription; - revision-date 2017-04-26; - } - - import org-openroadm-topology { - prefix org-openroadm-topology; - revision-date 2016-10-14; - } - - - organization - "transportPCE"; - contact - "transportPCE committers - ODL"; - description - "YANG definitions of stubrenderer services (transportPCE). Adapted from service path definition (openroadm). - Copyright © 2017 Orange, Inc. and others. All rights reserved. - - This model is derived from the OpenROADM service definition that includes the following notice: - - - 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"; - } - - rpc service-implementation-request { - input { - leaf service-name { - type string; - description - "Identifier for the service to be created in - the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network."; - mandatory true; - } - uses transportpce-common-service-path-types:service-handler-header; - container service-a-end { - uses transportpce-common-service-path-types:service-endpoint-sp; - } - container service-z-end { - uses transportpce-common-service-path-types:service-endpoint-sp; - } - container path-description { - uses transportpce-pathDescription:path-description; - } - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - } - - rpc service-delete { - input { - leaf service-name { - type string; - description - "Identifier for the service to be created in - the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network."; - mandatory true; - } - uses transportpce-common-service-path-types:service-handler-header; - } - output { - uses org-openroadm-common-service-types:configuration-response-common; - } - } - - - notification service-rpc-result-sp { - description - "This Notification indicates result of service RPC"; - leaf notification-type { - type transportpce-common-service-path-types:service-path-notification-types; - } - container path-topology { - uses org-openroadm-topology:topology; - } - uses transportpce-common-service-path-types:rpc-response-status-ex; - uses org-openroadm-common-service-types:service-notification-result; - } -} diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml deleted file mode 100644 index 2263cd1f0..000000000 --- a/tests/stubpce/pom.xml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 3.0.8 - - - - org.opendaylight.transportpce - transportpce-stubpce - 0.4.0-SNAPSHOT - bundle - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - src/main/resources - - - - - - - - - - org.opendaylight.controller - mdsal-artifacts - 1.9.1-SNAPSHOT - import - pom - - - org.opendaylight.netconf - netconf-artifacts - 1.6.1-SNAPSHOT - import - pom - - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-stubmodels - ${project.version} - - - org.opendaylight.controller.model - model-topology - - - org.opendaylight.netconf - sal-netconf-connector - - - org.osgi - org.osgi.core - - - org.apache.commons - commons-lang3 - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - com.fasterxml.woodstox - woodstox-core - 5.0.3 - - - org.codehaus.woodstox - stax2-api - - - diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CheckCoherencyHardSoft.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CheckCoherencyHardSoft.java deleted file mode 100644 index bae514fb1..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CheckCoherencyHardSoft.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.HardConstraints; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.SoftConstraints; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class to check coherency between hard and soft constraints. - * @author Martial Coulibaly on - * behalf of Orange - * - */ -public class CheckCoherencyHardSoft { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(CheckCoherencyHardSoft.class); - /** Hard Constraints. */ - private HardConstraints hard; - /** Soft Constraints. */ - private SoftConstraints soft; - - public CheckCoherencyHardSoft(HardConstraints hard, SoftConstraints soft) { - this.hard = hard; - this.soft = soft; - } - - /** - * function to check coherency between hard and soft constraints. - * @return true if coherent - * false else - */ - public boolean check() { - boolean result = false; - if (hard != null && soft != null) { - /** - * Check coherency with hard/soft constraints - * hard/soft include/exclude coherency - * - */ - } else { - LOG.info("HardConstraints or/and SoftConstraints is null !"); - result = true; - } - return result; - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CompliancyCheck.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CompliancyCheck.java deleted file mode 100644 index ccbc5ea24..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/CompliancyCheck.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.PathComputationRequestInput; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * Class to check RPCs Compliancy. - * - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - * - */ -public class CompliancyCheck { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(CompliancyCheck.class); - /** Response message from procedure. */ - private String message; - - private PathComputationRequestInput input; - - public CompliancyCheck(PathComputationRequestInput prcInput) { - input = prcInput; - } - - /** - * Check if a String is not - * null and not equal to ''. - * - * @param value String value - * @return true if String ok - * false if not - */ - public Boolean checkString(String value) { - Boolean result = false; - if ((value != null) && (value.compareTo("") != 0)) { - result = true; - } - return result; - - } - - /** - * check if service name - * or ServiceHandlerHeader - * is set in RPC request. - * - * @return true if settings is ok, - * false if not - */ - public Boolean check() { - Boolean result = true; - if (input != null) { - if (!checkString(input.getServiceName())) { - result = false; - message = "Service Name is not set"; - LOG.debug(message); - } else { - if (!checkString(input.getServiceHandlerHeader().getRequestId())) { - result = false; - message = "ServiceHandlerHeader Request-ID is not set"; - LOG.debug(message); - } - } - } else { - result = false; - } - return result; - } - - public String getMessage() { - return message; - } - - - public void setMessage(String message) { - this.message = message; - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/LoggingFuturesCallBack.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/LoggingFuturesCallBack.java deleted file mode 100644 index 7738ceb51..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/LoggingFuturesCallBack.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import com.google.common.util.concurrent.FutureCallback; -import org.slf4j.Logger; - -/** - * Class to log future logging from datastore actions (write, modify, delete..). - * @author Martial Coulibaly on - * bealf of Orange - */ -public class LoggingFuturesCallBack implements FutureCallback { - - private Logger log; - private String message; - - public LoggingFuturesCallBack(String message, Logger log) { - this.message = message; - this.log = log; - } - - @Override - public void onFailure(Throwable ex) { - log.warn(message, ex); - - } - - @Override - public void onSuccess(V arg0) { - log.info("Success! {} ", arg0); - - } - -} \ No newline at end of file diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/MyEndpoint.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/MyEndpoint.java deleted file mode 100644 index 87758df52..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/MyEndpoint.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import java.util.Map; - -/** - * Enum class to identify ServiceAEnd and serviceZEnd. - * - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - * - */ -enum MyEndpoint { - SERVICEAEND(1), - SERVICEZEND(2); - - int value; - private static final Map VALUE_MAP; - - MyEndpoint(int value) { - this.value = value; - } - - static { - final com.google.common.collect.ImmutableMap.Builder b = - com.google.common.collect.ImmutableMap.builder(); - for (MyEndpoint enumItem : MyEndpoint.values()) { - b.put(enumItem.value, enumItem); - } - - VALUE_MAP = b.build(); - } - - /** - * Get integer value. - * - * @return integer value. - */ - public int getIntValue() { - return value; - } - - /** - * Get Endpoint value. - * - * @param valueArg - * Integer to identify Enum - * @return corresponding ServiceFormat item - */ - public static MyEndpoint forValue(int valueArg) { - return VALUE_MAP.get(valueArg); - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java deleted file mode 100644 index 4d5b153d1..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/SendingPceRPCs.java +++ /dev/null @@ -1,911 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import com.google.common.base.Optional; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.transportpce.stubpce.topology.PathDescriptionsOrdered; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.CancelResourceReserveInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathDescriptionList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.ServicePathList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptions; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePaths; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePathsBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePathsKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.rpc.result.PathDescriptionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ZToADirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZ; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.Resource; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Node; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPoint; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.constraints.sp.co.routing.or.general.General; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.constraints.sp.co.routing.or.general.general.Diversity; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.constraints.sp.co.routing.or.general.general.Exclude; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.HardConstraints; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.routing.constraints.rev170426.routing.constraints.sp.SoftConstraints; -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.service.types.rev170426.service.path.ServiceAEnd; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.path.ServiceZEnd; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class for Sending - * PCE requests : - * - path-computation-request - * - cancel-resource-reserve. - * @author Martial Coulibaly on behalf of Orange - * - */ -public class SendingPceRPCs { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(SendingPceRPCs.class); - private Boolean success; - private PathComputationRequestInput input; - private CancelResourceReserveInput cancelInput; - private PathDescriptionBuilder pathDescription; - private DataBroker db; - private String error; - private final ListeningExecutorService executor; - private List servicePathList; - - public SendingPceRPCs() { - success = true; - setPathDescription(null); - setError(""); - executor = null; - setServicePathList(new ArrayList()); - } - - public SendingPceRPCs(PathComputationRequestInput input,DataBroker databroker,ListeningExecutorService executor) { - success = true; - setPathDescription(null); - setInput(input); - setCancelInput(null); - setDb(databroker); - setError(""); - servicePathList = readServicePathList(); - this.executor = executor; - } - - public SendingPceRPCs(CancelResourceReserveInput input,DataBroker databroker,ListeningExecutorService executor) { - success = true; - setPathDescription(null); - setInput(null); - setCancelInput(input); - setDb(databroker); - setError(""); - servicePathList = readServicePathList(); - this.executor = executor; - } - - /** - * Compare AEnd and ZEnd resource Node to - * AEnd and ZEnd String. - * - * @param pathAend AEnd resource Node - * @param pathZend ZEnd resource Node - * @param inputAend AEnd String Node - * @param inputZend ZEnd String Node - * @return Boolean result true if equal, false if not - */ - private Boolean comp(Resource pathAend, Resource pathZend, String inputAend, String inputZend) { - Boolean result = false; - if ((pathAend != null) && (pathZend != null) && (inputAend != null) && (inputZend != null)) { - if ((pathAend instanceof Node) && (pathZend instanceof Node)) { - Node aend = (Node) pathAend; - Node zend = (Node) pathZend; - if (aend.getNodeIdentifier().getNodeId().compareToIgnoreCase(inputAend) == 0) { - if (zend.getNodeIdentifier().getNodeId().compareToIgnoreCase(inputZend) == 0) { - result = true; - } - } - } - } - return result; - } - - /** - * Compare two resource. - * - * @param res1 first resource - * @param res2 second resource - * @return Boolean result true if equal, false if not - */ - private Boolean egalResource(Resource res1, Resource res2) { - LOG.info("comparing resource ..."); - Boolean result = false; - LOG.info("{} - {}", res1.getClass().getName(), res2.getClass().getName()); - if (res1.getClass().getName().compareToIgnoreCase(res2.getClass().getName()) == 0) { - if ((res1 instanceof Node) && (res2 instanceof Node)) { - Node node1 = (Node)res1; - Node node2 = (Node)res2; - if (node1.getNodeIdentifier().getNodeId() - .compareTo(node2.getNodeIdentifier().getNodeId()) == 0) { - result = true; - } - } - if ((res1 instanceof TerminationPoint) && (res2 instanceof TerminationPoint)) { - TerminationPoint tp1 = (TerminationPoint)res1; - TerminationPoint tp2 = (TerminationPoint)res2; - if (tp1.getTerminationPointIdentifier().getNodeId() - .compareTo(tp2.getTerminationPointIdentifier().getNodeId()) == 0) { - if (tp1.getTerminationPointIdentifier().getTpId() - .compareTo(tp2.getTerminationPointIdentifier().getTpId()) == 0) { - result = true; - } - } - } - if ((res1 instanceof Link) && (res2 instanceof Link)) { - Link link1 = (Link)res1; - Link link2 = (Link)res2; - if (link1.getLinkIdentifier().getLinkId().compareTo(link2.getLinkIdentifier().getLinkId()) == 0) { - result = true; - } - - } - } - return result; - } - - /** - * compare two AtoZDirection. - * - * @param atoz1 first AToZDirection - * @param atoz2 second AToZDirection - * @return Boolean result true if equal, false if not - */ - private Boolean egalAtoZDirection(AToZDirection atoz1, AToZDirection atoz2) { - LOG.info("comparing AtoZDirection ..."); - Boolean result = true; - if (atoz1.getAToZ().size() == atoz2.getAToZ().size()) { - int index = 0; - int size = atoz1.getAToZ().size(); - LOG.info("size : {}", size); - String id1 = null; - String id2 = null; - while (index < size) { - id1 = atoz1.getAToZ().get(index).getId(); - LOG.info("id : {}", id1); - Resource res1 = atoz1.getAToZ().get(index).getResource().getResource(); - LOG.info("res1 : {}", res1.toString()); - Resource res2 = null; - if (id1 != null) { - Boolean trouve = false; - for (int loop = 0;loop < size;loop++) { - id2 = atoz2.getAToZ().get(loop).getId(); - if ((id2 != null) && (id2.compareTo(id1) == 0)) { - res2 = atoz2.getAToZ().get(loop).getResource().getResource(); - LOG.info("res2 : {}", res2.toString()); - trouve = true; - break; - } - } - if (trouve) { - if (!egalResource(res1, res2)) { - result = false; - break; - } - } - } else { - result = false; - break; - } - index++; - } - } else { - LOG.info("AToZDirection size is not equal !"); - result = false; - } - return result; - } - - /** - * compare two ZtoZDirection. - * - * @param ztoa1 first ZToZDirection - * @param ztoa2 second ZToZDirection - * @return Boolean result true if equal, false if not - */ - private Boolean egalZtoADirection(ZToADirection ztoa1, ZToADirection ztoa2) { - LOG.info("comparing ZtoADirection ..."); - Boolean result = true; - if (ztoa1.getZToA().size() == ztoa2.getZToA().size()) { - int index = 0; - int size = ztoa1.getZToA().size(); - LOG.info("size : {}", size); - String id1 = null; - String id2 = null; - while (index < size) { - id1 = ztoa1.getZToA().get(index).getId(); - LOG.info("id : {}", id1); - Resource res1 = ztoa1.getZToA().get(index).getResource().getResource(); - LOG.info("res1 : {}", res1.toString()); - Resource res2 = null; - if (id1 != null) { - Boolean trouve = false; - for (int loop = 0;loop < size;loop++) { - id2 = ztoa2.getZToA().get(loop).getId(); - if ((id2 != null) && (id2.compareTo(id1) == 0)) { - res2 = ztoa2.getZToA().get(loop).getResource().getResource(); - LOG.info("res2 : {}", res2.toString()); - trouve = true; - break; - } - } - if (trouve) { - if (!egalResource(res1, res2)) { - result = false; - break; - } - } - } else { - result = false; - break; - } - index++; - } - } else { - result = false; - } - return result; - } - - /** - * Test if resources Nodes - * not include in PathDescriptions. - * - * @param path PathDescriptions - * @param nodes Nodes List - * @return Boolean result true if found, false if not - */ - private Boolean excludeNode(PathDescriptions path, List nodes) { - LOG.info("Testing exclude Nodes ..."); - Boolean result = false; - if ((path != null) && !nodes.isEmpty()) { - List list = path.getAToZDirection().getAToZ(); - if (!list.isEmpty()) { - int index = 0; - boolean found = false; - while ((index < list.size()) && !found) { - Resource res = list.get(index).getResource().getResource(); - if ((res != null) && (res instanceof Node)) { - Node node = (Node) res; - for (String exclude : nodes) { - if (exclude.compareToIgnoreCase(node.getNodeIdentifier().getNodeId()) == 0) { - LOG.info("Node not excluded !"); - found = true; - break; - } - } - } - index++; - } - if (!found) { - result = true; - } - } - } else { - LOG.info("exclude parameters not corrrect !"); - } - return result; - } - - /** - * check if existing services not - * in pathDescriptions. - * - * - * @param existingService existing service list - * @param path PathDescriptions - * @param choice 0:Nodes, 1:Clli, 2:Srlg - * @return Boolean result true if found, false if not - */ - private Boolean diversityService(List existingService, PathDescriptions path, int choice) { - LOG.info("Testing diversity ..."); - Boolean result = false; - if ((path != null) && (choice >= 0) && !existingService.isEmpty()) { - int index = 0; - while (index < existingService.size()) { - String tmp = existingService.get(index); - if (tmp != null) { - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service - .types.rev170426.service.path.PathDescription pathDesc = null; - if ((servicePathList != null) && !servicePathList.isEmpty()) { - for (ServicePaths service : servicePathList) { - if (service.getServicePathName().compareTo(tmp) == 0) { - LOG.info("Existing Service '{}' found in ServicePathList ...", tmp); - pathDesc = service.getPathDescription(); - } - } - } - if (pathDesc != null) { - switch (choice) { - case 0: //Nodes - LOG.info("Checking Node existing-service-applicability ..."); - if (!egalAtoZDirection(path.getAToZDirection(), pathDesc.getAToZDirection())) { - result = true; - break; - } - break; - case 1: //Clli - LOG.info("Checking clli existing-service-applicability ..."); - break; - - case 2: //Srlg - LOG.info("Checking srlg existing-service-applicability ..."); - - break; - default: - break; - } - } else { - LOG.info("Existing Service '{}' not found in ServicePathList !", tmp); - result = true; - } - if (!result) { - break; - } - } - index++; - } - } else { - LOG.info("Diversity parameters not coherent !"); - } - return result; - } - - /** - * test if pathDescription - * already exists in ServicePathList. - * - * @param path PathDescriptions - * @return Boolean result - */ - private Boolean testPathDescription(PathDescriptions path) { - LOG.info("Testing pathDescription ..."); - Boolean result = false; - if (path != null) { - LOG.info("retrieving path from servicePath List ..."); - try { - if (!servicePathList.isEmpty()) { - LOG.info("ServicePathList not empty, contains {} paths.", servicePathList.size()); - for (ServicePaths service : servicePathList) { - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service - .types.rev170426.service.path.PathDescription tmp = service.getPathDescription(); - if (tmp != null) { - if ((path.getAToZDirection() != null) && (tmp.getAToZDirection() != null) - && egalAtoZDirection(path.getAToZDirection(), tmp.getAToZDirection())) { - if ((path.getZToADirection() != null) && (tmp.getZToADirection() != null) - && egalZtoADirection(path.getZToADirection(), tmp.getZToADirection())) { - result = true; - LOG.info("Path already present in servicePath List"); - break; - } else { - LOG.info("ZtoADirection not equal or one of ZtoADirection is null!"); - break; - } - } else { - LOG.info("AtoZDirection not equal !"); - break; - } - - } - } - } else { - LOG.info("ServicePathList is empty"); - } - } catch (NullPointerException e) { - LOG.error("ServicePathList is empty"); - } - } else { - LOG.info("PathDescriptions is null !"); - result = true; - } - LOG.info("testPathDescription result : {}", result); - return result; - } - - /** - * function to retrieve Paths based on - * AEnd and ZEnd. - * - * @param aendNodeId Aend Node Id - * @param zendNodeId Zend Node Id - * @return result PathDescriptions List - */ - private List retrievePath(String aendNodeId, String zendNodeId) { - List result = new ArrayList(); - List paths = readPathDescriptionList(); - if (!paths.isEmpty() && (aendNodeId != null) && (zendNodeId != null)) { - LOG.info("retrieving paths from pathDescription List for {} / {}", aendNodeId, zendNodeId); - for (PathDescriptions tmp : paths) { - Resource pathAend = null; - Resource pathZend = null; - String id = null; - if (tmp != null) { - LOG.info("Getting Aend & ZEnd from path '{}'...",tmp.getPathName()); - int index = 0; - int size = tmp.getAToZDirection().getAToZ().size(); - while (index < size) { - id = tmp.getAToZDirection().getAToZ().get(index).getId(); - if (id.compareToIgnoreCase("1") == 0) { - Resource resource = tmp.getAToZDirection().getAToZ().get(index).getResource() - .getResource(); - LOG.info("{} : {}", resource.getClass().toString(), resource.toString()); - pathAend = resource; - break; - } - index++; - } - index = 0; - while (index < size) { - id = tmp.getZToADirection().getZToA().get(index).getId(); - if (id.compareToIgnoreCase("1") == 0) { - Resource resource = tmp.getZToADirection().getZToA().get(index).getResource() - .getResource(); - LOG.info(resource.toString()); - pathZend = resource; - break; - } - index++; - } - if ((pathAend != null) && (pathZend != null)) { - LOG.info("pathAend : {} - pathZend: {}",pathAend, pathZend); - LOG.info("aendNodeId : {} - zendNodeId : {}", aendNodeId, zendNodeId); - if (comp(pathAend, pathZend, aendNodeId, zendNodeId)) { - LOG.info("PathDescription found !"); - result.add(tmp); - } - } - } - } - } - return result; - } - - - /** - * found Pathdescriptions with - * name containing an expression. - * - * @param pathdescr PathDescriptions List - * @param contain String expression - * @return PathDescriptionsOrdered List - */ - private SortedSet foundpath(List pathdescr, String contain) { - SortedSet result = new TreeSet(); - ListIterator it = pathdescr.listIterator(); - int odr = 0; - while (it.hasNext()) { - PathDescriptions path = it.next(); - String name = path.getPathName(); - LOG.info("path : {}", name); - if ((name != null) && name.contains(contain)) { - LOG.info(" path gets : {}", name); - String [] split = name.split("_"); - if (split.length == 3) { - odr = Integer.parseInt(split[2]); - result.add(new PathDescriptionsOrdered(path, odr)); - } - } - } - return result; - } - - /** - * order PathDescriptions List - * with first, ordered direct links - * and secondly ordered indirect - * links. - * - * @param pathdescr PathDescriptions List - * @return PathDescriptions List ordered - */ - private List orderPathdescriptionsList(List pathdescr) { - SortedSet direct = new TreeSet(); - SortedSet indirect = new TreeSet(); - List result = new ArrayList(); - int size = pathdescr.size(); - if (size > 0) { - LOG.info("getting direct path first ..."); - direct = foundpath(pathdescr, "_direct_"); - LOG.info("getting indirect path first ..."); - indirect = foundpath(pathdescr, "_indirect_"); - } - if (direct.size() > 0) { - Iterator itset = direct.iterator(); - while (itset.hasNext()) { - result.add(itset.next().getPathDescriptions()); - } - if (indirect.size() > 0) { - Iterator itset2 = indirect.iterator(); - while (itset2.hasNext()) { - result.add(itset2.next().getPathDescriptions()); - } - } - - } else if (indirect.size() > 0) { - Iterator itset2 = indirect.iterator(); - while (itset2.hasNext()) { - result.add(itset2.next().getPathDescriptions()); - } - } - if (result.size() == pathdescr.size()) { - return result; - } else { - return null; - } - } - - public ListenableFuture cancelResourceReserve() { - LOG.info("In cancelResourceReserve request ..."); - setSuccess(false); - return executor.submit(new Callable() { - @Override - public Boolean call() throws Exception { - Boolean output = false; - if (cancelInput != null) { - Boolean found = false; - String name = cancelInput.getServiceName(); - if ((name != null) && !servicePathList.isEmpty()) { - for (ServicePaths service : servicePathList) { - if (name.compareTo(service.getServicePathName()) == 0) { - LOG.info("ServicePaths found in ServicePathList !!!"); - found = true; - break; - } - } - if (found) { - LOG.info("removing servicePaths from datastore ..."); - if (writeOrDeleteServicePathList(name,1)) { - LOG.info("Service deleted !"); - setSuccess(true); - output = true; - } else { - LOG.info("service deletion failed !"); - } - } - } else { - LOG.info("serviceName is null or servicePathList is empty !"); - } - } else { - LOG.info("cancelresourcereserveinput parameter not valid !"); - } - return output; - } - }); - } - - public ListenableFuture pathComputation() { - LOG.info("In pathComputation request ..."); - setSuccess(false); - return executor.submit(new Callable() { - @Override - public Boolean call() throws Exception { - Boolean output = false; - List pathsList = new ArrayList(); - PathDescriptions path = null; - int index ; - Boolean constraints = false; - if (input != null) { - HardConstraints inputHard = input.getHardConstraints(); - SoftConstraints inputSoft = input.getSoftConstraints(); - if ((inputHard != null) || (inputSoft != null)) { - constraints = true; - } - path = null; - pathsList = retrievePath(input.getServiceAEnd().getNodeId(), input.getServiceZEnd() - .getNodeId()); - index = 0; - output = false; - /** get pathList ordered. */ - pathsList = orderPathdescriptionsList(pathsList); - if (!pathsList.isEmpty()) { - LOG.info("{} Paths get from Pathdescription List", pathsList.size()); - index = 0; - output = false; - while (index < pathsList.size()) { - path = pathsList.get(index); - LOG.info("path n°{} gets : '{}'!", index, path.getPathName()); - if (constraints) { - LOG.info("Calculating path with constraints ..."); - if (inputHard.getCoRoutingOrGeneral() instanceof General) { - General general = (General)inputHard.getCoRoutingOrGeneral(); - if (general != null) { - Diversity diversity = general.getDiversity(); - if (diversity != null) { - LOG.info("Getting diversity ..."); - List existingService = diversity.getExistingService(); - if (existingService.size() > 0) { - LOG.info("Getting existing service applicability ..."); - int choice = -1; - if ((choice < 0) - && diversity.getExistingServiceApplicability().isNode()) { - LOG.info("existing-service-applicability : Node"); - choice = 0; - } - if ((choice < 0) - && diversity.getExistingServiceApplicability().isClli()) { - LOG.info("existing-service-applicability : Clli"); - choice = 1; - } - if ((choice < 0) - && diversity.getExistingServiceApplicability().isSrlg()) { - LOG.info("existing-service-applicability : Srlg"); - choice = 2; - } - if (!diversityService(existingService, path, choice)) { - error = "existing service applicability not satisfied"; - LOG.info(error); - path = null; - } - } - } - Exclude exclude = general.getExclude(); - if (exclude != null) { - LOG.info("Getting exclude ..."); - if (!excludeNode(path, exclude.getNodeId())) { - error = "Exclude node constraints not satisfied !"; - LOG.info(error); - path = null; - } - } - } - } - } - if (!testPathDescription(path)) { - LOG.info("Process finish !"); - output = true; - break; - } - index++; - } - } else { - LOG.info("failed to retrieve path from PathDescription List !"); - } - } else { - LOG.info("pathComputationRequestInput parameter not valid !"); - } - if (path != null) { - LOG.info("Path ok !"); - pathDescription = new PathDescriptionBuilder() - .setAToZDirection(path.getAToZDirection()) - .setZToADirection(path.getZToADirection()); - if (input.isResourceReserve()) { - LOG.info("reserving pce resource ..."); - setPathDescription(pathDescription); - if (writeOrDeleteServicePathList(input.getServiceName(), 0)) { - LOG.info("write ServicePaths to datastore"); - setSuccess(true); - } else { - LOG.error("writing ServicePaths to datastore failed ! "); - } - } else { - LOG.info("no pce resource reserve !"); - setSuccess(true); - } - } - return output; - } - }); - } - - - /** - * get all ServicePaths in ServicePathlist. - * - * @return ServicePaths List - */ - private List readServicePathList() { - LOG.info("Reading ServicePathList ..."); - List result = null; - ReadOnlyTransaction readTx = db.newReadOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class); - Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL,iid); - Optional optional = Optional.absent(); - try { - optional = Futures.getChecked(future, ExecutionException.class, 60, TimeUnit.SECONDS); - } catch (ExecutionException e) { - LOG.error("Reading service failed:", e); - } - if (optional.isPresent()) { - LOG.info("ServicePath List present !"); - result = optional.get().getServicePaths(); - } - return result; - } - - - private List readPathDescriptionList() { - LOG.info("Reading PathDescriptionsList ..."); - List result = null; - ReadOnlyTransaction readTx = db.newReadOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(PathDescriptionList.class); - Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL,iid); - Optional optional = Optional.absent(); - try { - optional = Futures.getChecked(future, ExecutionException.class, 60, TimeUnit.SECONDS); - } catch (ExecutionException e) { - LOG.error("Reading service failed:", e); - } - if (optional.isPresent()) { - LOG.info("ServicePath List present !"); - result = optional.get().getPathDescriptions(); - } - return result; - - } - - /** - * Write or Delete ServicePaths - * for ServicePathList. - * - * @param serviceName Service Name - * @param choice 0 : write or 1 : delete - * @return Boolean result true if deleted, false if not - */ - private Boolean writeOrDeleteServicePathList(String serviceName, int choice) { - Boolean result = null; - if ((serviceName != null) && (serviceName.compareTo(" ") != 0) && (choice >= 0) && (choice < 2)) { - LOG.info("WriteOrDeleting '{}' ServicePaths", serviceName); - WriteTransaction writeTx = db.newWriteOnlyTransaction(); - result = true; - String action = null; - InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class) - .child(ServicePaths.class,new ServicePathsKey(serviceName)); - Future future = null; - switch (choice) { - case 0: /** Write. */ - LOG.info("Writing '{}' Service", serviceName); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service - .path.PathDescriptionBuilder path = new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c - ._interface.service.types.rev170426.service.path.PathDescriptionBuilder(); - if (pathDescription != null) { - if (pathDescription.getAToZDirection() != null) { - path.setAToZDirection(pathDescription.getAToZDirection()); - } - if (pathDescription.getZToADirection() != null) { - path.setZToADirection(pathDescription.getZToADirection()); - } - LOG.info("pathdescription gets"); - } - ServiceAEnd aend = new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c - ._interface.service.types.rev170426.service.path.ServiceAEndBuilder(input.getServiceAEnd()) - .build(); - ServiceZEnd zend = new org.opendaylight.yang.gen.v1.http.org.transportpce.b.c - ._interface.service.types.rev170426.service.path.ServiceZEndBuilder(input.getServiceZEnd()) - .build(); - ServicePaths service = new ServicePathsBuilder() - .setServicePathName(serviceName) - .setServiceHandlerHeader(new ServiceHandlerHeaderBuilder() - .setRequestId(input.getServiceHandlerHeader().getRequestId()).build()) - .setServiceAEnd(aend) - .setServiceZEnd(zend) - .setHardConstraints(input.getHardConstraints()) - .setSoftConstraints(input.getSoftConstraints()) - .setPathDescription(path.build()) - .build(); - LOG.info("Servicepath build"); - writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service); - action = "write"; - //CheckedFuture future = transaction.submit(); - future = writeTx.submit(); - try { - LOG.info("Sending '{}' command to datastore !", action); - Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Failed to {} service from Service List", action); - result = false; - } - break; - - case 1: /** Delete */ - LOG.info("Deleting '{}' Service", serviceName); - writeTx.delete(LogicalDatastoreType.OPERATIONAL, iid); - action = "delete"; - future = writeTx.submit(); - try { - LOG.info("Sending '{}' command to datastore !", serviceName); - Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Failed to {} service from Service List", serviceName); - result = false; - } - break; - - default: - LOG.info("No choice found"); - break; - - } - - } else { - LOG.info("Parameters not correct !"); - } - return result; - } - - public PathDescriptionBuilder getPathDescription() { - return pathDescription; - } - - public void setPathDescription(PathDescriptionBuilder pathDescription) { - this.pathDescription = pathDescription; - } - - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public PathComputationRequestInput getInput() { - return input; - } - - public void setInput(PathComputationRequestInput pathComputationRequestInput) { - this.input = pathComputationRequestInput; - } - - public CancelResourceReserveInput getCancelInput() { - return cancelInput; - } - - public void setCancelInput(CancelResourceReserveInput cancelResourceReserveInput) { - this.cancelInput = cancelResourceReserveInput; - } - - public DataBroker getDb() { - return db; - } - - public void setDb(DataBroker db) { - this.db = db; - } - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } - - public List getServicePathList() { - return servicePathList; - } - - public void setServicePathList(List servicePathList) { - this.servicePathList = servicePathList; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceCompliancyCheck.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceCompliancyCheck.java deleted file mode 100644 index 7353d9647..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceCompliancyCheck.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.ConnectionType; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.handler.header.ServiceHandlerHeader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class for checking service sdnc-request-header compliancy. - * - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - * - */ -public class StubpceCompliancyCheck { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(StubpceCompliancyCheck.class); - /** SdncRequestHeader. */ - private ServiceHandlerHeader serviceHandlerHeader; - /** Service Name. */ - private String serviceName; - /** Type of connection : service / infrastructure / roadm-line. */ - private ConnectionType conType; - /** Response message from procedure. */ - private String message; - - - public StubpceCompliancyCheck(String serviceName,ServiceHandlerHeader serviceHandlerHeader) { - this.serviceName = serviceName; - this.serviceHandlerHeader = serviceHandlerHeader; - this.setMessage(""); - } - - /** - * Check if a String is not null and not equal to void. - * - * @param value - * String value - * @return true if String ok false if not - */ - public Boolean checkString(String value) { - Boolean result = false; - if (value != null && value.compareTo("") != 0) { - result = true; - } - return result; - - } - - /** - * Check Compliancy of Service request. - * - * @param contype - * Boolean to check connection Type - * @param servicehandler - * Boolean to check sndcRequestHeader - * - * @return true if String ok false if not - */ - public Boolean check(Boolean contype, Boolean servicehandler) { - Boolean result = true; - if (!checkString(serviceName)) { - result = false; - message = "Service Name is not set"; - LOG.debug(message); - } else if (contype && conType == null) { - result = false; - message = "Service ConnectionType is not set"; - LOG.debug(message); - } - if (servicehandler) { - if (serviceHandlerHeader != null) { - String requestId = serviceHandlerHeader.getRequestId(); - if (!checkString(requestId)) { - result = false; - message = "Service serviceHandlerHeader 'request-id' is not set"; - LOG.debug(message); - } - } else { - result = false; - message = "Service serviceHandlerHeader is not set "; - LOG.debug(message); - } - } - return result; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceTxRxCheck.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceTxRxCheck.java deleted file mode 100644 index a30190073..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/StubpceTxRxCheck.java +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -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.lgx.Lgx; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.port.Port; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.ServiceEndpointSp; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.endpoint.sp.RxDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.endpoint.sp.TxDirection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class for checking missing info on Tx/Rx for A/Z end. - * - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - */ -public class StubpceTxRxCheck { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(StubpceTxRxCheck.class); - /** ServiceEndpoint. */ - private ServiceEndpointSp serviceEnd; - /** Response message from procedure. */ - private String message; - /** type serviceEndpoint : serviceAEnd / serviceZEnd. */ - private String service = null; - - /** - * ServicehandlerTxRxCheck class constructor. - * - * @param endPoint - * ServiceEndpoint - * @param value - * Integer to define ServiceAEND/ZEND - */ - public StubpceTxRxCheck(ServiceEndpointSp endPoint, int value) { - this.serviceEnd = endPoint; - this.setMessage(""); - if (value > 0) { - service = MyEndpoint.forValue(value).name(); - } - } - - /** - * Check if a String is not null and not equal to ''. - * - * @param value - * String value - * @return true if String ok false if not - */ - public Boolean checkString(String value) { - Boolean result = false; - if (value != null && value.compareTo("") != 0) { - result = true; - } - return result; - - } - - /** - * check if Port info is compliant. - * - * @param port - * port info - * @return true if String ok false if not - */ - public Boolean checkPort(Port port) { - Boolean result = false; - if (port != null) { - String portDeviceName = port.getPortDeviceName(); - String portType = port.getPortType(); - String portName = port.getPortName(); - String portRack = port.getPortRack(); - String portShelf = port.getPortShelf(); - - if (checkString(portDeviceName) && checkString(portType) && checkString(portName) && checkString(portRack) - && checkString(portShelf)) { - result = true; - } - } - return result; - - } - - /** - * Check if lgx info is compliant. - * - * @param lgx - * lgx info - * @return true if String ok false if not - */ - public Boolean checkLgx(Lgx lgx) { - Boolean result = false; - if (lgx != null) { - String lgxDeviceName = lgx.getLgxDeviceName(); - String lgxPortName = lgx.getLgxPortName(); - String lgxPortRack = lgx.getLgxPortRack(); - String lgxPortShelf = lgx.getLgxPortShelf(); - if (checkString(lgxDeviceName) && checkString(lgxPortName) && checkString(lgxPortRack) - && checkString(lgxPortShelf)) { - result = true; - } - } - return result; - } - - /** - * Check if Tx/Rx Direction complaincy info. - * - * @param txDirection - * TxDirection - * @param rxDirection - * RxDirection - * - * @return true if check is ok false else - */ - public boolean checkTxOrRxInfo(TxDirection txDirection, RxDirection rxDirection) { - Boolean result = true; - if (txDirection != null) { - if (!checkPort(txDirection.getPort())) { - result = false; - message = "Service TxDirection Port is not correctly set"; - } else if (rxDirection != null) { - if (!checkPort(rxDirection.getPort())) { - result = false; - message = "Service RxDirection Port is not correctly set"; - } - } else { - result = false; - message = "Service RxDirection is not correctly set"; - } - } else { - result = false; - message = "Service TxDirection is not correctly set"; - } - return result; - } - - /** - * Check Compliancy of Service TxRx info. - * - * @return true if String ok false if not - */ - public Boolean check() { - Boolean result = true; - if (serviceEnd != null) { - Long serviceRate = serviceEnd.getServiceRate(); - ServiceFormat serviceformat = serviceEnd.getServiceFormat(); - String clli = serviceEnd.getClli(); - if (serviceRate != null && serviceRate <= 0) { - result = false; - message = "Service " + service + " rate is not set"; - LOG.info(message); - } else if (serviceformat == null) { - result = false; - message = "Service " + service + " format is not set"; - LOG.info(message); - } else if (!checkString(clli)) { - result = false; - message = "Service" + service + " clli format is not set"; - LOG.info(message); - } else { - if (!checkTxOrRxInfo(serviceEnd.getTxDirection(), serviceEnd.getRxDirection())) { - result = false; - } - } - } else { - result = false; - message = service + " is not set"; - LOG.info(message); - } - return result; - - } - - public static void main(String[] args) { - - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/TpNodeTp.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/TpNodeTp.java deleted file mode 100644 index ab7304b36..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/TpNodeTp.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce; - -import java.util.ArrayList; -import java.util.List; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZ; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToA; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToABuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToAKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.Resource; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.ResourceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Node; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPoint; - -/** - * Class to create structure - * TerminationPoint - * Node - * TerminationPoint. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class TpNodeTp { - private TerminationPoint tpOut; - private TerminationPoint tpIn; - private Node node; - private List resources; - private List atoz; - private List ztoa; - private List ids; - - /** - * TpNodeTp Constructor. - * - * @param in TerminationPoint input - * @param out TerminationPoint output - * @param node Node Id - */ - public TpNodeTp(TerminationPoint in, TerminationPoint out, Node node) { - this.tpOut = out; - this.tpIn = in; - this.node = node; - this.resources = new ArrayList(); - this.atoz = new ArrayList(); - this.ztoa = new ArrayList(); - this.ids = new ArrayList(); - - } - - /** - * create resource List. - */ - public void createListResource() { - this.ids.clear(); - this.resources.clear(); - this.atoz.clear(); - this.ztoa.clear(); - - this.resources.add(new ResourceBuilder().setResource(this.tpIn).build()); - this.ids.add(this.tpIn.getTerminationPointIdentifier().getNodeId().concat("-") - .concat(this.tpIn.getTerminationPointIdentifier().getTpId())); - this.resources.add(new ResourceBuilder().setResource(this.node).build()); - this.ids.add(this.node.getNodeIdentifier().getNodeId()); - this.resources.add(new ResourceBuilder().setResource(this.tpOut).build()); - this.ids.add(this.tpOut.getTerminationPointIdentifier().getNodeId().concat("-") - .concat(this.tpOut.getTerminationPointIdentifier().getTpId())); - } - - /** - * Create an hop in AtoZList. - * @param odr hop number - */ - public void createAToZListHop(int odr) { - AToZ hop = null; - AToZKey atozKey = null; - createListResource(); - for (Resource resource : this.resources) { - atozKey = new AToZKey(Integer.toString(odr)); - resource = new ResourceBuilder().setResource(resource.getResource()).build(); - hop = new AToZBuilder() - .withKey(atozKey) - .setResource(resource) - .build(); - this.atoz.add(hop); - odr++; - } - } - - /** - * Create an hop in ZtoAList. - * @param odr hop number - */ - public void createZToAListHop(int odr) { - ZToA hop = null; - ZToAKey ztoaKey = null; - createListResource(); - for (Resource resource : this.resources) { - ztoaKey = new ZToAKey(Integer.toString(odr)); - resource = new ResourceBuilder().setResource(resource.getResource()).build(); - hop = new ZToABuilder() - .withKey(ztoaKey) - .setResource(resource) - .build(); - this.ztoa.add(hop); - odr++; - } - } - - public TpNodeTp reverse() { - return new TpNodeTp(this.tpOut, this.tpIn, this.node); - } - - @Override - public String toString() { - StringBuilder result = new StringBuilder("[ "); - result.append("tpIn : " + this.tpIn.getTerminationPointIdentifier().getTpId()); - result.append(" - Node : " + this.node.getNodeIdentifier().getNodeId()); - result.append(" - tpOut : " + this.tpOut.getTerminationPointIdentifier().getTpId()); - result.append(" ]"); - return result.toString(); - - } - - public List getAToZ() { - return this.atoz; - } - - public List getZToA() { - return this.ztoa; - } - - public Node getNode() { - return this.node; - } - - public TerminationPoint getTpIn() { - return this.tpIn; - } - - public TerminationPoint getTpOut() { - return this.tpOut; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java deleted file mode 100644 index 6240693e2..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceImpl.java +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.impl; - -import com.google.common.base.Optional; -import com.google.common.util.concurrent.FutureCallback; -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.Iterator; -import java.util.SortedSet; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.transportpce.stubpce.CheckCoherencyHardSoft; -import org.opendaylight.transportpce.stubpce.SendingPceRPCs; -import org.opendaylight.transportpce.stubpce.StubpceCompliancyCheck; -import org.opendaylight.transportpce.stubpce.StubpceTxRxCheck; -import org.opendaylight.transportpce.stubpce.topology.PathDescriptionsOrdered; -import org.opendaylight.transportpce.stubpce.topology.SuperNodePath; -import org.opendaylight.transportpce.stubpce.topology.Topology; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.CancelResourceReserveInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.CancelResourceReserveOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.CancelResourceReserveOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathComputationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathComputationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathDescriptionList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.PathDescriptionListBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.ServicePathList; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.ServicePathListBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.ServicePathRpcResult; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.ServicePathRpcResultBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.StubpceService; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptions; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptionsBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptionsKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePaths; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePathsBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.list.ServicePathsKey; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.service.path.rpc.result.PathDescriptionBuilder; -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.ServiceList; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesKey; -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.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev170426.service.path.rpc.result.PathDescription; -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; - -/** - * Class to implement StubpceService StubpceListener. - * @author Martial Coulibaly on - * behalf of Orange - */ - -public class StubpceImpl implements StubpceService { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(StubpceImpl.class); - /** Permit to access database. */ - private DataBroker db; - /** check service sdnc-request-header compliancy. */ - private StubpceCompliancyCheck compliancyCheck; - /** check missing info on Tx/Rx for A/Z end. */ - private StubpceTxRxCheck txrxCheck; - /** check coherency between hard and soft constraints. */ - private CheckCoherencyHardSoft checkCoherencyHardSoft; - private NotificationPublishService notificationPublishService; - private ServicePathRpcResult notification; - private PathDescriptionBuilder pathDescriptionBuilder; - private SendingPceRPCs sendingPCE; - private final ListeningExecutorService executor = MoreExecutors - .listeningDecorator(Executors.newFixedThreadPool(10)); - - public StubpceImpl(NotificationPublishService notificationPublishService, DataBroker databroker) { - this.notificationPublishService = notificationPublishService; - this.db = databroker; - this.pathDescriptionBuilder = null; - if (initializePathDescriptionList(databroker)) { - fillPathDesciptionList(); - } - initializeServicePathList(databroker); - /*if (initializeServicePathList(databroker)) { - fillServicePathList(); - }*/ - } - - @Override - public ListenableFuture> - cancelResourceReserve(CancelResourceReserveInput input) { - LOG.info("RPC cancelResourceReserve request received"); - String message = ""; - String responseCode = ""; - ConfigurationResponseCommonBuilder configurationResponseCommon = null; - String serviceName = input.getServiceName(); - LOG.info("serviceName : {}", serviceName); - if (serviceName != null) { - this.sendingPCE = new SendingPceRPCs(input,this.db,this.executor); - FutureCallback pceCallback = new FutureCallback() { - String message = ""; - ServicePathRpcResult notification = null; - - @Override - public void onFailure(Throwable arg0) { - LOG.error("Cancel resource failed : {}", arg0); - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.CancelResourceReserve) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("Cancel resource request failed : " + arg0.getMessage()).build(); - try { - StubpceImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - - @Override - public void onSuccess(Boolean response) { - LOG.info("response : {}", response); - if (response) { - this.message = "Resource cancelled !"; - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.CancelResourceReserve) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Successful) - .setStatusMessage(this.message) - .build(); - } else { - this.message = StubpceImpl.this.sendingPCE.getError(); - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.CancelResourceReserve) - .setServiceName("") - .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message) - .build(); - this.message = "Cancel request failed !"; - } - LOG.info(this.notification.toString()); - try { - StubpceImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - LOG.info(this.message); - } - }; - ListenableFuture pce = this.sendingPCE.cancelResourceReserve(); - Futures.addCallback(pce, pceCallback, this.executor); - LOG.info("Cancel Resource Request in progress ..."); - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("No") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseMessage("Service compliant, Cancel resource request in progress...") - .setResponseCode("200"); - - CancelResourceReserveOutputBuilder output = new CancelResourceReserveOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()); - return RpcResultBuilder.success(output.build()).buildFuture(); - } else { - message = "serviceName / requestId is not correct !"; - responseCode = "500"; - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.CancelResourceReserve) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage(message).build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - configurationResponseCommon = new ConfigurationResponseCommonBuilder(); - configurationResponseCommon.setAckFinalIndicator("Yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseMessage(message) - .setResponseCode(responseCode).build(); - CancelResourceReserveOutputBuilder output = new CancelResourceReserveOutputBuilder(); - output.setConfigurationResponseCommon(configurationResponseCommon.build()); - return RpcResultBuilder.success(output.build()).buildFuture(); - } - - @Override - public ListenableFuture> - pathComputationRequest(PathComputationRequestInput input) { - LOG.info("RPC pathcomputation request received"); - String message = ""; - String responseCode = ""; - boolean coherencyHardSoft = false; - boolean commonId = true; - ConfigurationResponseCommonBuilder configurationResponseCommon = null; - this.compliancyCheck = new StubpceCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader()); - if (this.compliancyCheck.check(false, true)) { - LOG.info("Service compliant !"); - /** - * If compliant, service-request parameters are verified in order to - * check if there is no missing parameter that prevents calculating - * a path and implement a service. - */ - LOG.info("checking Tx/Rx Info for AEnd ..."); - this.txrxCheck = new StubpceTxRxCheck(input.getServiceAEnd(), 1); - if (this.txrxCheck.check()) { - LOG.info("Tx/Rx Info for AEnd checked !"); - LOG.info("checking Tx/Rx Info for ZEnd ..."); - this.txrxCheck = new StubpceTxRxCheck(input.getServiceZEnd(), 2); - if (this.txrxCheck.check()) { - LOG.info("Tx/Rx Info for ZEnd checked !"); - /** - * If OK, common-id is verified in order to see if there is - * no routing policy provided. If yes, the routing - * constraints of the policy are recovered and coherency - * with hard/soft constraints provided in the input of the - * RPC. - */ - if ((input.getHardConstraints() != null) || (input.getSoftConstraints() != null)) { - LOG.info("Constraints specified !"); - this.checkCoherencyHardSoft = new CheckCoherencyHardSoft(input.getHardConstraints(), - input.getSoftConstraints()); - if (this.checkCoherencyHardSoft.check()) { - LOG.info("hard/soft constraints coherent !"); - coherencyHardSoft = true; - } else { - LOG.info("hard/soft constraints are not coherent !"); - message = "hard/soft constraints are not coherent !"; - responseCode = "500"; - } - } else { - commonId = false; - } - if (!commonId || (commonId && coherencyHardSoft)) { - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.PathComputationRequest) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Pending) - .setStatusMessage("Service compliant, submitting pathComputation Request ...").build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - this.sendingPCE = new SendingPceRPCs(input,this.db,this.executor); - FutureCallback pceCallback = new FutureCallback() { - String message = ""; - ServicePathRpcResult notification = null; - - @Override - public void onFailure(Throwable arg0) { - LOG.error("Failure message : {}", arg0.toString()); - LOG.error("Path calculation failed !"); - this.notification = new ServicePathRpcResultBuilder() - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("PCR Request failed : " + arg0.getMessage()).build(); - try { - StubpceImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - - @Override - public void onSuccess(Boolean response) { - LOG.info("response : {}", response); - if (response) { - this.message = "Path Computated !"; - ServicePathRpcResultBuilder tmp = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.PathComputationRequest) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Successful) - .setStatusMessage(this.message); - StubpceImpl.this.pathDescriptionBuilder = - StubpceImpl.this.sendingPCE.getPathDescription(); - if (StubpceImpl.this.pathDescriptionBuilder != null) { - PathDescription pathDescription = new org.opendaylight.yang.gen.v1.http.org - .transportpce.b.c._interface.servicepath.rev170426.service.path - .rpc.result.PathDescriptionBuilder() - .setAToZDirection( - StubpceImpl.this.pathDescriptionBuilder.getAToZDirection()) - .setZToADirection( - StubpceImpl.this.pathDescriptionBuilder.getZToADirection()) - .build(); - tmp.setPathDescription(new PathDescriptionBuilder() - .setAToZDirection(pathDescription.getAToZDirection()) - .setZToADirection(pathDescription.getZToADirection()) - .build()); - } - this.notification = tmp.build(); - } else { - this.message = StubpceImpl.this.sendingPCE.getError(); - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.PathComputationRequest) - .setServiceName("") - .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message) - .build(); - this.message = "Path not calculated!"; - } - try { - StubpceImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - LOG.info(this.message); - } - }; - ListenableFuture pce = this.sendingPCE.pathComputation(); - Futures.addCallback(pce, pceCallback, this.executor); - LOG.info("PathComputation Request in progress ..."); - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("No") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseMessage("Service compliant, Path calculating in progress...") - .setResponseCode("200"); - - PathComputationRequestOutputBuilder output = new PathComputationRequestOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()); - return RpcResultBuilder.success(output.build()).buildFuture(); - } - - } else { - message = this.txrxCheck.getMessage(); - responseCode = "500"; - } - } else { - message = this.txrxCheck.getMessage(); - responseCode = "500"; - } - } else { - message = this.compliancyCheck.getMessage(); - responseCode = "500"; - this.notification = new ServicePathRpcResultBuilder() - .setNotificationType(ServicePathNotificationTypes.PathComputationRequest) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("Service not compliant : " + message).build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - configurationResponseCommon = new ConfigurationResponseCommonBuilder(); - configurationResponseCommon.setAckFinalIndicator("Yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseMessage(message) - .setResponseCode(responseCode).build(); - PathComputationRequestOutputBuilder output = new PathComputationRequestOutputBuilder(); - output.setConfigurationResponseCommon(configurationResponseCommon.build()); - return RpcResultBuilder.success(output.build()).buildFuture(); - - } - - /** - * Initialize PathDescriptionList Structure on DataStore. - * - * @param DataBroker - * Access DataStore - */ - private boolean initializePathDescriptionList(DataBroker dataBroker) { - Boolean result = true; - LOG.info("Preparing to initialize the PathDescription List"); - WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(PathDescriptionList.class); - PathDescriptionList pathDescriptionList = new PathDescriptionListBuilder().build(); - transaction.put(LogicalDatastoreType.OPERATIONAL, iid, pathDescriptionList); - Future future = transaction.submit(); - try { - Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Failed to create PathDescription List"); - result = false; - } - return result; - } - - /** - * Initialize ServicePathList Structure on DataStore. - * - * @param DataBroker - * Access DataStore - * @return true if ok, false else - */ - private boolean initializeServicePathList(DataBroker dataBroker) { - Boolean result = true; - LOG.info("Preparing to initialize the ServicePathList registry"); - WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class); - ServicePathList servicePathList = new ServicePathListBuilder().build(); - transaction.put(LogicalDatastoreType.OPERATIONAL, iid, servicePathList); - Future future = transaction.submit(); - try { - Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Failed to create ServicePathList List : {}", e.toString()); - result = false; - } - return result; - } - - /** - * fill PathDescriptionList - * with direct paths and - * indirect paths. - */ - private void fillPathDesciptionList() { - LOG.info("filling PathDescription List..."); - Topology topo = new Topology(); - topo.start(); - LOG.info("Network : {}", topo.getNetwork()); - SuperNodePath superNodePath = new SuperNodePath(topo.getNetwork()); - String aend = "NodeA"; - String zend = "NodeZ"; - superNodePath.run(aend, zend); - fill(superNodePath.getDirectPathDesc(aend, zend, superNodePath.getPaths())); - fill(superNodePath.getIndirectPathDesc(aend, zend, superNodePath.getPaths())); - } - - /** - * fill datastore with - * Pathdescriptions List. - * - * @param sortedSet PathDescriptionsOrdered List - */ - private void fill(SortedSet sortedSet) { - InstanceIdentifier iid; - WriteTransaction writeTx; - Future future; - if (!sortedSet.isEmpty()) { - Iterator it = sortedSet.iterator(); - while (it.hasNext()) { - PathDescriptions pathDesc = it.next().getPathDescriptions(); - if (pathDesc != null) { - iid = InstanceIdentifier.create(PathDescriptionList.class) - .child(PathDescriptions.class, new PathDescriptionsKey(pathDesc.getPathName())); - writeTx = this.db.newWriteOnlyTransaction(); - writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, pathDesc); - future = writeTx.submit(); - try { - Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Failed to write PathDescriptions to PathDescriptionsList : {}", e.toString()); - } - } else { - LOG.error("PathDescriptions gets is null !"); - } - } - } else { - LOG.info("PathDescriptions List is empty !"); - } - } - - /** - * read Service from ServiceList DataStore. - * - * @param serviceName - * Name of Service - * - * @return Services - */ - @SuppressWarnings("unused") - private Services readServiceList(String serviceName) { - Services result = null; - ReadOnlyTransaction readTx = this.db.newReadOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(ServiceList.class).child(Services.class, - new ServicesKey(serviceName)); - Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL,iid); - Optional optional = Optional.absent(); - try { - optional = Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Reading service failed:", e); - } - if (optional.isPresent()) { - LOG.debug("Service '{}' present !", serviceName); - result = new ServicesBuilder(optional.get()).build(); - } - return result; - } - - /** - * read ServicePath Service from ServicePathList DataStore. - * - * @param serviceName - * Name of ServicePath - * - * @return Services - */ - @SuppressWarnings("unused") - private ServicePaths readServicePathList(String serviceName) { - ServicePaths result = null; - ReadOnlyTransaction readTx = this.db.newReadOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class) - .child(ServicePaths.class, new ServicePathsKey(serviceName)); - Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL,iid); - Optional optional = Optional.absent(); - try { - optional = Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Reading service failed:", e); - } - if (optional.isPresent()) { - LOG.debug("Service '{}' present !", serviceName); - result = new ServicePathsBuilder(optional.get()).build(); - } - return result; - } - - /** - * read PathDescription information from PathDescriptionList. - * - * @param pathName - * Name of PathDescription - * - * @return PathDescriptions - */ - @SuppressWarnings("unused") - private PathDescriptions readPathDescriptionList(String pathName) { - PathDescriptions result = null; - ReadOnlyTransaction readTx = this.db.newReadOnlyTransaction(); - InstanceIdentifier iid = InstanceIdentifier.create(PathDescriptionList.class) - .child(PathDescriptions.class, new PathDescriptionsKey(pathName)); - Future> future = readTx.read(LogicalDatastoreType.OPERATIONAL,iid); - Optional optional = Optional.absent(); - try { - optional = Futures.getChecked(future, ExecutionException.class); - } catch (ExecutionException e) { - LOG.error("Reading service failed:", e); - } - if (optional.isPresent()) { - LOG.debug("PathDescritions '{}' present !", pathName); - result = new PathDescriptionsBuilder(optional.get()).build(); - } - return result; - } - - /** - * register ServicePath Service to ServicePathList with PathDescription - * information. - * - * @param input - * PathComputationRequestInput - * @return String operations result, null if ok or not otherwise - */ - @SuppressWarnings("unused") - private String writeServicePathList(PathComputationRequestInput input) { - String serviceName = input.getServiceName(); - LOG.debug("Write ServicePath '{}' Service", serviceName); - String result = null; - LOG.debug("Writing '{}' ServicePath", serviceName); - InstanceIdentifier iid = InstanceIdentifier.create(ServicePathList.class) - .child(ServicePaths.class, new ServicePathsKey(serviceName)); - - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service - .path.PathDescriptionBuilder path = new org.opendaylight.yang.gen.v1.http.org.transportpce - .b.c._interface.service.types.rev170426.service.path.PathDescriptionBuilder(); - path.setAToZDirection(this.pathDescriptionBuilder.getAToZDirection()); - path.setZToADirection(this.pathDescriptionBuilder.getZToADirection()); - ServicePaths service = new ServicePathsBuilder().setServicePathName(input.getServiceName()) - .setSoftConstraints(input.getSoftConstraints()).setHardConstraints(input.getHardConstraints()) - .setPathDescription(path.build()).build(); - WriteTransaction writeTx = this.db.newWriteOnlyTransaction(); - writeTx.put(LogicalDatastoreType.OPERATIONAL, iid, service); - Future future = writeTx.submit(); - try { - Futures.getChecked(future, ExecutionException.class); - result = null; - } catch (ExecutionException e) { - LOG.error("Failed to write service to Service List"); - result = "Failed to write service to Service List"; - } - return result; - } - - public PathDescriptionBuilder getPathDescriptionBuilder() { - return this.pathDescriptionBuilder; - } - - public void setPathDescriptionBuilder(PathDescriptionBuilder pathDescriptionBuilder) { - this.pathDescriptionBuilder = pathDescriptionBuilder; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceProvider.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceProvider.java deleted file mode 100644 index 7377fa925..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/impl/StubpceProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.impl; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.NotificationService; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.StubpceListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.StubpceService; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class to register - * Stubpce Service and Notification. - * @author Martial Coulibaly on behalf of Orange - * - */ -public class StubpceProvider { - private static final Logger LOG = LoggerFactory.getLogger(StubpceProvider.class); - private final RpcProviderRegistry rpcRegistry; - private final NotificationPublishService notificationPublishService; - private final DataBroker dataBroker; - - - private BindingAwareBroker.RpcRegistration rpcRegistration; - private ListenerRegistration stubPcelistenerRegistration; - - public StubpceProvider(RpcProviderRegistry rpcProviderRegistry,final DataBroker dataBroker, - NotificationService notificationService, NotificationPublishService notificationPublishService) { - this.rpcRegistry = rpcProviderRegistry; - this.notificationPublishService = notificationPublishService; - this.dataBroker = dataBroker; - } - - /** - * Method called when the blueprint container is created. - */ - public void init() { - LOG.info("StubpceProvider Session Initiated"); - final StubpceImpl consumer = new StubpceImpl(this.notificationPublishService,this.dataBroker); - this.rpcRegistration = this.rpcRegistry.addRpcImplementation(StubpceService.class, consumer); - } - - /** - * Method called when the blueprint container is destroyed. - */ - public void close() { - LOG.info("StubpceProvider Closed"); - this.rpcRegistration.close(); - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java deleted file mode 100644 index 861bc84c1..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/InterNodePath.java +++ /dev/null @@ -1,556 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.google.common.collect.Lists; -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; -import org.opendaylight.transportpce.stubpce.TpNodeTp; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ZToADirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ZToADirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZ; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToA; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToABuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToAKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.Resource; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.ResourceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.LinkBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPoint; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.link.LinkIdentifierBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * class to build all path between superNode elements - * ( XPDR and ROADM). - * - * @author Martial Coulibaly on - * behalf of Orange - */ - -public class InterNodePath { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(InterNodePath.class); - private SuperNode superNode; - private List nodepaths; - private List atoz; - private List ztoa; - - /** - * InterNodePath constructor. - * - * @param supernode Supernode - */ - public InterNodePath(SuperNode supernode) { - setSuperNode(supernode); - setNodepaths(new ArrayList()); - setAtoz(new ArrayList()); - setZtoa(new ArrayList()); - } - - /** - * build AToZdirection. - * - * @param paths Path List - */ - private void getAToZDirection(List paths) { - int order = 0; - AToZDirectionBuilder atozDirection = new AToZDirectionBuilder(); - List atozList = new ArrayList(); - TpNodeTp tpNodeTp; - for (Path path : paths) { - tpNodeTp = path.getTpNodeTp(); - tpNodeTp.createAToZListHop(order); - for (AToZ tmp : tpNodeTp.getAToZ()) { - atozList.add(tmp); - order++; - } - Link link = path.getLink(); - AToZKey atozKey = new AToZKey(Integer.toString(order)); - Resource resource = new ResourceBuilder().setResource(link).build(); - AToZ hop = new AToZBuilder().setId(atozKey.getId()).withKey(atozKey).setResource(resource).build(); - atozList.add(hop); - order++; - } - atozDirection.setRate((long) 100).setAToZWavelengthNumber((long) 200).setAToZ(atozList); - this.atoz.add(atozDirection.build()); - } - - /** - * build ZToAdirection. - * - * @param paths Path List - */ - private void getZToADirection(List paths) { - int order = 0; - ZToADirectionBuilder ztoaDirection = new ZToADirectionBuilder(); - List ztoaList = new ArrayList(); - TpNodeTp tpNodeTp; - for (Path path : paths) { - tpNodeTp = path.getTpNodeTp(); - tpNodeTp.createZToAListHop(order); - for (ZToA tmp : tpNodeTp.getZToA()) { - ztoaList.add(tmp); - order++; - } - Link link = path.getLink(); - ZToAKey ztoaKey = new ZToAKey(Integer.toString(order)); - Resource resource = new ResourceBuilder().setResource(link).build(); - ZToA hop = new ZToABuilder().setId(ztoaKey.getId()).withKey(ztoaKey).setResource(resource).build(); - ztoaList.add(hop); - order++; - } - ztoaDirection.setRate((long) 100).setZToAWavelengthNumber((long) 200).setZToA(ztoaList); - this.ztoa.add(ztoaDirection.build()); - } - - /** - * Build direction path - * for all Supernode elements. - * - * @param skip Boolean to specify an ROADM without XPDR - * @param nodeId Supernode element nodeId - * @param zend Supernode path ZEnd nodeId - */ - public void build(Boolean skip, String nodeId,String zend) { - LOG.info("Building direction ..."); - if (skip) { - buildDegToDeg(false); - buildDegToDeg(true); - } else { - boolean reverse = false; - if (nodeId.contains(zend)) { - reverse = true; - } - NodePath xpdr = null; - NodePath srg = null; - NodePath deg1 = null; - NodePath deg2 = null; - for (NodePath node : this.nodepaths) { - //LOG.info(node.toString()); - String id = node.getNodeId(); - if (id.contains("XPDR")) { - xpdr = node; - } - if (id.contains("SRG")) { - srg = node; - } - if (id.contains("DEG1")) { - deg1 = node; - } - if (id.contains("DEG2")) { - deg2 = node; - } - } - buildXpdrToSrgToDeg(xpdr,srg,deg1,deg2,reverse); - buildDegToSrgToXpdr(xpdr,srg,deg1,deg2,reverse); - } - } - - /** - * build direction path for - * Supernode element DEG1, DEG2. - * - * @param twotoOne boolean to determine direction - */ - private void buildDegToDeg(boolean twotoOne) { - LOG.info("buildDegToDeg ..."); - NodePath deg1 = null; - NodePath deg2 = null; - for (NodePath node : this.nodepaths) { - //LOG.info(node.toString()); - String nodeId = node.getNodeId(); - if (nodeId.contains("DEG1")) { - deg1 = node; - } - if (nodeId.contains("DEG2")) { - deg2 = node; - } - } - if ((deg1 != null) && (deg2 != null)) { - List result = new ArrayList(); - NodePath deb = deg1; - NodePath end = deg2; - if (twotoOne) { - deb = deg2; - end = deg1; - } - for (Path deg1Path : deb.getPath()) { - TpNodeTp tmpdeg = deg1Path.getTpNodeTp(); - if (tmpdeg.getTpIn().getTerminationPointIdentifier().getTpId().contains("TTP")) { - result.clear(); - result.addAll(Lists.newArrayList(deg1Path)); - if (!twotoOne) { - getAToZDirection(result); - } else { - getZToADirection(result); - } - } - } - for (Path deg2Path : end.getPath()) { - TpNodeTp tmpdeg = deg2Path.getTpNodeTp(); - if (tmpdeg.getTpIn().getTerminationPointIdentifier().getTpId().contains("CTP")) { - result.clear(); - result.addAll(Lists.newArrayList(deg2Path)); - if (!twotoOne) { - getAToZDirection(result); - } else { - getZToADirection(result); - } - } - } - } else { - LOG.info("deg1 or/and deg2 is null !"); - } - } - - /** - build direction from - *Degree to SRG to XPDR - *in Supernode elements. - * - *@param xpdr NodePath XPDR - *@param srg NodePath SRG - *@param deg NodePath Degree - *@param reverse boolean to determine the direction - */ - private void buildDeg(NodePath xpdr,NodePath srg,NodePath deg, Boolean reverse) { - List result = new ArrayList(); - for (Path degPath : deg.getPath()) { - TpNodeTp tmpdeg = degPath.getTpNodeTp(); - if (tmpdeg.getTpIn().getTerminationPointIdentifier().getTpId().contains("TTP")) { - for (Path srgPath : srg.getPath()) { - TpNodeTp tmpsrg = srgPath.getTpNodeTp(); - if (tmpsrg.getTpIn().getTerminationPointIdentifier().getTpId().contains("CP")) { - for (Path xpdrPath : xpdr.getPath()) { - TpNodeTp tmpxpdr = xpdrPath.getTpNodeTp(); - if (tmpxpdr.getTpIn().getTerminationPointIdentifier().getTpId().contains("NETWORK")) { - result.clear(); - result.addAll(Lists.newArrayList(degPath,srgPath,xpdrPath)); - if (reverse) { - getAToZDirection(result); - } else { - getZToADirection(result); - } - } - } - } - } - } - } - } - - /** - *build direction from - *DEG1 / DEG2 to SRG to XPDR - *in Supernode elements. - * - *@param xpdr NodePath XPDR - *@param srg NodePath SRG - *@param deg1 NodePath Degree 1 - *@param deg2 NodePath Degree 2 - *@param reverse boolean to determine the direction - */ - private void buildDegToSrgToXpdr(NodePath xpdr,NodePath srg,NodePath deg1,NodePath deg2,boolean reverse) { - LOG.info("buildDegToSrgToXpr ..."); - if ((xpdr != null) && (srg != null) && (deg1 != null) && (deg2 != null)) { - buildDeg(xpdr, srg, deg1, reverse); - buildDeg(xpdr, srg, deg2, reverse); - } else { - LOG.info("xpdr, deg or/and srg is null !"); - } - } - - /** - *build direction from - *XPDR to SRG to DEG - *in Supernode elements. - * - *@param xpdr NodePath XPDR - *@param srg NodePath SRG - *@param deg1 NodePath Degree 1 - *@param deg2 NodePath Degree 2 - *@param reverse boolean to determine the direction - */ - private void buildXpdrToSrgToDeg(NodePath xpdr,NodePath srg,NodePath deg1,NodePath deg2,boolean reverse) { - LOG.info("buildXpdrToSrgToDeg ..."); - if ((xpdr != null) && (srg != null) && (deg1 != null) && (deg2 != null)) { - List result = new ArrayList(); - for (Path xpdrPath : xpdr.getPath()) { - TpNodeTp tmpxpdr = xpdrPath.getTpNodeTp(); - if (tmpxpdr.getTpIn().getTerminationPointIdentifier().getTpId().contains("CLIENT")) { - for (Path srgPath : srg.getPath()) { - TpNodeTp tmp = srgPath.getTpNodeTp(); - Link srglink = srgPath.getLink(); - if (tmp.getTpIn().getTerminationPointIdentifier().getTpId().contains("PP")) { - for (Path deg1Path : deg1.getPath()) { - TpNodeTp tmpdeg = deg1Path.getTpNodeTp(); - if (tmpdeg.getTpIn().getTerminationPointIdentifier().getTpId().contains("CTP") - && srglink.getLinkIdentifier().getLinkId().contains("DEG1")) { - result.clear(); - result.addAll(Lists.newArrayList(xpdrPath,srgPath,deg1Path)); - if (reverse) { - getZToADirection(result); - } else { - getAToZDirection(result); - } - } - } - for (Path deg2Path : deg2.getPath()) { - TpNodeTp tmpdeg = deg2Path.getTpNodeTp(); - if (tmpdeg.getTpIn().getTerminationPointIdentifier().getTpId().contains("CTP") - && srglink.getLinkIdentifier().getLinkId().contains("DEG2")) { - result.clear(); - result.addAll(Lists.newArrayList(xpdrPath,srgPath,deg2Path)); - if (reverse) { - getZToADirection(result); - } else { - getAToZDirection(result); - } - } - } - } - } - } - } - } else { - LOG.info("xpdr, deg or/and srg is null !"); - } - } - - /** - * get all AToZdirection containing - * a list of AToZ end by - * a String. - * - * @param endBy String - * @param atozDirection AToZdirection List - * @param index Integer to determine if it for last Link(1) or last TerminationPoint(2) - * @return AToZDirection List - */ - public List getAToZDirectionEndBy(String endBy, List atozDirection, int index) { - List result = new ArrayList(); - for (AToZDirection tmp : atozDirection) { - List atozList = tmp.getAToZ(); - int size = atozList.size(); - if (size > 2) { - String id = Integer.toString(size - index); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = null; - for (AToZ tmpAtoz : atozList) { - if (tmpAtoz.getId().compareTo(id) == 0) { - res = tmpAtoz.getResource().getResource(); - if (res != null) { - - switch (index) { - case 1: //last link - if (res instanceof Link) { - Link tp = (Link) res; - if ((tp != null) && tp.getLinkIdentifier().getLinkId().contains(endBy)) { - result.add(tmp); - } - } - break; - - case 2: //last tp - if (res instanceof TerminationPoint) { - TerminationPoint tp = (TerminationPoint) res; - if ((tp != null) && tp.getTerminationPointIdentifier().getTpId() - .contains(endBy)) { - result.add(tmp); - } - } - break; - - default : - break; - } - } - } - } - } else { - LOG.info("firstnodeTpId is null !"); - } - } - LOG.info("getAToZDirectionEndBy result size : {}\n{}", result.size(),result.toString()); - return result; - } - - /** - * replace or remove in - * Link in AToZ list - * containing in AToZdirection. - * - * @param endBy String - * @param beginBy String - * @param atozLink name of ROAMDTOROAMD link - * @param atozDirection AToZdirection List - * @param remove boolean to determine if removing or not - * @return AToZDirection List - */ - public List replaceOrRemoveAToZDirectionEndLink(String endBy,String beginBy,String atozLink, - List atozDirection, boolean remove) { - List result = new ArrayList(); - List tmp = new ArrayList(); - if (remove) { - tmp = getAToZDirectionEndBy(endBy, atozDirection, 1); - if (!tmp.isEmpty()) { - tmp = getAToZDirectionBeginBy(beginBy, tmp); - } - } else { - tmp = getAToZDirectionEndBy(endBy, atozDirection,2); - } - if (!tmp.isEmpty()) { - for (AToZDirection atozdir : tmp) { - List atozList = atozdir.getAToZ(); - int size = atozList.size(); - if (size > 0) { - String id = Integer.toString(size - 1); - for (ListIterator it = atozList.listIterator(); it.hasNext();) { - AToZ tmpAtoz = it.next(); - if (tmpAtoz.getId().compareTo(id) == 0) { - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = tmpAtoz.getResource().getResource(); - if ((res != null) && (res instanceof Link)) { - Link link = new LinkBuilder() - .setLinkIdentifier(new LinkIdentifierBuilder() - .setLinkId(atozLink) - .build()) - .build(); - AToZKey atozKey = new AToZKey(tmpAtoz.key()); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface - .pathdescription.rev170426.pce.resource.Resource resource = new ResourceBuilder() - .setResource(link).build(); - AToZ hop = new AToZBuilder().setId(atozKey.getId()).withKey(atozKey) - .setResource(resource).build(); - it.remove(); - if (!remove) { - it.add(hop); - } - result.add(atozdir); - } - } - } - } - } - } else { - LOG.info("getAToZDirectionEndBy size : {}", tmp.size()); - } - return result; - } - - /** - *get all AToZdirection containing - * a list of AToZ begin by - * a String. - * - * @param beginBy String - * @param atozDirection AToZdirection List - * @return AToZDirection List - */ - public List getAToZDirectionBeginBy(String beginBy, List atozDirection) { - List result = new ArrayList(); - for (AToZDirection tmp : atozDirection) { - List atozList = tmp.getAToZ(); - int size = atozList.size(); - if (size > 0) { - String id = Integer.toString(0); - for (AToZ tmpAtoz : atozList) { - if (tmpAtoz.getId().compareTo(id) == 0) { - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = tmpAtoz.getResource().getResource(); - if ((res != null) && (res instanceof TerminationPoint)) { - TerminationPoint tp = (TerminationPoint) res; - if ((tp != null) && tp.getTerminationPointIdentifier().getTpId().contains(beginBy)) { - LOG.info("tmp : {}", tmp.toString()); - result.add(tmp); - } - } - } - } - } - } - LOG.info("result size : {}", result.size()); - return result; - } - - /** - * first launch process to - * build/fill NodePath - * And after that, start building - * direction between Supernode - * elements. - * - * @param zend path zend Supernode nodeId - */ - public void buildPath(String zend) { - if (this.superNode != null) { - for (org.opendaylight.transportpce.stubpce.topology.Resource res : this.superNode.getResources()) { - NodePath path = new NodePath(res, this.superNode.getSuperNodeId(), this.superNode.isXpdrSrgAbsent()); - path.fill(); - this.nodepaths.add(path); - } - LOG.info("nodepaths size : {}", this.nodepaths.size()); - build(this.superNode.isXpdrSrgAbsent(),this.superNode.getSuperNodeId(), zend); - } - } - - public static void main(String[] args) { - Topology topo = new Topology(); - topo.start(); - Network net = topo.getNetwork(); - if (net != null) { - SuperNode res = net.getSuperNodes().get(0); - String zend = "NodeZ"; - LOG.info(res.getSuperNodeId().toString()); - InterNodePath path = new InterNodePath(res); - path.buildPath(zend); - } - } - - public SuperNode getSuperNode() { - return this.superNode; - } - - public void setSuperNode(SuperNode superNode) { - this.superNode = superNode; - } - - public List getAtoz() { - return this.atoz; - } - - public void setAtoz(List atoz) { - this.atoz = atoz; - } - - public List getZtoa() { - return this.ztoa; - } - - public void setZtoa(List ztoa) { - this.ztoa = ztoa; - } - - public List getNodepaths() { - return this.nodepaths; - } - - public void setNodepaths(List nodepaths) { - this.nodepaths = nodepaths; - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/LogicalConnectionPoint.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/LogicalConnectionPoint.java deleted file mode 100644 index 45da247f1..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/LogicalConnectionPoint.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - - -/** - * class to build Logical - * Connection Point. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -@JacksonXmlRootElement(localName = "logical-connection-point") -public class LogicalConnectionPoint { - @JacksonXmlProperty(localName = "tp-id") - private String tpId; - @JacksonXmlProperty(localName = "node-id") - private String nodeId; - - public LogicalConnectionPoint(@JacksonXmlProperty(localName = "tp-id") final String tpId, - @JacksonXmlProperty(localName = "node-id") final String nodeId) { - this.setTpId(tpId); - this.setNodeId(nodeId); - } - - public String getTpId() { - return tpId; - } - - public void setTpId(String tpId) { - this.tpId = tpId; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - @Override - public String toString() { - java.lang.String name = "["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (tpId != null) { - builder.append("tpId="); - builder.append(tpId); - builder.append(", "); - } - if (nodeId != null) { - builder.append("nodeId="); - builder.append(nodeId); - } - return builder.append(']').toString(); - - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Network.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Network.java deleted file mode 100644 index 1849cba84..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Network.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - -import java.util.List; - -/** - * Class to create topology - * structure according to the idea of - * SuperNode. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -@JacksonXmlRootElement(localName = "network") -public class Network { - /** SuperNode List.*/ - @JacksonXmlElementWrapper(localName = "super-nodes") - @JacksonXmlProperty(localName = "super-node") - private List superNodes; - /** Links between Supernodes. */ - @JacksonXmlProperty(localName = "roadm-to-roadm") - private RoadmToRoadm roadmToroadm; - - /** - * Network constructor. - * - * @param nodes Supernode list - * @param links roadmtoroadm links - */ - public Network( - @JacksonXmlProperty(localName = "Nsupernode") final List nodes, - @JacksonXmlProperty(localName = "roadm-to-roadm") final RoadmToRoadm links) { - setSuperNodes(nodes); - setRoadmToroadm(links); - } - - public List getSuperNodes() { - return superNodes; - } - - public void setSuperNodes(List superNodes) { - this.superNodes = superNodes; - } - - - public RoadmToRoadm getRoadmToroadm() { - return roadmToroadm; - } - - public void setRoadmToroadm(RoadmToRoadm roadmToroadm) { - this.roadmToroadm = roadmToroadm; - } - - @Override - public String toString() { - int index; - int size; - java.lang.String name = "Network ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - index = 0; - size = superNodes.size(); - builder.append("SuperNodes ["); - if (size > 0) { - for (SuperNode tmp : superNodes) { - builder.append(tmp.toString()); - index++; - if (index < size) { - builder.append(", "); - } - } - } - builder.append("]"); - if (roadmToroadm != null) { - builder.append(", roadmToroadm="); - builder.append(roadmToroadm.toString()); - } - return builder.append(']').toString(); - - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodeLinkNode.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodeLinkNode.java deleted file mode 100644 index 07faa034d..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodeLinkNode.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import java.util.List; - -/** - * Class to create structure - * NodeToLinkToNode. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class NodeLinkNode { - /** aend first endpoint. */ - private String aend; - /** zend second endpoint. */ - private String zend; - /** atoz link. */ - private List atozLink; - /** ztoa link. */ - private List ztoaLink; - /** direct boolean to specify direct path. */ - private Boolean direct; - - /** - * NodeLinkNode Constructor. - * - * @param aend first endpoint - * @param zend second endpoint - * @param link1 atoz link - * @param link2 ztoa link - * @param direct boolean to specify direct path - */ - public NodeLinkNode(String aend, String zend, List link1, List link2,Boolean direct) { - setAend(aend); - setZend(zend); - setAtozLink(link1); - setZtoaLink(link2); - setDirect(direct); - } - - public Boolean getDirect() { - return direct; - } - - public void setDirect(Boolean direct) { - this.direct = direct; - } - - public String getAend() { - return aend; - } - - public void setAend(String aend) { - this.aend = aend; - } - - public String getZend() { - return zend; - } - - public void setZend(String zend) { - this.zend = zend; - } - - @Override - public String toString() { - java.lang.String name = "NodeLinkNode ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (aend != null) { - builder.append("aend="); - builder.append(aend); - builder.append(", "); - } - if (atozLink != null) { - builder.append("atozLink="); - builder.append(atozLink); - builder.append(", "); - } - if (ztoaLink != null) { - builder.append("ztoaLink="); - builder.append(ztoaLink); - builder.append(", "); - } - if (zend != null) { - builder.append("zend="); - builder.append(zend); - builder.append(", "); - } - builder.append(", direct="); - builder.append(direct); - return builder.append(']').toString(); - } - - public List getAtozLink() { - return atozLink; - } - - public void setAtozLink(List atozLink) { - this.atozLink = atozLink; - } - - public List getZtoaLink() { - return ztoaLink; - } - - public void setZtoaLink(List ztoaLink) { - this.ztoaLink = ztoaLink; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java deleted file mode 100644 index 61ea66886..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/NodePath.java +++ /dev/null @@ -1,376 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.opendaylight.transportpce.stubpce.TpNodeTp; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.LinkBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Node; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.NodeBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPoint; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.TerminationPointBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.link.LinkIdentifierBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.node.NodeIdentifierBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.termination.point.TerminationPointIdentifierBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * build all path with one resource - * from Supernode. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class NodePath { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(NodePath.class); - /** element of Supernode. */ - private org.opendaylight.transportpce.stubpce.topology.Resource resource; - /** TpNodeTp list. */ - private List tpNodeTps; - /** Link list. */ - private List links; - /** SuperNode element nodeId. */ - private String nodeId; - /** Supernode Id. */ - private String superNodeId; - /** boolean to determine if Supernode contains an XPDR. */ - private boolean isXpdrSrgAbsent; - /** Path List. */ - private List path; - - /** - *NodePath constructor. - * - * @param res element of Supernode - * @param superNodeId supernode Id - * @param isXpdrSrgAbsent boolean to determine if Supernode contains an XPDR - */ - public NodePath(org.opendaylight.transportpce.stubpce.topology.Resource res, - String superNodeId, boolean isXpdrSrgAbsent) { - setResource(res); - setNodeId(res.getNodeId()); - setSuperNodeId(superNodeId); - setXpdrSrgAbsent(isXpdrSrgAbsent); - setLinks(new ArrayList()); - setTpNodeTps(new ArrayList()); - setPath(new ArrayList()); - } - - @Override - public String toString() { - java.lang.String name = "NodePath ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (nodeId != null) { - builder.append("nodeId= "); - builder.append(nodeId); - builder.append(", "); - } - if (path.size() > 0) { - builder.append("Paths ["); - builder.append(path.toString()); - builder.append(" ]"); - } - return builder.append(']').toString(); - } - - /** - *get all resources (links, - *logicalConnectionpoints, nodeId) - *from Supernode element. - */ - public void fill() { - Boolean xpdr = false; - if (resource != null) { - String nodeid = resource.getNodeId(); - List resLinks = resource.getLinks(); - List resLcps = resource.getLcps(); - for (String tmp : resLinks) { - Link link = new LinkBuilder() - .setLinkIdentifier(new LinkIdentifierBuilder() - .setLinkId(tmp) - .build()) - .build(); - links.add(link); - } - if (nodeid.contains("XPDR")) { - LOG.info("building xpdr resource ..."); - xpdr = true; - buildXpdrTopo(nodeid,resLinks,resLcps,xpdr); - links.add(new LinkBuilder() - .setLinkIdentifier(new LinkIdentifierBuilder() - .setLinkId("TAIL-LINKS") - .build()) - .build()); - } - if (nodeid.contains("SRG")) { - LOG.info("building SRG resource ..."); - buildSRGTopo(nodeid, resLinks, resLcps); - } - if (nodeid.contains("DEG")) { - LOG.info("building DEG resource ..."); - xpdr = false; - buildXpdrTopo(nodeid,resLinks,resLcps,xpdr); - links.add(new LinkBuilder() - .setLinkIdentifier(new LinkIdentifierBuilder() - .setLinkId("EXTERNAL-LINKS") - .build()) - .build()); - } - } - createDirection(); - } - - /** - * reverse a TpNodeTp - * List. - * - * @return TpNodeTp list - */ - private List reverseTpNodetpList() { - List result = new ArrayList(); - for (TpNodeTp tpNodetp : tpNodeTps) { - TpNodeTp tmp = tpNodetp.reverse(); - result.add(tmp); - } - return result; - } - - /** - *create list of Path - *(TpNodeTp/Link). - */ - private void createDirection() { - /** create direction */ - LOG.info("creating direction ..."); - Path resourcePath = null; - List direction = new ArrayList(); - for (Link link : links) { - String linkId = link.getLinkIdentifier().getLinkId(); - LOG.info("LinkId : {}", linkId); - if (!isXpdrSrgAbsent) { - if (StringUtils.countMatches(link.getLinkIdentifier().getLinkId(), "ROADM") < 2) { - if ((linkId.contains("XPDR") && linkId.startsWith("ROADM")) - || ((linkId.startsWith("DEG") && linkId.contains("SRG"))) - || (nodeId.contains("XPDR") && linkId.contains("TAIL-LINKS"))) { - LOG.info("reversing TpNodetp list for link '{}'", linkId); - direction = reverseTpNodetpList(); - } else { - direction = tpNodeTps; - } - } else { - LOG.info("link is deg to deg link !"); - } - } else { - if (StringUtils.countMatches(link.getLinkIdentifier().getLinkId(), "ROADM") == 2) { - direction = reverseTpNodetpList(); - } else { - direction = tpNodeTps; - } - } - if (tpNodeTps.size() > 0) { - for (TpNodeTp tpNodeTp : direction) { - resourcePath = new Path(tpNodeTp, link); - LOG.info(resourcePath.toString()); - path.add(resourcePath); - } - } else { - LOG.info("tpNodeTps is empty !"); - } - } - } - - /** - * build a list of - * Termination Point in - * XPDR or DEG - * ordered in AToZdirection - * on a Supernode (XPDR to SRG) - * (ROADMA-DEG to ROADMZ-DEG). - * - * @param xpdr determine if it is an XPDR or not - * @param resLcps list of LogicalConnectionPoint - * @return String list of TerminationPoints - */ - private List getOrderedTps(boolean xpdr, List resLcps) { - List result = new ArrayList(); - if (xpdr) { - for (LogicalConnectionPoint lcp : resLcps) { - String tmp = lcp.getTpId(); - if (tmp.contains("CLIENT")) { - result.add(0, tmp); - } else if (tmp.contains("NETWORK")) { - result.add(1, tmp); - } - } - } else { - for (LogicalConnectionPoint lcp : resLcps) { - String tmp = lcp.getTpId(); - if (tmp.contains("CTP")) { - result.add(0, tmp); - } else if (tmp.contains("TTP")) { - result.add(1, tmp); - } - } - } - return result; - } - - /** - * build TpNodeTp - * structure in an - * XPDR. - * - * @param nodeid XPDR Id - * @param resLinks list of links - * @param resLcps list of LogicalConnectionPoints - * @param xpdr determine if it is an XPDR or not - */ - private void buildXpdrTopo(String nodeid, List resLinks, List resLcps, - boolean xpdr) { - /** build TpNodetp .*/ - TerminationPointBuilder in = null; - TerminationPointBuilder out = null; - List lcps = getOrderedTps(xpdr,resLcps); - if (lcps.size() == 2) { - in = new TerminationPointBuilder() - .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder() - .setNodeId(nodeid) - .setTpId(lcps.get(0)) - .build()); - out = new TerminationPointBuilder() - .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder() - .setNodeId(nodeid) - .setTpId(lcps.get(1)) - .build()); - } else { - LOG.info("lcps size not equal to 2"); - - } - Node node = new NodeBuilder() - .setNodeIdentifier(new NodeIdentifierBuilder() - .setNodeId(nodeid) - .build()) - .build(); - TpNodeTp tmp = new TpNodeTp(in.build(), out.build(), node); - tpNodeTps.add(tmp); - } - - /** - * build TpNodeTp - * structure in an - * SGR. - * - * @param nodeid SRG nodeId - * @param resLinks list of links - * @param resLcps list of LogicalConnectionPoints - */ - private void buildSRGTopo(String nodeid, List resLinks,List resLcps) { - /** build TpNodetp .*/ - Node node = new NodeBuilder() - .setNodeIdentifier(new NodeIdentifierBuilder() - .setNodeId(nodeid) - .build()) - .build(); - TerminationPoint out = new TerminationPointBuilder() - .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder() - .setNodeId(nodeid) - .setTpId("SRG1-CP-TXRX") - .build()) - .build(); - for (LogicalConnectionPoint lcp : resLcps) { - if (lcp.getTpId().compareTo("SRG1-CP-TXRX") != 0) { - TerminationPoint in = new TerminationPointBuilder() - .setTerminationPointIdentifier(new TerminationPointIdentifierBuilder() - .setNodeId(nodeid) - .setTpId(lcp.getTpId()) - .build()) - .build(); - tpNodeTps.add(new TpNodeTp(in, out, node)); - } - } - } - - public static void main(String[] args) { - Topology topo = new Topology(); - topo.start(); - Network net = topo.getNetwork(); - if (net != null) { - SuperNode superNode = net.getSuperNodes().get(0); - LOG.info("SuperNode : {}", superNode.getSuperNodeId()); - for (org.opendaylight.transportpce.stubpce.topology.Resource res : - superNode.getResources()) { - LOG.info(res.toString()); - NodePath path = new NodePath(res, superNode.getSuperNodeId(), superNode.isXpdrSrgAbsent()); - path.fill(); - } - } - } - - public org.opendaylight.transportpce.stubpce.topology.Resource getResource() { - return resource; - } - - public void setResource(org.opendaylight.transportpce.stubpce.topology.Resource resource) { - this.resource = resource; - } - - public List getTpNodeTps() { - return tpNodeTps; - } - - public void setTpNodeTps(List tpNodeTps) { - this.tpNodeTps = tpNodeTps; - } - - public List getLinks() { - return links; - } - - public void setLinks(List links) { - this.links = links; - } - - public List getPath() { - return path; - } - - public void setPath(List path) { - this.path = path; - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public String getSuperNodeId() { - return superNodeId; - } - - public void setSuperNodeId(String superNodeId) { - this.superNodeId = superNodeId; - } - - public boolean isXpdrSrgAbsent() { - return isXpdrSrgAbsent; - } - - public void setXpdrSrgAbsent(boolean xpdrSrgAbsent) { - this.isXpdrSrgAbsent = xpdrSrgAbsent; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Path.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Path.java deleted file mode 100644 index 6de05e91f..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Path.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import org.opendaylight.transportpce.stubpce.TpNodeTp; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; - -/** - * Class to create structure - * TpNodeTp and link. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class Path { - /** TpNodeTp. */ - private TpNodeTp tpNodeTp; - /** Link at TpNodeTp. */ - private Link link; - - /** - *Path constructor. - * - * @param tpnodetp TpNodeTp - * @param link link at the end of TpNodeTp - */ - public Path(TpNodeTp tpnodetp, Link link) { - setTpNodeTp(tpnodetp); - setLink(link); - } - - public Path(TpNodeTp tpNodeTp) { - setTpNodeTp(tpNodeTp); - } - - public TpNodeTp getTpNodeTp() { - return tpNodeTp; - } - - public void setTpNodeTp(TpNodeTp tpNodeTp) { - this.tpNodeTp = tpNodeTp; - } - - public Link getLink() { - return link; - } - - public void setLink(Link link) { - this.link = link; - } - - @Override - public String toString() { - java.lang.String name = "Path ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (tpNodeTp != null) { - builder.append("tpNodeTp= "); - builder.append(tpNodeTp); - builder.append(", "); - } - if (link != null) { - builder.append(link); - } - return builder.append(']').toString(); - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/PathDescriptionsOrdered.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/PathDescriptionsOrdered.java deleted file mode 100644 index cb8c15ff1..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/PathDescriptionsOrdered.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptions; - -/** - * class to create structure - * of PathDescriptions - * ordered. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class PathDescriptionsOrdered implements Comparable { - private PathDescriptions pathDescriptions; - private int ord; - - /** - * PathDescriptionsOrdered constructor. - * - * @param paths PathDescriptions - * @param order Integer - */ - public PathDescriptionsOrdered(PathDescriptions paths, int order) { - setPathDescriptions(paths); - setOrd(order); - } - - @Override - public int compareTo(PathDescriptionsOrdered paths) { - return this.ord - paths.getOrd(); - } - - public PathDescriptions getPathDescriptions() { - return pathDescriptions; - } - - public void setPathDescriptions(PathDescriptions pathDescriptions) { - this.pathDescriptions = pathDescriptions; - } - - public int getOrd() { - return ord; - } - - public void setOrd(int ord) { - this.ord = ord; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java deleted file mode 100644 index 47d2dff9d..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Resource.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; -import java.util.List; - - -/** - * Class to create structure of - * Supernode element. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -@JacksonXmlRootElement(localName = "resource") -public class Resource { - /** element nodeId. */ - @JacksonXmlProperty(localName = "node-id") - private String nodeId; - /** list of element links. */ - @JacksonXmlElementWrapper(localName = "links") - @JacksonXmlProperty(localName = "link") - private List links; - /** list of element LogicalConnectionPoint. */ - @JacksonXmlElementWrapper(localName = "logical-connection-points") - @JacksonXmlProperty(localName = "logical-connection-point") - private List lcps; - - - /** - * Resource constructor. - * - * @param nodeId element nodeId - * @param links list of element links - * @param lcps list of element LogicalConnectionPoint - */ - public Resource(@JacksonXmlProperty(localName = "node-id") final String nodeId, - @JacksonXmlProperty(localName = "Reslinks") final List links, - @JacksonXmlProperty(localName = "Reslcps") final List lcps) { - this.setNodeId(nodeId); - this.setLinks(links); - this.setLpcs(lcps); - } - - public String getNodeId() { - return nodeId; - } - - public void setNodeId(String nodeId) { - this.nodeId = nodeId; - } - - public List getLinks() { - return links; - } - - public void setLinks(List links) { - this.links = links; - } - - public List getLcps() { - return lcps; - } - - public void setLpcs(List logicalConPoints) { - this.lcps = logicalConPoints; - } - - @Override - public String toString() { - int index; - int size; - java.lang.String name = "Resource ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (nodeId != null) { - builder.append("nodeId="); - builder.append(nodeId); - } - index = 0; - size = lcps.size(); - builder.append(", LogicalConnectionPoints ["); - for (LogicalConnectionPoint tmp : lcps) { - builder.append(tmp.toString()); - index++; - if (index < size) { - builder.append(", "); - } - } - builder.append("]"); - index = 0; - size = links.size(); - builder.append(", links ["); - for (String tmp : links) { - builder.append(tmp); - index++; - if (index < size) { - builder.append(", "); - } - } - builder.append("]"); - return builder.append(']').toString(); - - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/RoadmToRoadm.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/RoadmToRoadm.java deleted file mode 100644 index 2699d339b..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/RoadmToRoadm.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - -import java.util.List; - - -/** - * Class to create list of links - * between Supernode. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -@JacksonXmlRootElement(localName = "roadm-to-roadm") -public class RoadmToRoadm { - /** List of links. */ - @JacksonXmlElementWrapper(localName = "links") - @JacksonXmlProperty(localName = "link") - private List links; - - /** - * RoadmToRoadm structure. - * - * @param links list of links - */ - public RoadmToRoadm(@JacksonXmlProperty(localName = "Rlinks") final List links) { - setLinks(links); - } - - public List getLinks() { - return links; - } - - public void setLinks(List links) { - this.links = links; - } - - @Override - public String toString() { - int index; - int size; - java.lang.String name = "RoadmToRoadm ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - index = 0; - size = links.size(); - builder.append("Links ["); - for (String tmp : links) { - builder.append(tmp.toString()); - index++; - if (index < size) { - builder.append(", "); - } - } - builder.append("]"); - return builder.append(']').toString(); - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNode.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNode.java deleted file mode 100644 index fcf825ab5..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNode.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; - -import java.util.ArrayList; -import java.util.List; - - -/** - * class to create Supernode - * structure. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -@JacksonXmlRootElement(localName = "super-node") -public class SuperNode { - /** Supernode Id. */ - @JacksonXmlProperty(localName = "super-node-id") - private String superNodeId; - /** list of elements cotaining in Supernode. */ - @JacksonXmlElementWrapper(localName = "resources") - @JacksonXmlProperty(localName = "resource") - private List resources; - - /** - * SuperNode constructor. - * - * @param supernodeid superNode Id - * @param resources List of Supernode elements - */ - public SuperNode(@JacksonXmlProperty(localName = "super-node-id") final String supernodeid, - @JacksonXmlProperty(localName = "Spresource") final List resources) { - setSuperNodeId(supernodeid); - setResources(resources); - } - - /** - * SuperNode constructor. - * - * @param supernodeid supernode Id - */ - public SuperNode(String supernodeid) { - setSuperNodeId(supernodeid); - setResources(new ArrayList()); - } - - /** - *Test if Supernode contains - *an XPDR. - * @return true if XPDR present, false else - */ - public boolean isXpdrSrgAbsent() { - boolean result = true; - int present = 0; - if (resources.size() > 0) { - for (Resource resource : resources) { - String nodeId = resource.getNodeId(); - if (nodeId != null) { - if (nodeId.contains("XPDR")) { - present++; - } - if (nodeId.contains("SRG")) { - present++; - } - } - } - } - if (present == 2) { - result = false; - } - return result; - } - - public List getResources() { - return resources; - } - - public void setResources(List resources) { - this.resources = resources; - } - - public String getSuperNodeId() { - return superNodeId; - } - - public void setSuperNodeId(String superNodeId) { - this.superNodeId = superNodeId; - } - - @Override - public String toString() { - int index; - int size; - java.lang.String name = "SuperNode ["; - java.lang.StringBuilder builder = new java.lang.StringBuilder(name); - if (superNodeId != null) { - builder.append("superNodeId="); - builder.append(superNodeId); - } - index = 0; - size = resources.size(); - builder.append(", Resources ["); - for (Resource tmp : resources) { - builder.append(tmp.toString()); - index++; - if (index < size) { - builder.append(", "); - } - } - builder.append("]"); - return builder.append(']').toString(); - } - -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java deleted file mode 100644 index e96eb5c45..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/SuperNodePath.java +++ /dev/null @@ -1,733 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.google.common.collect.Lists; -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; -import java.util.SortedSet; -import java.util.TreeSet; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubpce.rev170426.path.description.list.PathDescriptionsBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.AToZDirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ZToADirection; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ZToADirectionBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZ; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.atoz.direction.AToZKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToA; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToABuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.path.description.ztoa.direction.ZToAKey; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.Resource; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.ResourceBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.Link; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.LinkBuilder; -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev170426.pce.resource.resource.resource.link.LinkIdentifierBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * Class to build Path between - * two Supernode. - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class SuperNodePath { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(SuperNodePath.class); - /** List of NodeLinkNode. */ - private List paths; - /** Supernode topology. */ - private Network network; - - /** - * SuperNodePath constructor. - * - * @param network Supernode topology - */ - public SuperNodePath(Network network) { - setPaths(new ArrayList()); - this.network = network; - } - - /** - * test if Supernode is an - * extremity of path to build. - * - * @param end extremity node Id - * @param supernodes Supernodes list to build path - * @return true if link extremity, false else - */ - private Boolean endNode(String end, List supernodes) { - Boolean result = false; - if ((end != null) && (end.compareTo(" ") != 0)) { - for (String node : supernodes) { - if (node.compareTo(end) == 0) { - result = true; - break; - } - } - } - return result; - } - - /** - * get Supernode - * with supernode Id. - * - * @param nodeId supernode id to get - * @return SuperNode supernode gets - */ - public SuperNode getSuperNode(String nodeId) { - SuperNode result = null; - if (this.network != null) { - for (SuperNode tmp : this.network.getSuperNodes()) { - if (tmp.getSuperNodeId().compareTo(nodeId) == 0) { - result = tmp; - break; - } - } - } - return result; - } - - /** - *find links between - *two Supernodes. - * - * @param aend begin extremity - * @param zend end extremity - * @param links Roadm to Roadm links - * @param direct determine if link is direct or not - * @return String list of links name - */ - private List findLinks(String aend, String zend, List links, boolean direct) { - List result = new ArrayList(); - if (links.size() > 0) { - aend = aend.replace("Node", "ROADM"); - zend = zend.replace("Node", "ROADM"); - String atozlink = null; - String ztoalink = null; - for (String tmp : links) { - if (tmp.contains(aend) - && tmp.contains(zend)) { - LOG.info("direct path found for : {} / {}", aend, zend); - if (tmp.startsWith(aend)) { - atozlink = tmp; - } - if (tmp.startsWith(zend)) { - ztoalink = tmp; - } - if ((atozlink != null) && (ztoalink != null)) { - result.add(atozlink.concat("/").concat(ztoalink)); - atozlink = null; - ztoalink = null; - } - } - } - } else { - LOG.info("no roadm-to-roadm links !"); - } - return result; - } - - /** - *find next Supernode hop. - * - * @param link roadm to roadm link - * @param aend begin supernode - * @param node list of supernode id - * @return String supernodeId next hop - */ - private String findHop(String link, String aend, List node) { - String result = null; - aend = aend.replace("Node", "ROADM"); - for (String tmp : node) { - tmp = tmp.replace("Node", "ROADM"); - if (tmp.compareTo(aend) != 0) { - if (link.contains(aend) && link.contains(tmp)) { - LOG.info("hop : {}", tmp); - result = tmp; - } - } - } - return result; - } - - /** - *get all Supernode in - *topology. - * - * @return String list of Supernode Id - */ - private List getSuperNodeId() { - List result = new ArrayList(); - if (this.network.getSuperNodes().size() > 0) { - for (SuperNode tmp : this.network.getSuperNodes()) { - result.add(tmp.getSuperNodeId()); - } - } - return result; - } - - /** - * get all roadm to roadm - * links in topology. - * - * @return String list of roadm to roadm links - */ - private List getRoadmLinks() { - List result = new ArrayList(); - if (this.network.getRoadmToroadm().getLinks().size() > 0) { - for (String tmp : this.network.getRoadmToroadm().getLinks()) { - result.add(tmp); - } - } - return result; - } - - /** - * create NodeLinkNode - * structure. - * - * @param links String list of roadm to roadm links - * @param aend beginning Supernode - * @param zend ending Supernode - * @param direct determine if link is direct or not - */ - private void fill(List links,String aend, String zend, boolean direct) { - String term = "indirect"; - if (direct) { - term = "direct"; - } - if (!links.isEmpty()) { - List atoz = new ArrayList(); - List ztoa = new ArrayList(); - for (String tmp : links) { - String [] split = tmp.split("/"); - if (split.length == 2) { - atoz.add(split[0]); - ztoa.add(split[1]); - } - } - if (!atoz.isEmpty() && (atoz.size() == ztoa.size())) { - NodeLinkNode node = new NodeLinkNode(aend, zend, atoz,ztoa,direct); - this.paths.add(node); - } - - } else { - LOG.info("{} links not found !", term); - } - } - - /** - * launch SupernodePath process - * to build NodeLinkNode. - * - * @param aend beginning extremity path - * @param zend ending extremity path - */ - public void run(String aend, String zend) { - if (this.network != null) { - List supernodes = getSuperNodeId(); - List roadmLinks = getRoadmLinks(); - if ((aend != null) && (zend != null)) { - int size = supernodes.size(); - String hop = null; - List links = null; - if (size > 0) { - if (endNode(aend, supernodes) && endNode(zend, supernodes)) { - LOG.info("Getting direct links ..."); - links = new ArrayList(); - links = findLinks(aend,zend,roadmLinks,true); - fill(links, aend, zend, true); - LOG.info("Getting indirect links .."); - links = new ArrayList(); - for (String tmp : roadmLinks) { - hop = findHop(tmp, aend, supernodes); - if (hop != null) { - if (hop.compareTo(zend.replace("Node", "ROADM")) != 0) { - LOG.info("next hop found : {}", hop); - links.addAll(findLinks(aend,hop,roadmLinks,false)); - links.addAll(findLinks(hop,zend,roadmLinks,false)); - } else { - break; - } - } - } - fill(links, aend, zend, false); - } else { - LOG.info("aend or/and zend not exists !"); - } - } - } else { - LOG.info("aend or/and is null !"); - } - } else { - LOG.info("network is null !!"); - } - } - - /** - * modify all AToZ Id - * in AToZ List containing - * in AToZdirection. - * - * @param order beginning order - * @param atozDirection AToZdirection List - * @return AToZdirection List - */ - public List modifyOrder(int order, List atozDirection) { - List result = new ArrayList(); - for (AToZDirection tmp : atozDirection) { - List atozList = tmp.getAToZ(); - int size = atozList.size(); - if (size > 0) { - for (ListIterator it = atozList.listIterator(); it.hasNext();) { - AToZ atoz = it.next(); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource res = atoz.getResource().getResource(); - int tmpkey = order + Integer.parseInt(atoz.key().getId()); - AToZKey atozKey = new AToZKey(Integer.toString(tmpkey)); - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface - .pathdescription.rev170426.pce.resource.Resource resource = new ResourceBuilder() - .setResource(res).build(); - AToZ hop = new AToZBuilder().setId(atozKey.getId()).withKey(atozKey).setResource(resource).build(); - it.remove(); - it.add(hop); - tmpkey++; - } - result.add(tmp); - } - } - return result; - } - - /** - * merge two AToZdirection List. - * - * @param cleanInterA first AToZdirection List - * @param cleanInterZ second AToZdirection List - * @param first boolean to determine if it is the first time merge is done - * @return AToZDirection List - */ - public List merge(List cleanInterA, List cleanInterZ, - boolean first) { - List result = new ArrayList(); - if (!cleanInterA.isEmpty()) { - int order = cleanInterA.get(0).getAToZ().size(); - if (order > 0) { - List modify = modifyOrder(order, cleanInterZ); - if (!modify.isEmpty()) { - for (AToZDirection tmp : cleanInterA) { - List atozList = new ArrayList(tmp.getAToZ()); - for (AToZDirection add : modify) { - ListIterator it = atozList.listIterator(); - /** on va a la fin de la liste */ - while (it.hasNext()) { - it.next(); - } - List addList = add.getAToZ(); - for (AToZ atoz : addList) { - it.add(atoz); - } - AToZDirectionBuilder newDirection = new AToZDirectionBuilder(); - newDirection.setRate((long) 100).setAToZWavelengthNumber((long) 200).setAToZ(atozList); - result.add(newDirection.build()); - atozList = new ArrayList(tmp.getAToZ()); - } - } - } else { - LOG.info("modify List is empty ! "); - } - } else { - LOG.info("order is not superior to 0"); - } - } else { - if (first && !cleanInterZ.isEmpty()) { - LOG.info("first merge so result is a copy of second AToZDirection List !"); - result = new ArrayList(cleanInterZ); - } else { - LOG.info("cleanInterA is empty !"); - } - } - return result; - } - - /** - * gets Degree number - * for roadm links. - * - * @param atozLink atoz roadm link - * @param ztoaLink ztoa roadm link - * @return String list of degree - */ - public List getDeg(String atozLink, String ztoaLink) { - List result = new ArrayList(); - if ((atozLink != null) && (ztoaLink != null)) { - String [] split = atozLink.split("-", 4); - if (split.length == 4) { - result = Lists.newArrayList(split[1],split[3]); - } - } else { - LOG.info("atozlink and/or ztoalink is null !"); - } - return result; - } - - /** - * reverse link name - * (ROADMA-DEG1-ROADMZ-DEG2 - * to - * ROADMZ-DEG2-ROADMA-DEG1). - * - * @param linkId Link name - * @return String link name reversed - */ - public String reverseLinkId(String linkId) { - StringBuilder builder = new StringBuilder(); - String [] split = linkId.split("-"); - int size = split.length; - switch (size) { - case 3: - if (linkId.contains("XPDR")) { - if (linkId.startsWith("XPDR")) { - builder.append(split[1]).append("-") - .append(split[2]).append("-") - .append(split[0]); - } else { - builder.append(split[2]).append("-") - .append(split[0]).append("-") - .append(split[1]); - } - } - break; - - case 4: - builder.append(split[2]).append("-") - .append(split[3]).append("-") - .append(split[0]).append("-") - .append(split[1]); - break; - - default: - break; - } - return builder.toString(); - } - - /** - * convert AToAdirection to - * ZToAdirection. - * - * @param atozDirection AToZdirection to convert - * @return ZToAdirection - */ - public ZToADirection convertToZtoaDirection(AToZDirection atozDirection) { - ZToADirectionBuilder ztoaDirection = new ZToADirectionBuilder(); - if (atozDirection != null) { - List atozList = atozDirection.getAToZ(); - List ztoaList = new ArrayList(); - if (!atozList.isEmpty()) { - List reverse = Lists.reverse(atozList); - /** Building path. */ - ZToAKey ztoaKey = null; - Resource resource = null; - org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription - .rev170426.pce.resource.resource.Resource resLink = null; - ZToA hop = null; - int odr = 0; - for (AToZ atoz : reverse) { - ztoaKey = new ZToAKey(Integer.toString(odr)); - resLink = atoz.getResource().getResource(); - if (resLink != null) { - if (resLink instanceof Link) { - Link link = (Link) resLink; - String newLinkId = reverseLinkId(link.getLinkIdentifier().getLinkId()); - if (newLinkId != null) { - resource = new ResourceBuilder().setResource(new LinkBuilder() - .setLinkIdentifier(new LinkIdentifierBuilder() - .setLinkId(newLinkId) - .build()) - .build()) - .build(); - } - - } else { - resource = new ResourceBuilder().setResource(resLink).build(); - } - } - if (resource != null) { - hop = new ZToABuilder() - .withKey(ztoaKey) - .setResource(resource) - .build(); - ztoaList.add(hop); - odr++; - } else { - LOG.info("resource is null "); - } - } - if (!ztoaList.isEmpty()) { - ztoaDirection.setRate((long) 100).setZToAWavelengthNumber((long) 200).setZToA(ztoaList); - } else { - LOG.info("ztoaList is empty !"); - } - } - } - return ztoaDirection.build(); - } - - /** - *build Pathdescritions ordered List - *to be loaded in Pathdescriptions - *datastore. - * - * @param atozDirection AToZdirection List - * @param term direct ou indirect - * @return PathDescriptionsOrdered List - */ - private SortedSet buildPathDescription(List atozDirection, String term) { - SortedSet result = new TreeSet(); - PathDescriptionsBuilder pathDescr = new PathDescriptionsBuilder(); - int size = atozDirection.size(); - if (!atozDirection.isEmpty()) { - LOG.info("result list AToZDirection size : {}", atozDirection.size()); - List ztoadirList = new ArrayList(); - for (AToZDirection atozdir : atozDirection) { - ZToADirection ztodir = convertToZtoaDirection(atozdir); - if (ztodir != null) { - ztoadirList.add(ztodir); - } - } - if (!ztoadirList.isEmpty() && (size == ztoadirList.size())) { - LOG.info("building PathDescriptions ..."); - int index = 1; - String pathName = null; - for (int indexPath = 0 ; indexPath < size ; indexPath++) { - pathName = term.concat(Integer.toString(index)); - LOG.info("pathName : {}", pathName); - pathDescr.setAToZDirection(atozDirection.get(indexPath)) - .setZToADirection(ztoadirList.get(indexPath)).setPathName(pathName); - LOG.info("pathdesciption : {}", pathDescr.build().toString()); - result.add(new PathDescriptionsOrdered(pathDescr.build(),index)); - index++; - } - } else { - LOG.info("Something wrong happen during atodir conversion..."); - } - - } else { - LOG.info("atozDirection is empty"); - } - return result; - } - - /** - * gets link extremity. - * - * @param link link - * @return Supernode List of extremities - */ - public List getSuperNodeEndLink(String link) { - List result = new ArrayList(); - if (link != null) { - String [] split = link.split("-"); - if (split.length == 4) { - String aend = split[0].replaceAll("ROADM", "Node"); - String zend = split[2].replaceAll("ROADM", "Node"); - if ((aend != null) && (zend != null)) { - LOG.info("getting super node for : {} and {}", aend, zend); - SuperNode aendSp = getSuperNode(aend); - SuperNode zendSp = getSuperNode(zend); - if ((aendSp != null) && (zendSp != null)) { - result.add(aendSp); - result.add(zendSp); - } - } - } - } - return result; - } - - /** - * build all direct paths. - * - * @param aend beginning extremity path - * @param zend ending extremity path - * @param nodeLinkNodes list paths - * @return PathDescriptionsOrdered List of direct paths - */ - public SortedSet getDirectPathDesc(String aend, String zend, - List nodeLinkNodes) { - List atozdirectionPaths = new ArrayList(); - SortedSet result = new TreeSet(); - SuperNode aendSp = getSuperNode(aend); - SuperNode zendSp = getSuperNode(zend); - if (!nodeLinkNodes.isEmpty()) { - for (NodeLinkNode tmp : nodeLinkNodes) { - if (tmp.getDirect()) { - LOG.info("Direct NodeLinkNode : {}", tmp.toString()); - String atozLink = null; - String ztoaLink = null; - atozLink = tmp.getAtozLink().get(0); - ztoaLink = tmp.getZtoaLink().get(0); - if ((atozLink != null) && (ztoaLink != null)) { - LOG.info("atozlink : {}", atozLink); - LOG.info("ztoalink : {}", ztoaLink); - InterNodePath interAend = new InterNodePath(aendSp); - interAend.buildPath(zend); - InterNodePath interZend = new InterNodePath(zendSp); - interZend.buildPath(zend); - List deg = getDeg(atozLink,ztoaLink); - LOG.info("deg : {}", deg.toString()); - if (deg.size() == 2) { - List cleanInterA = - interAend.replaceOrRemoveAToZDirectionEndLink(deg.get(0),"",atozLink, - interAend.getAtoz(),false); - List cleanInterZ = - interZend.replaceOrRemoveAToZDirectionEndLink("TAIL-LINKS",deg.get(1),"", - interZend.getAtoz(),true); - if (!cleanInterA.isEmpty() && !cleanInterZ.isEmpty()) { - atozdirectionPaths.addAll(merge(cleanInterA,cleanInterZ,false)); - } else { - LOG.info("cleanInterA ad/or cleanInterZ is empty !"); - } - } else { - LOG.info("deg size is not correct, must be 2 ! "); - } - } else { - LOG.info("atozlink and / or ztoalink is null"); - } - } - } - - } else { - LOG.info("List of direct path is empty !"); - } - if (!atozdirectionPaths.isEmpty()) { - LOG.info("result size : {}", result.size()); - result = buildPathDescription(atozdirectionPaths,aend.concat("To").concat(zend).concat("_direct_")); - } else { - LOG.info("result is empty"); - } - return result; - } - - /** - * build all indirect paths. - * - * @param aend beginning extremity path - * @param zend ending extremity path - * @param nodeLinkNodes list paths - * @return PathDescriptionsOrdered List of indirect paths - */ - public SortedSet getIndirectPathDesc(String aend, String zend, - List nodeLinkNodes) { - List atozdirectionPaths = new ArrayList(); - SortedSet result = new TreeSet(); - SuperNode aendSp = getSuperNode(aend); - SuperNode zendSp = getSuperNode(zend); - if (!nodeLinkNodes.isEmpty()) { - for (NodeLinkNode tmp : nodeLinkNodes) { - if (!tmp.getDirect()) { - LOG.info("Indirect NodeLinkNode : {}", tmp.toString()); - int size = tmp.getAtozLink().size(); - /** must be two for now just one hop. */ - LOG.info("number of links : {}", size); - boolean first = true; - if (size == 2) { - List atozLinks = tmp.getAtozLink(); - List ztoaLinks = tmp.getZtoaLink(); - if (!atozLinks.isEmpty() && !ztoaLinks.isEmpty()) { - LOG.info("atozlink : {}", atozLinks.toString()); - LOG.info("ztoalink : {}", ztoaLinks.toString()); - int loop = 0; - while (loop < 2) { - List hop = getSuperNodeEndLink(atozLinks.get(loop)); - if (!hop.isEmpty() && (hop.size() == 2)) { - aendSp = hop.get(0); - zendSp = hop.get(1); - InterNodePath interAend = new InterNodePath(aendSp); - interAend.buildPath(zend); - LOG.info("interAend : {}", interAend.getAtoz().toString()); - InterNodePath interZend = new InterNodePath(zendSp); - interZend.buildPath(zend); - LOG.info("interZend : {}", interZend.getAtoz().toString()); - List deg1 = getDeg(atozLinks.get(loop),ztoaLinks.get(loop)); - LOG.info("deg1 : {}", deg1.toString()); - if (!deg1.isEmpty() && (deg1.size() == 2)) { - List cleanInterA = null; - List cleanInterZ = null; - if (zendSp.getSuperNodeId().compareTo(zend) == 0) { - cleanInterA = interAend.replaceOrRemoveAToZDirectionEndLink(deg1.get(0), - "",atozLinks.get(loop),interAend.getAtoz(),false); - LOG.info("next hop is zend"); - cleanInterZ = interZend.replaceOrRemoveAToZDirectionEndLink("TAIL-LINKS", - deg1.get(1),"",interZend.getAtoz(),true); - } else if (loop < 1) { - cleanInterA = interAend.replaceOrRemoveAToZDirectionEndLink(deg1.get(0), - "",atozLinks.get(loop),interAend.getAtoz(),false); - cleanInterZ = interZend.getAToZDirectionEndBy(deg1.get(1), - interZend.getAtoz(), 1); - } - if (!cleanInterA.isEmpty() && !cleanInterZ.isEmpty()) { - atozdirectionPaths = merge(atozdirectionPaths,cleanInterA,first); - atozdirectionPaths = merge(atozdirectionPaths, cleanInterZ,false); - first = false; - } else { - LOG.info("cleanInterA ad/or cleanInterZ is empty !"); - break; - } - } - } else { - LOG.info("Hop list is empty"); - } - loop++; - } - } - } else { - LOG.info("Link size is not supported , must be two !"); - } - } - } - } else { - LOG.info("List of indirect path is empty !"); - } - if (!atozdirectionPaths.isEmpty()) { - LOG.info("result size : {}", result.size()); - result = buildPathDescription(atozdirectionPaths,aend.concat("To").concat(zend).concat("_indirect_")); - } else { - LOG.info("result is empty"); - } - return result; - } - - public static void main(String[] args) { - Topology topo = new Topology(); - topo.start(); - SuperNodePath path = new SuperNodePath(topo.getNetwork()); - String aend = "NodeA"; - String zend = "NodeZ"; - path.run(aend, zend); - path.getDirectPathDesc(aend, zend, path.getPaths()); - path.getIndirectPathDesc(aend, zend, path.getPaths()); - } - - public List getPaths() { - return this.paths; - } - - public void setPaths(List paths) { - this.paths = paths; - } -} diff --git a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Topology.java b/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Topology.java deleted file mode 100644 index 92d98c825..000000000 --- a/tests/stubpce/src/main/java/org/opendaylight/transportpce/stubpce/topology/Topology.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubpce.topology; - -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class to build Supernode - * topology (fakepce.xml file has to be - * in src/main/ressources folder - * to be loaded in taget/classes). - * - * - * @author Martial Coulibaly on - * behalf of Orange - */ -public class Topology { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(Topology.class); - /** file must be in src/main/resources in order to be in - * target/classes after compilation. - */ - - /** Structure of Supernode topology. */ - private Network network; - private BundleContext bcontext; - /** String to get Supernode topolgy info freom xml file. */ - private String xml = null; - - /** - * load fakepce.xml file - * and convert the informations - * in Network structure. - * - */ - public void start() { - setNetwork(null); - XmlMapper xmlMapper = new XmlMapper(); - try { - InputStream is = FrameworkUtil.getBundle(Topology.class).getBundleContext() - .getBundle().getEntry("/fakepce.xml").openStream(); - xml = inputStreamToString(is); - if (xml != null) { - setNetwork(xmlMapper.readValue(xml, Network.class)); - LOG.info("Network : {}", network.toString()); - } else { - LOG.info("String xml is null"); - } - } catch (IOException e) { - LOG.error("The file fakepce.xml not found", e); - } - } - - /** - * get xml file - * content. - * - * @param is InputStream - * @return String xml file content - * @throws IOException exception raised - */ - private String inputStreamToString(InputStream is) throws IOException { - StringBuilder sb = new StringBuilder(); - String line; - BufferedReader br = new BufferedReader(new InputStreamReader(is)); - while ((line = br.readLine()) != null) { - sb.append(line); - } - br.close(); - return sb.toString(); - } - - public static void main(String[] args) { - Topology topo = new Topology(); - topo.start(); - } - - public Network getNetwork() { - return network; - } - - public void setNetwork(Network network) { - this.network = network; - } - - public void setBcontext(BundleContext bcontext) { - this.bcontext = bcontext; - } - - public BundleContext getBcontext() { - return this.bcontext; - } -} diff --git a/tests/stubpce/src/main/resources/OSGI-INF/blueprint/Stubpce-blueprint.xml b/tests/stubpce/src/main/resources/OSGI-INF/blueprint/Stubpce-blueprint.xml deleted file mode 100644 index 30a4f3a94..000000000 --- a/tests/stubpce/src/main/resources/OSGI-INF/blueprint/Stubpce-blueprint.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/stubpce/src/main/resources/fakepce.xml b/tests/stubpce/src/main/resources/fakepce.xml deleted file mode 100644 index 2d4433a58..000000000 --- a/tests/stubpce/src/main/resources/fakepce.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - ROADMA-DEG1-ROADMB-DEG1 - ROADMA-DEG2-ROADMZ-DEG2 - ROADMZ-DEG1-ROADMB-DEG1 - ROADMZ-DEG2-ROADMA-DEG2 - ROADMB-DEG1-ROADMA-DEG1 - ROADMB-DEG2-ROADMZ-DEG1 - - - - - NodeA - - - XPDRA - - XPDRA-ROADMA-SRG1 - - - - CLIENT1 - XPDRA - - - NETWORK1 - XPDRA - - - - - ROADMA-SRG1 - - ROADMA-SRG1-XPDRA - SRG1-CP-DEG1-CP - SRG1-CP-DEG2-CP - - - - SRG1-PP1 - ROADMA-SRG1 - - - SRG1-PP2 - ROADMA-SRG1 - - - - - ROADMA-DEG1 - - ROADMA-DEG1-ROADMA-DEG2 - DEG1-CP-SRG1-CP - - - - DEG1-CTP-TXRX - ROADMA-DEG1 - - - DEG1-TTP-TXRX - ROADMA-DEG1 - - - - - ROADMA-DEG2 - - ROADMA-DEG2-ROADMA-DEG1 - DEG2-CP-SRG1-CP - - - - DEG2-CTP-TXRX - ROADMA-DEG2 - - - DEG2-TTP-TXRX - ROADMA-DEG2 - - - - - - - NodeB - - - ROADMB-DEG1 - - ROADMB-DEG1-ROADMB-DEG2 - - - - DEG1-CTP-TXRX - ROADMB-DEG1 - - - DEG1-TTP-TXRX - ROADMB-DEG1 - - - - - ROADMB-DEG2 - - ROADMB-DEG2-ROADMB-DEG1 - - - - DEG2-CTP-TXRX - ROADMB-DEG2 - - - DEG2-TTP-TXRX - ROADMB-DEG2 - - - - - - - NodeZ - - - XPDRC - - XPDRC-ROADMZ-SRG1 - - - - CLIENT1 - XPDRC - - - NETWORK1 - XPDRC - - - - - ROADMZ-SRG1 - - ROADMZ-SRG1-XPDRC - SRG1-CP-DEG1-CP - SRG1-CP-DEG2-CP - - - - SRG1-PP1 - ROADMZ-SRG1 - - - SRG1-PP2 - ROADMZ-SRG1 - - - - - ROADMA-DEG1 - - ROADMZ-DEG1-ROADMZ-DEG2 - DEG1-CP-SRG1-CP - - - - DEG1-CTP-TXRX - ROADMA-DEG1 - - - DEG1-TTP-TXRX - ROADMA-DEG1 - - - - - ROADMZ-DEG2 - - ROADMZ-DEG2-ROADMZ-DEG1 - DEG2-CP-SRG1-CP - - - - DEG2-CTP-TXRX - ROADMZ-DEG2 - - - DEG2-TTP-TXRX - ROADMZ-DEG2 - - - - - - - diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml deleted file mode 100644 index a80b60132..000000000 --- a/tests/stubrenderer/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 3.0.8 - - - - org.opendaylight.transportpce - transportpce-stubrenderer - 0.4.0-SNAPSHOT - bundle - - - - - org.opendaylight.controller - mdsal-artifacts - 1.9.1-SNAPSHOT - import - pom - - - org.opendaylight.netconf - netconf-artifacts - 1.6.1-SNAPSHOT - import - pom - - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-stubmodels - ${project.version} - - - org.opendaylight.controller.model - model-topology - - - org.opendaylight.netconf - sal-netconf-connector - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java deleted file mode 100644 index cdcdc0ec6..000000000 --- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/SendingRendererRPCs.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubrenderer; - -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; - -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.TopologyBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.AToZ; -import org.opendaylight.yang.gen.v1.http.org.openroadm.topology.rev161014.topology.ZToA; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - *Class for Sending - * Renderer requests : - * - Service-implementation-request - * - Service-delete-request. - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - * - */ -public class SendingRendererRPCs { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(SendingRendererRPCs.class); - /** define procedure success (or not ). */ - private Boolean success; - /** define type of request
- * true pathcomputation
- * false cancelresourcereserve. */ - private TopologyBuilder topology; - private List atoz; - private List ztoa; - private String error; - private final ListeningExecutorService executor; - - public SendingRendererRPCs(ListeningExecutorService executor) { - success = true; - setTopology(null); - this.executor = executor; - setError(""); - } - - private void buildAtoZ() { - atoz = new ArrayList(); - } - - private void buildZtoA() { - ztoa = new ArrayList(); - } - - public ListenableFuture serviceDelete() { - LOG.info("ServiceDelete request ..."); - success = false; - return executor.submit(new Callable() { - @Override - public Boolean call() throws Exception { - Boolean output = true; - LOG.info("Wait for 10s til beginning the Renderer serviceDelete request"); - try { - Thread.sleep(10000); //sleep for 10s - } catch (InterruptedException e) { - output = false; - LOG.error("Thread.sleep failed : {}", e.toString()); - } - buildAtoZ(); - buildZtoA(); - success = true; - return output; - } - }); - } - - public ListenableFuture serviceImplementation() { - LOG.info("serviceImplementation request ..."); - success = false; - return executor.submit(new Callable() { - @Override - public Boolean call() throws Exception { - Boolean output = true; - LOG.info("Wait for 10s til beginning the Renderer serviceDelete request"); - try { - Thread.sleep(10000); //sleep for 10s - } catch (InterruptedException e) { - output = false; - LOG.error("Thread.sleep failed : {}", e.toString()); - } - buildAtoZ(); - buildZtoA(); - setTopology(new TopologyBuilder() - .setAToZ(atoz) - .setZToA(ztoa)); - output = true; - success = true; - return output; - } - }); - } - - public Boolean getSuccess() { - return success; - } - - public void setSuccess(Boolean success) { - this.success = success; - } - - public TopologyBuilder getTopology() { - return topology; - } - - public void setTopology(TopologyBuilder topo) { - this.topology = topo; - } - - public String getError() { - return error; - } - - public void setError(String error) { - this.error = error; - } -} diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/StubrendererCompliancyCheck.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/StubrendererCompliancyCheck.java deleted file mode 100644 index 173e7d0ef..000000000 --- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/StubrendererCompliancyCheck.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubrenderer; - -import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev170426.service.handler.header.ServiceHandlerHeader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class for checking service sdnc-request-header compliancy. - * - * @author Martial Coulibaly on behalf of Orange - * - */ -public class StubrendererCompliancyCheck { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(StubrendererCompliancyCheck.class); - /** SdncRequestHeader. */ - private ServiceHandlerHeader serviceHandlerHeader; - /** Service Name. */ - private String serviceName; - /** Response message from procedure. */ - private String message; - - - public StubrendererCompliancyCheck(String serviceName,ServiceHandlerHeader serviceHandlerHeader) { - this.serviceName = serviceName; - this.serviceHandlerHeader = serviceHandlerHeader; - this.setMessage(""); - } - - /** - * Check if a String is not null and not equal to void. - * - * @param value - * String value - * @return true if String ok false if not - */ - public Boolean checkString(String value) { - Boolean result = false; - if (value != null && value.compareTo("") != 0) { - result = true; - } - return result; - - } - - /** - * Check Compliancy of Service request. - * - * @param contype - * Boolean to check connection Type - * @param servicehandler - * Boolean to check sndcRequestHeader - * - * @return true if String ok false if not - */ - public Boolean check(Boolean contype, Boolean servicehandler) { - Boolean result = true; - if (!checkString(serviceName)) { - result = false; - message = "Service Name is not set"; - LOG.info(message); - } - if (servicehandler) { - if (serviceHandlerHeader != null) { - String requestId = serviceHandlerHeader.getRequestId(); - if (!checkString(requestId)) { - result = false; - message = "Service serviceHandlerHeader 'request-id' is not set"; - LOG.info(message); - } - } else { - result = false; - message = "Service serviceHandlerHeader is not set "; - LOG.info(message); - } - } - return result; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } -} diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java deleted file mode 100644 index 6e197d5da..000000000 --- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererImpl.java +++ /dev/null @@ -1,299 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubrenderer.impl; - -import com.google.common.util.concurrent.FutureCallback; -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.concurrent.Executors; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.transportpce.stubrenderer.SendingRendererRPCs; -import org.opendaylight.transportpce.stubrenderer.StubrendererCompliancyCheck; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceDeleteInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceDeleteOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceDeleteOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceImplementationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceImplementationRequestOutput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceImplementationRequestOutputBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceRpcResultSp; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.ServiceRpcResultSpBuilder; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.StubrendererService; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.service.rpc.result.sp.PathTopology; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.service.rpc.result.sp.PathTopologyBuilder; -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.common.service.types.rev161014.service.TopologyBuilder; -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.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - - -/** - * Class to implement StubrendererService. - * @author Martial Coulibaly ( martial.coulibaly@gfi.com ) on behalf of Orange - * - */ -public class StubrendererImpl implements StubrendererService { - /** Logging. */ - private static final Logger LOG = LoggerFactory.getLogger(StubrendererImpl.class); - /** send notification. */ - private NotificationPublishService notificationPublishService; - private ServiceRpcResultSp notification; - private final ListeningExecutorService executor = MoreExecutors - .listeningDecorator(Executors.newFixedThreadPool(10)); - /** check service sdnc-request-header compliancy. */ - private StubrendererCompliancyCheck compliancyCheck; - - public StubrendererImpl(NotificationPublishService notificationPublishService) { - this.notificationPublishService = notificationPublishService; - } - - @Override - public ListenableFuture> serviceImplementationRequest( - ServiceImplementationRequestInput input) { - LOG.info("RPC serviceImplementationRequest request received"); - String responseCode = ""; - String message = ""; - ConfigurationResponseCommonBuilder configurationResponseCommon = null; - - this.compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader()); - if (this.compliancyCheck.check(false, true)) { - LOG.info("Service compliant !"); - /** - * If compliant, service-request parameters are verified in order to - * check if there is no missing parameter that prevents calculating - * a path and implement a service. - */ - - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest) - .setServiceName(input.getServiceName()) - .setStatus(RpcStatusEx.Pending) - .setStatusMessage("Service compliant, submitting serviceImplementation Request ...") - .build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - - SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(this.executor); - FutureCallback rendererCallback = - new FutureCallback() { - String message = ""; - ServiceRpcResultSp notification = null; - - @Override - public void onFailure(Throwable arg0) { - LOG.error("Failure message : {}", arg0.toString()); - LOG.error("Service implementation failed !"); - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("PCR Request failed : {}" + arg0.getMessage()).build(); - try { - StubrendererImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - - @Override - public void onSuccess(Boolean response) { - LOG.info("response : {}", response); - if (response) { - this.message = "Service implemented !"; - TopologyBuilder topo = sendingRenderer.getTopology(); - ServiceRpcResultSpBuilder tmp = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest) - .setServiceName(input.getServiceName()) - .setStatus(RpcStatusEx.Successful) - .setStatusMessage(this.message); - if (topo != null) { - PathTopology value = new PathTopologyBuilder() - .setAToZ(topo.getAToZ()) - .setZToA(topo.getZToA()) - .build(); - tmp.setPathTopology(value); - } - this.notification = tmp.build(); - } else { - this.message = "Service implementation failed : " + sendingRenderer.getError(); - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceImplementationRequest) - .setServiceName("") - .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message) - .build(); - } - LOG.info(this.notification.toString()); - try { - StubrendererImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - LOG.info(this.message); - } - }; - ListenableFuture renderer = sendingRenderer.serviceImplementation(); - Futures.addCallback(renderer, rendererCallback, this.executor); - LOG.info("Service implmentation Request in progress "); - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("Yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseCode("200") - .setResponseMessage("Service implementation Request in progress "); - - ServiceImplementationRequestOutput output = new ServiceImplementationRequestOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()) - .build(); - return RpcResultBuilder.success(output).buildFuture(); - } else { - message = this.compliancyCheck.getMessage(); - responseCode = "500"; - LOG.info("Service not compliant caused by : {}", message); - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("Service not compliant caused by : " + message) - .build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseCode(responseCode) - .setResponseMessage(message); - ServiceImplementationRequestOutput output = new ServiceImplementationRequestOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()) - .build(); - - return RpcResultBuilder.success(output).buildFuture(); - } - - @Override - public ListenableFuture> serviceDelete(ServiceDeleteInput input) { - String message = ""; - LOG.info("RPC serviceDelete request received"); - String responseCode = ""; - ConfigurationResponseCommonBuilder configurationResponseCommon = null; - this.compliancyCheck = new StubrendererCompliancyCheck(input.getServiceName(), input.getServiceHandlerHeader()); - if (this.compliancyCheck.check(false, true)) { - LOG.info("Service compliant !"); - /** - * If compliant, service-request parameters are verified in order to - * check if there is no missing parameter that prevents calculating - * a path and implement a service. - */ - - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName(input.getServiceName()) - .setStatus(RpcStatusEx.Pending) - .setStatusMessage("Service compliant, submitting serviceDelete Request ...") - .build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - SendingRendererRPCs sendingRenderer = new SendingRendererRPCs(this.executor); - FutureCallback rendererCallback = new FutureCallback() { - String message = ""; - ServiceRpcResultSp notification = null; - - @Override - public void onFailure(Throwable arg0) { - LOG.error("Failure message : {}", arg0.toString()); - LOG.error("Service delete failed !"); - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("PCR Request failed : " + arg0.getMessage()).build(); - try { - StubrendererImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - - @Override - public void onSuccess(Boolean response) { - LOG.info("response : {}", response); - if (response) { - this.message = "Service deleted !"; - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Successful) - .setStatusMessage(this.message).build(); - } else { - this.message = "Service delete failed : " + sendingRenderer.getError(); - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName("") - .setStatus(RpcStatusEx.Failed).setStatusMessage(this.message) - .build(); - } - LOG.info(this.notification.toString()); - try { - StubrendererImpl.this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - LOG.info(this.message); - } - }; - ListenableFuture renderer = sendingRenderer.serviceDelete(); - Futures.addCallback(renderer, rendererCallback, this.executor); - message = "Service delete Request in progress ..."; - LOG.info(message); - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("Yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseCode("200") - .setResponseMessage(message); - ServiceDeleteOutput output = new ServiceDeleteOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()) - .build(); - return RpcResultBuilder.success(output).buildFuture(); - } else { - message = this.compliancyCheck.getMessage(); - LOG.info("Service not compliant caused by : {}", message); - responseCode = "500"; - this.notification = new ServiceRpcResultSpBuilder() - .setNotificationType(ServicePathNotificationTypes.ServiceDelete) - .setServiceName(input.getServiceName()).setStatus(RpcStatusEx.Failed) - .setStatusMessage("Service not compliant caused by : " + message) - .build(); - try { - this.notificationPublishService.putNotification(this.notification); - } catch (InterruptedException e) { - LOG.info("notification offer rejected : {}", e); - } - } - configurationResponseCommon = new ConfigurationResponseCommonBuilder() - .setAckFinalIndicator("yes") - .setRequestId(input.getServiceHandlerHeader().getRequestId()) - .setResponseCode(responseCode) - .setResponseMessage(message); - ServiceDeleteOutput output = new ServiceDeleteOutputBuilder() - .setConfigurationResponseCommon(configurationResponseCommon.build()) - .build(); - return RpcResultBuilder.success(output).buildFuture(); - } -} diff --git a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java b/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java deleted file mode 100644 index 0beb0873a..000000000 --- a/tests/stubrenderer/src/main/java/org/opendaylight/transportpce/stubrenderer/impl/StubrendererProvider.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright © 2017 Orange, Inc. 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.stubrenderer.impl; - -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.md.sal.binding.api.NotificationService; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.StubrendererListener; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.stubrenderer.rev170426.StubrendererService; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Class to register Stubrenderer Service and Notification. - * @author Martial Coulibaly on behalf of Orange - * - */ -public class StubrendererProvider { - private static final Logger LOG = LoggerFactory.getLogger(StubrendererProvider.class); - private final RpcProviderRegistry rpcRegistry; - private final NotificationPublishService notificationPublishService; - - - private BindingAwareBroker.RpcRegistration rpcRegistration; - private ListenerRegistration stubRendererlistenerRegistration; - - public StubrendererProvider(RpcProviderRegistry rpcProviderRegistry, - NotificationService notificationService, - NotificationPublishService notificationPublishService) { - this.rpcRegistry = rpcProviderRegistry; - this.notificationPublishService = notificationPublishService; - } - - /** - * Method called when the blueprint container is created. - */ - public void init() { - LOG.info("StubrendererProvider Session Initiated"); - final StubrendererImpl consumer = new StubrendererImpl(this.notificationPublishService); - this.rpcRegistration = this.rpcRegistry.addRpcImplementation(StubrendererService.class, consumer); - } - - /** - * Method called when the blueprint container is destroyed. - */ - public void close() { - LOG.info("StubrendererProvider Closed"); - this.rpcRegistration.close(); - } -} diff --git a/tests/stubrenderer/src/main/resources/OSGI-INF/blueprint/stubrenderer-blueprint.xml b/tests/stubrenderer/src/main/resources/OSGI-INF/blueprint/stubrenderer-blueprint.xml deleted file mode 100644 index e7a811d56..000000000 --- a/tests/stubrenderer/src/main/resources/OSGI-INF/blueprint/stubrenderer-blueprint.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/tests/transportpce_tests/test_end2end.py b/tests/transportpce_tests/test_end2end.py index ed5f0b5ad..388e52c38 100644 --- a/tests/transportpce_tests/test_end2end.py +++ b/tests/transportpce_tests/test_end2end.py @@ -33,7 +33,7 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -43,7 +43,7 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: @@ -53,7 +53,7 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def __start_honeynode3(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode3.log', 'w') as outfile: @@ -63,7 +63,7 @@ class TransportPCEFulltesting(unittest.TestCase): @classmethod def __start_honeynode4(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode4.log', 'w') as outfile: diff --git a/tests/transportpce_tests/test_olm.py b/tests/transportpce_tests/test_olm.py index de7270768..3ac186a05 100644 --- a/tests/transportpce_tests/test_olm.py +++ b/tests/transportpce_tests/test_olm.py @@ -34,7 +34,7 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -44,7 +44,7 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: @@ -54,7 +54,7 @@ class TransportOlmTesting(unittest.TestCase): @classmethod def __start_honeynode3(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode3.log', 'w') as outfile: @@ -63,7 +63,7 @@ class TransportOlmTesting(unittest.TestCase): stdout=outfile) @classmethod def __start_honeynode4(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode4.log', 'w') as outfile: diff --git a/tests/transportpce_tests/test_portmapping.py b/tests/transportpce_tests/test_portmapping.py index ef5180cf7..d66c2e141 100644 --- a/tests/transportpce_tests/test_portmapping.py +++ b/tests/transportpce_tests/test_portmapping.py @@ -31,7 +31,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -41,7 +41,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: diff --git a/tests/transportpce_tests/test_renderer_service_path_nominal.py b/tests/transportpce_tests/test_renderer_service_path_nominal.py index 9d64344c8..33c9a5543 100644 --- a/tests/transportpce_tests/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/test_renderer_service_path_nominal.py @@ -32,7 +32,7 @@ class TransportPCERendererTesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -42,7 +42,7 @@ class TransportPCERendererTesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: diff --git a/tests/transportpce_tests/test_servicehandler.py b/tests/transportpce_tests/test_servicehandler.py deleted file mode 100644 index bbcf6c977..000000000 --- a/tests/transportpce_tests/test_servicehandler.py +++ /dev/null @@ -1,846 +0,0 @@ -#!/usr/bin/env python -############################################################################## -# Copyright (c) 2017 Orange, Inc. and others. All rights reserved. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import json -import os -import psutil -import requests -import signal -import shutil -import subprocess -import time -import unittest - - -class TransportPCEtesting(unittest.TestCase): - - odl_process = None - honeynode_topology = None - restconf_baseurl = "http://localhost:8181/restconf" - - @classmethod - def _get_file(cls): - honeynode_topology_file = "sample_configs/honeynode-topo.xml" - if os.path.isfile(honeynode_topology_file): - with open(honeynode_topology_file, 'r') as honeynode_file: - cls.honeynode_topo = honeynode_file.read(); - - @classmethod - def __start_odl(cls): - executable = "../karaf/target/assembly/bin/karaf" - with open('odl.log', 'w') as outfile: - cls.odl_process = subprocess.Popen( - ["bash", executable, "server"], stdout=outfile, - stdin=open(os.devnull)) - - @classmethod - def setUpClass(cls): # a class method called before tests in an individual class run. - cls._get_file() - cls.__start_odl() - time.sleep(90) - - @classmethod - def tearDownClass(cls): - for child in psutil.Process(cls.odl_process.pid).children(): - child.send_signal(signal.SIGINT) - child.wait() - cls.odl_process.send_signal(signal.SIGINT) - cls.odl_process.wait() - - def setUp(self): # instruction executed before each test method - print ("execution of {}".format(self.id().split(".")[-1])) - -# def test_01_restconfAPI(self): -# url = ("{}/operational/network-topology:network-topology/topology/" -# "topology-netconf/node/controller-config".format(self.restconf_baseurl)) -# headers = {'content-type': 'application/json'} -# response = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) -# self.assertEqual(response.status_code, requests.codes.ok) -# res = response.json() -# self.assertEqual(res['node'] [0] ['netconf-node-topology:connection-status'], -# 'connected') -# time.sleep(1) - - # Load honeynode topology - def test_02_load_honeynode_topology(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology" - .format(self.restconf_baseurl)) - body = self.honeynode_topo - headers = {'content-type': 'application/xml', - "Accept": "application/json"} - response = requests.request( - "PUT", url, data=body, headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - time.sleep(2) - - def test_03_check_link_xpdra_roadma(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/" - "XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX".format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - time.sleep(1) - - def test_04_check_link_xpdrc_roadmc(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/" - "XPDRC-XPDR1-XPDR1-NETWORK1toROADMC-SRG1-SRG1-PP1-TXRX".format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - time.sleep(1) - - def test_05_check_link_roadma_xpdra(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/" - "ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1".format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - time.sleep(1) - - def test_06_check_link_roadmc_xpdrc(self): - url = ("{}/config/ietf-network:networks/network/openroadm-topology/link/" - "ROADMC-SRG1-SRG1-PP1-TXRXtoXPDRC-XPDR1-XPDR1-NETWORK1".format(self.restconf_baseurl)) - headers = {'content-type': 'application/json'} - response = requests.request("GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - time.sleep(1) - - # Create Service 'test' with correct parameters - def test_07_create_service_success(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = {"input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "test", - "common-id": "ASATT1234567", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) - time.sleep(20) - - # Create Service 'test' with not compliant parameter : no 'sdnc-request-header' parameter - def test_08_create_service_failed(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = {"input": { - "service-name": "test", - "common-id": "ASATT1234567", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Service sndc-request-header is not set', - res['output']['configuration-response-common']['response-message']) - time.sleep(5) - - # Create Service 'test' with not compliant parameter : no 'tx-direction' for serviceAEnd - def test_09_create_service_failed(self): - url = ("{}/operations/org-openroadm-service:service-create" - .format(self.restconf_baseurl)) - data = {"input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-create", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "service-name": "test", - "common-id": "ASATT1234567", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Service TxDirection is not correctly set', - res['output']['configuration-response-common']['response-message']) - time.sleep(5) - - # Get 'test' service created - def test_10_verify_service_created(self): - url = ("{}/operational/org-openroadm-service:service-list/services/test" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], - 'inService') - time.sleep(1) - - # get non existing service - def test_11_get_non_existing_service(self): - url = ("{}/operational/org-openroadm-service:service-list/services/test1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, 404) - time.sleep(1) - - #reconfigure 'test' to be 'test-new' - def test_12_reconfigure_service_test(self): - url = ("{}/operations/org-openroadm-service:service-reconfigure" - .format(self.restconf_baseurl)) - data = {"input": { - "service-name": "test", - "new-service-name": "test-new", - "common-id": "ASATT1234567", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "XPDRA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "XPDRC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - } - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Renderer service delete in progress', - res['output']['status-message']) - time.sleep(30) - - # get new service 'test-new' - def test_13_verify_service_reconfigure(self): - url = ("{}/operational/org-openroadm-service:service-list/services/test-new" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], - 'inService') - time.sleep(1) - - # Delete service - def test_14_delete_service_reconfigure(self): - url = ("{}/operations/org-openroadm-service:service-delete" - .format(self.restconf_baseurl)) - data = {"input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "service-delete", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "service-delete-req-info": { - "service-name": "test-new", - "due-date": "2016-11-28T00:00:01Z", - "tail-retention": "no" - } - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) - time.sleep(20) - - # Verify 'test' service deleted - def test_15_verify_service_reconfigure_deleted(self): - url = ("{}/operational/org-openroadm-service:service-list/services/test-new" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, 404) - time.sleep(1) - - # Create Temp Service 'ASATT1234567' with correct parameters - def test_16_create_temp_service_success(self): - url = ("{}/operations/org-openroadm-service:temp-service-create" - .format(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "temp-service-create", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "common-id": "ASATT1234567", - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('PCE calculation in progress', - res['output']['configuration-response-common']['response-message']) - time.sleep(20) - - - # Create Temp Service not compliant with no common-id - def test_17_create_temp_service_failed(self): - url = ("{}/operations/org-openroadm-service:temp-service-create" - .format(self.restconf_baseurl)) - data = { - "input": { - "sdnc-request-header": { - "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58", - "rpc-action": "temp-service-create", - "request-system-id": "appname", - "notification-url": "http://localhost:8585/NotificationServer/notify" - }, - "connection-type": "infrastructure", - "service-a-end": { - "service-rate": "100", - "node-id": "ROADMA", - "service-format": "Ethernet", - "clli": "SNJSCAMCJP8", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.3", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJP8_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-5/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJP8_000000.00_00", - "lgx-port-name": "LGX Back.4", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "service-z-end": { - "service-rate": "100", - "node-id": "ROADMC", - "service-format": "Ethernet", - "clli": "SNJSCAMCJT4", - "tx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Tx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.29", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "rx-direction": { - "port": { - "port-device-name": "ROUTER_SNJSCAMCJT4_000000.00_00", - "port-type": "router", - "port-name": "Gigabit Ethernet_Rx.ge-1/0/0.0", - "port-rack": "000000.00", - "port-shelf": "00" - }, - "lgx": { - "lgx-device-name": "LGX Panel_SNJSCAMCJT4_000000.00_00", - "lgx-port-name": "LGX Back.30", - "lgx-port-rack": "000000.00", - "lgx-port-shelf": "00" - } - }, - "optic-type": "gray" - }, - "due-date": "2016-11-28T00:00:01Z", - "operator-contact": "pw1234" - } - } - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Service Name (common-id for Temp service) is not set', - res['output']['configuration-response-common']['response-message']) - time.sleep(5) - - # Get 'ASATT1234567' temp service created - def test_18_verify_temp_service_created(self): - url = ("{}/operational/org-openroadm-service:temp-service-list/services/ASATT1234567" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertEqual( - res['services'][0]['administrative-state'], - 'inService') - time.sleep(1) - - # get non existing service - def test_19_get_temp_service_non_existed(self): - url = ("{}/operational/org-openroadm-service:temp-service-list/services/test1" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, 404) - time.sleep(1) - - # Delete temp service - def test_20_delete_temp_service_created(self): - url = ("{}/operations/org-openroadm-service:temp-service-delete" - .format(self.restconf_baseurl)) - data = {"input": { - "common-id": "ASATT1234567" - } - } - headers = {'content-type': 'application/json'} - response = requests.request( - "POST", url, data=json.dumps(data), headers=headers, - auth=('admin', 'admin')) - self.assertEqual(response.status_code, requests.codes.ok) - res = response.json() - self.assertIn('Renderer service delete in progress', - res['output']['configuration-response-common']['response-message']) - time.sleep(20) - -# Verify 'test' service deleted - def test_21_verify_temp_service_deleted(self): - url = ("{}/operational/org-openroadm-service:service-list/services/ASATT1234567" - .format(self.restconf_baseurl)) - headers = {'content-type': 'application/json', - "Accept": "application/json"} - response = requests.request( - "GET", url, headers=headers, auth=('admin', 'admin')) - self.assertEqual(response.status_code, 404) - time.sleep(1) - - -if __name__ == "__main__": - unittest.main(verbosity=2) diff --git a/tests/transportpce_tests/test_topoPortMapping.py b/tests/transportpce_tests/test_topoPortMapping.py index 415ef9bb2..a772a9109 100644 --- a/tests/transportpce_tests/test_topoPortMapping.py +++ b/tests/transportpce_tests/test_topoPortMapping.py @@ -38,7 +38,7 @@ class TransportPCEtesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -49,7 +49,7 @@ class TransportPCEtesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: diff --git a/tests/transportpce_tests/test_topology.py b/tests/transportpce_tests/test_topology.py index cdfc02a42..ea35a3c6c 100644 --- a/tests/transportpce_tests/test_topology.py +++ b/tests/transportpce_tests/test_topology.py @@ -40,7 +40,7 @@ class TransportPCETopologyTesting(unittest.TestCase): @classmethod def __start_honeynode1(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode1.log', 'w') as outfile: @@ -50,7 +50,7 @@ class TransportPCETopologyTesting(unittest.TestCase): @classmethod def __start_honeynode2(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode2.log', 'w') as outfile: @@ -60,7 +60,7 @@ class TransportPCETopologyTesting(unittest.TestCase): @classmethod def __start_honeynode3(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode3.log', 'w') as outfile: @@ -70,7 +70,7 @@ class TransportPCETopologyTesting(unittest.TestCase): @classmethod def __start_honeynode4(cls): - executable = ("./honeynode/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" + executable = ("./honeynode/2.1/honeynode-distribution/target/honeynode-distribution-1.18.01-hc" "/honeynode-distribution-1.18.01/honeycomb-tpce") if os.path.isfile(executable): with open('honeynode4.log', 'w') as outfile: diff --git a/tox.ini b/tox.ini index b0704282d..e1c541739 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,6 @@ changedir={toxinidir}/tests commands = {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "if [ ! `which mvn` ]; then ./installMavenCentOS.sh ; fi" {py27,portmapping,topoPortMapping,rspn,topology,pce,olm,end2end}: - bash -c "(cd .. && mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true)" -# {py27,topoPortMapping}: - ./buildTesttool.sh {py27,portmapping,topoPortMapping,rspn,topology,olm,end2end}: - ./buildHoneynode.sh #py27: nosetests --with-xunit transportpce_tests/ {py27,portmapping}: - nosetests --with-xunit transportpce_tests/test_portmapping.py @@ -26,8 +25,6 @@ commands = {py27,rspn}: - nosetests --with-xunit transportpce_tests/test_renderer_service_path_nominal.py {py27,pce}: - nosetests --with-xunit transportpce_tests/test_pce.py {py27,olm}: - nosetests --with-xunit transportpce_tests/test_olm.py - {servicehandler}: - ./SH_func_tests.sh - {servicehandler}: - nosetests --with-xunit transportpce_tests/test_servicehandler.py {py27,end2end}: - nosetests --with-xunit transportpce_tests/test_end2end.py -- 2.36.6