From 8f56a17eb0ab50ee6208d992cc94803ab95a96cf Mon Sep 17 00:00:00 2001 From: jensenzhang Date: Wed, 5 Jul 2017 18:51:15 +0800 Subject: [PATCH] Clean up unused subprojects and configurations Make the following changes: - Remove redundant artifacts / features / karaf / it modules. - Reduce `alto-core/standard-service-models/model-*/api` to `alto-core/standard-service-models/model-*`. - Rename alto-service-model-*-api to alto-service-model-*. - Unify modules name as "ODL :: alto :: ${project.artifactId}". - Remove unused profiles from pom.xml. Change-Id: I7b22badb37568a5d3a1c93999fca0e6ee35199d1 Signed-off-by: jensenzhang --- .gitignore | 3 +- alto-basic/auto-maps/api/pom.xml | 1 + alto-basic/auto-maps/artifacts/pom.xml | 46 --- alto-basic/auto-maps/features/pom.xml | 118 -------- .../features/src/main/features/features.xml | 41 --- alto-basic/auto-maps/impl/pom.xml | 5 +- alto-basic/auto-maps/it/pom.xml | 39 --- .../alto/basic/it/AltoAutoMapsIT.java | 60 ---- alto-basic/auto-maps/karaf/pom.xml | 73 ----- alto-basic/auto-maps/pom.xml | 82 +----- alto-basic/manual-maps/api/pom.xml | 2 +- alto-basic/manual-maps/artifacts/pom.xml | 45 --- alto-basic/manual-maps/features/pom.xml | 152 ---------- .../features/src/main/features/features.xml | 50 ---- alto-basic/manual-maps/impl/pom.xml | 6 +- alto-basic/manual-maps/karaf/pom.xml | 66 ----- alto-basic/manual-maps/pom.xml | 104 +++---- alto-basic/simple-ecs/artifacts/pom.xml | 48 ---- alto-basic/simple-ecs/features/pom.xml | 197 ------------- .../features/src/main/features/features.xml | 56 ---- alto-basic/simple-ecs/hostnodetracker/pom.xml | 64 ----- .../topology/api/HostNodeTrackerService.java | 16 -- .../topology/impl/HostNodeTrackerImpl.java | 136 --------- alto-basic/simple-ecs/impl/pom.xml | 4 +- alto-basic/simple-ecs/it/pom.xml | 42 --- .../it/EndpointcostserviceIT.java | 70 ----- alto-basic/simple-ecs/karaf/pom.xml | 66 ----- alto-basic/simple-ecs/pom.xml | 36 +-- alto-basic/simple-ird/artifacts/pom.xml | 50 ---- alto-basic/simple-ird/features/pom.xml | 113 -------- .../features/src/main/features/features.xml | 41 --- alto-basic/simple-ird/impl/pom.xml | 8 +- alto-basic/simple-ird/it/pom.xml | 44 --- .../alto/basic/it/AltoSimpleIrdIT.java | 60 ---- alto-basic/simple-ird/karaf/pom.xml | 72 ----- alto-basic/simple-ird/pom.xml | 93 +----- alto-core/northbound/artifacts/pom.xml | 46 --- alto-core/northbound/features/pom.xml | 207 -------------- .../features/src/main/features/features.xml | 73 ----- alto-core/northbound/it/pom.xml | 42 --- .../alto/core/it/AltoNorthboundIT.java | 70 ----- alto-core/northbound/karaf/pom.xml | 66 ----- alto-core/northbound/pom.xml | 37 +-- alto-core/resourcepool/api/pom.xml | 1 + alto-core/resourcepool/impl/pom.xml | 1 + alto-core/resourcepool/pom.xml | 16 +- .../costmap/api/pom.xml | 3 +- .../costmap/impl/pom.xml | 3 +- .../costmap/pom.xml | 31 +- .../endpointcost/api/pom.xml | 3 +- .../endpointcost/impl/pom.xml | 3 +- .../endpointcost/pom.xml | 31 +- .../endpointproperty/api/pom.xml | 3 +- .../endpointproperty/impl/pom.xml | 3 +- .../endpointproperty/pom.xml | 31 +- .../example/pom.xml | 112 -------- .../src/main/config/default-config.xml | 35 --- .../src/main/config/maven-metadata-local.xml | 20 -- .../impl/AltoNorthboundRouteExample.java | 36 --- .../AltoNorthboundRouteExampleModule.java | 31 -- ...toNorthboundRouteExampleModuleFactory.java | 13 - .../alto-northbound-route-example-impl.yang | 45 --- ...rthboundRouteExampleModuleFactoryTest.java | 18 -- .../AltoNorthboundRouteExampleModuleTest.java | 56 ---- .../networkmap/api/pom.xml | 3 +- .../networkmap/impl/pom.xml | 3 +- .../networkmap/pom.xml | 31 +- alto-core/standard-northbound-routes/pom.xml | 40 +-- .../model-base/api/pom.xml | 42 --- .../model-base/artifacts/pom.xml | 45 --- .../model-base/features/pom.xml | 145 ---------- .../features/src/main/features/features.xml | 44 --- .../model-base/impl/pom.xml | 62 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../alto/core/impl/AltoModelBaseProvider.java | 134 --------- .../test/rev151021/AltoModelBaseModule.java | 27 -- .../rev151021/AltoModelBaseModuleFactory.java | 13 - .../yang/service-model-base-test-impl.yang | 35 --- .../AltoModelBaseModuleFactoryTest.java | 18 -- .../rev151021/AltoModelBaseModuleTest.java | 54 ---- .../model-base/it/pom.xml | 41 --- .../alto/core/it/AltoModelBaseIT.java | 70 ----- .../model-base/karaf/pom.xml | 67 ----- .../model-base/pom.xml | 86 ++---- .../src/main/yang/service-model-base.yang | 0 .../model-config/api/pom.xml | 52 ---- .../model-config/artifacts/pom.xml | 45 --- .../model-config/features/pom.xml | 123 -------- .../features/src/main/features/features.xml | 44 --- .../model-config/impl/pom.xml | 57 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../impl/config/test/AltoConfigProvider.java | 34 --- .../config/rev151021/AltoConfigModule.java | 27 -- .../rev151021/AltoConfigModuleFactory.java | 13 - .../impl/src/main/yang/config-impl.yang | 35 --- .../AltoConfigModuleFactoryTest.java | 18 -- .../rev151021/AltoConfigModuleTest.java | 54 ---- .../model-config/it/pom.xml | 41 --- .../opendaylight/alto/core/it/AltoIrdIT.java | 70 ----- .../model-config/karaf/pom.xml | 66 ----- .../model-config/pom.xml | 96 +++---- .../src/main/yang/alto-model-config.yang | 0 .../model-costmap/api/pom.xml | 58 ---- .../model-costmap/artifacts/pom.xml | 39 --- .../model-costmap/features/pom.xml | 149 ---------- .../features/src/main/features/features.xml | 48 ---- .../model-costmap/impl/pom.xml | 63 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../costmap/test/AltoCostmapProvider.java | 248 ---------------- .../costmap/rev151021/AltoCostmapModule.java | 27 -- .../rev151021/AltoCostmapModuleFactory.java | 13 - .../impl/src/main/yang/costmap-impl.yang | 35 --- .../AltoCostmapModuleFactoryTest.java | 18 -- .../rev151021/AltoCostmapModuleTest.java | 54 ---- .../model-costmap/it/pom.xml | 41 --- .../alto/core/it/AltoCostmapIT.java | 70 ----- .../model-costmap/karaf/pom.xml | 66 ----- .../model-costmap/pom.xml | 100 +++---- .../service/model/costmap/CostmapUtils.java | 0 .../main/yang/alto-model-costmap-rfc7285.yang | 0 .../src/main/yang/alto-model-costmap.yang | 0 .../model-endpointcost/api/pom.xml | 58 ---- .../model-endpointcost/artifacts/pom.xml | 45 --- .../model-endpointcost/features/pom.xml | 123 -------- .../features/src/main/features/features.xml | 46 --- .../model-endpointcost/impl/pom.xml | 63 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../test/AltoEndpointCostProvider.java | 269 ------------------ .../rev151021/AltoEndpointCostModule.java | 27 -- .../AltoEndpointCostModuleFactory.java | 13 - .../main/yang/alto-endpoint-test-impl.yang | 35 --- .../AltoEndpointCostModuleFactoryTest.java | 18 -- .../rev151021/AltoEndpointCostModuleTest.java | 54 ---- .../model-endpointcost/it/pom.xml | 41 --- .../alto/core/it/AltoEndpointcostIT.java | 70 ----- .../model-endpointcost/karaf/pom.xml | 66 ----- .../model-endpointcost/pom.xml | 102 +++---- .../model/endpointcost/EndpointcostUtils.java | 0 .../yang/alto-model-endpointcost-rfc7285.yang | 0 .../main/yang/alto-model-endpointcost.yang | 0 .../model-endpointproperty/api/pom.xml | 58 ---- .../model-endpointproperty/artifacts/pom.xml | 39 --- .../model-endpointproperty/features/pom.xml | 174 ----------- .../features/src/main/features/features.xml | 109 ------- .../model-endpointproperty/impl/pom.xml | 69 ----- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../test/AltoEndpointPropertyProvider.java | 227 --------------- .../rev151021/AltoEndpointPropertyModule.java | 27 -- .../AltoEndpointPropertyModuleFactory.java | 13 - .../main/yang/alto-endpoint-test-impl.yang | 35 --- ...AltoEndpointPropertyModuleFactoryTest.java | 19 -- .../AltoEndpointPropertyModuleTest.java | 54 ---- .../model-endpointproperty/it/pom.xml | 41 --- .../alto/core/it/AltoEndpointcostIT.java | 70 ----- .../model-endpointproperty/karaf/pom.xml | 66 ----- .../model-endpointproperty/pom.xml | 102 +++---- .../alto-model-endpointproperty-rfc7285.yang | 0 .../yang/alto-model-endpointproperty.yang | 0 .../model-ird/api/pom.xml | 52 ---- .../model-ird/artifacts/pom.xml | 45 --- .../model-ird/features/pom.xml | 123 -------- .../features/src/main/features/features.xml | 44 --- .../model-ird/impl/pom.xml | 57 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../core/impl/ird/test/AltoIrdProvider.java | 34 --- .../test/ird/rev151021/AltoIrdModule.java | 27 -- .../ird/rev151021/AltoIrdModuleFactory.java | 13 - .../impl/src/main/yang/ird-impl.yang | 35 --- .../rev151021/AltoIrdModuleFactoryTest.java | 18 -- .../test/ird/rev151021/AltoIrdModuleTest.java | 54 ---- .../model-ird/it/pom.xml | 41 --- .../opendaylight/alto/core/it/AltoIrdIT.java | 70 ----- .../model-ird/karaf/pom.xml | 66 ----- .../standard-service-models/model-ird/pom.xml | 96 +++---- .../src/main/yang/alto-model-ird.yang | 0 .../model-networkmap/api/pom.xml | 52 ---- .../model-networkmap/artifacts/pom.xml | 45 --- .../model-networkmap/features/pom.xml | 123 -------- .../features/src/main/features/features.xml | 44 --- .../model-networkmap/impl/pom.xml | 57 ---- .../impl/src/main/config/default-config.xml | 30 -- .../src/main/config/maven-metadata-local.xml | 20 -- .../test/AltoNetworkmapProvider.java | 230 --------------- .../rev151021/AltoNetworkmapModule.java | 27 -- .../AltoNetworkmapModuleFactory.java | 13 - .../impl/src/main/yang/networkmap-impl.yang | 35 --- .../AltoNetworkmapModuleFactoryTest.java | 18 -- .../rev151021/AltoNetworkmapModuleTest.java | 54 ---- .../model-networkmap/it/pom.xml | 41 --- .../alto/core/it/AltoNetworkmapIT.java | 70 ----- .../model-networkmap/karaf/pom.xml | 66 ----- .../model-networkmap/pom.xml | 96 +++---- .../yang/alto-model-networkmap-rfc7285.yang | 0 .../src/main/yang/alto-model-networkmap.yang | 0 .../incremental-update/api/pom.xml | 2 +- .../incremental-update/impl/pom.xml | 2 +- alto-extensions/incremental-update/pom.xml | 57 +--- alto-extensions/multicost/api/pom.xml | 2 +- alto-extensions/multicost/impl/pom.xml | 2 +- alto-extensions/multicost/pom.xml | 57 +--- alto-extensions/rsade/api/pom.xml | 2 +- alto-extensions/rsade/impl/pom.xml | 2 +- alto-extensions/rsade/pom.xml | 57 +--- alto-extensions/simple-pce/artifacts/pom.xml | 40 --- alto-extensions/simple-pce/features/pom.xml | 174 ----------- .../features/src/main/features/features.xml | 80 ------ alto-extensions/simple-pce/karaf/pom.xml | 67 ----- alto-extensions/simple-pce/pom.xml | 41 +-- alto-release-features/features-alto/pom.xml | 1 + .../odl-alto-auto-maps/pom.xml | 2 +- .../odl-alto-manual-maps/pom.xml | 2 +- .../odl-alto-multicost/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-alto-nonstandard-types/pom.xml | 2 +- alto-release-features/odl-alto-rsabs/pom.xml | 2 +- .../odl-alto-simpleecs/pom.xml | 2 +- .../odl-alto-simpleird/pom.xml | 2 +- alto-release-features/odl-alto-spce/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../odl-alto-standard-service-models/pom.xml | 14 +- .../odl-alto-standard-types/pom.xml | 2 +- alto-release-features/pom.xml | 16 +- pom.xml | 15 + 231 files changed, 430 insertions(+), 10365 deletions(-) delete mode 100644 alto-basic/auto-maps/artifacts/pom.xml delete mode 100644 alto-basic/auto-maps/features/pom.xml delete mode 100644 alto-basic/auto-maps/features/src/main/features/features.xml delete mode 100644 alto-basic/auto-maps/it/pom.xml delete mode 100644 alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java delete mode 100644 alto-basic/auto-maps/karaf/pom.xml delete mode 100644 alto-basic/manual-maps/artifacts/pom.xml delete mode 100644 alto-basic/manual-maps/features/pom.xml delete mode 100644 alto-basic/manual-maps/features/src/main/features/features.xml delete mode 100644 alto-basic/manual-maps/karaf/pom.xml delete mode 100644 alto-basic/simple-ecs/artifacts/pom.xml delete mode 100644 alto-basic/simple-ecs/features/pom.xml delete mode 100644 alto-basic/simple-ecs/features/src/main/features/features.xml delete mode 100644 alto-basic/simple-ecs/hostnodetracker/pom.xml delete mode 100644 alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java delete mode 100644 alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java delete mode 100644 alto-basic/simple-ecs/it/pom.xml delete mode 100644 alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java delete mode 100644 alto-basic/simple-ecs/karaf/pom.xml delete mode 100644 alto-basic/simple-ird/artifacts/pom.xml delete mode 100644 alto-basic/simple-ird/features/pom.xml delete mode 100644 alto-basic/simple-ird/features/src/main/features/features.xml delete mode 100644 alto-basic/simple-ird/it/pom.xml delete mode 100644 alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java delete mode 100644 alto-basic/simple-ird/karaf/pom.xml delete mode 100644 alto-core/northbound/artifacts/pom.xml delete mode 100644 alto-core/northbound/features/pom.xml delete mode 100644 alto-core/northbound/features/src/main/features/features.xml delete mode 100644 alto-core/northbound/it/pom.xml delete mode 100644 alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java delete mode 100644 alto-core/northbound/karaf/pom.xml delete mode 100644 alto-core/standard-northbound-routes/example/pom.xml delete mode 100644 alto-core/standard-northbound-routes/example/src/main/config/default-config.xml delete mode 100644 alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java delete mode 100644 alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java delete mode 100644 alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java delete mode 100644 alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang delete mode 100644 alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java delete mode 100644 alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java delete mode 100644 alto-core/standard-service-models/model-base/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-base/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-base/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-base/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-base/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang delete mode 100644 alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java delete mode 100644 alto-core/standard-service-models/model-base/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java delete mode 100644 alto-core/standard-service-models/model-base/karaf/pom.xml rename alto-core/standard-service-models/model-base/{api => }/src/main/yang/service-model-base.yang (100%) delete mode 100644 alto-core/standard-service-models/model-config/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-config/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-config/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-config/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-config/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang delete mode 100644 alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java delete mode 100644 alto-core/standard-service-models/model-config/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java delete mode 100644 alto-core/standard-service-models/model-config/karaf/pom.xml rename alto-core/standard-service-models/model-config/{api => }/src/main/yang/alto-model-config.yang (100%) delete mode 100644 alto-core/standard-service-models/model-costmap/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-costmap/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-costmap/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-costmap/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java delete mode 100644 alto-core/standard-service-models/model-costmap/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java delete mode 100644 alto-core/standard-service-models/model-costmap/karaf/pom.xml rename alto-core/standard-service-models/model-costmap/{api => }/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java (100%) rename alto-core/standard-service-models/model-costmap/{api => }/src/main/yang/alto-model-costmap-rfc7285.yang (100%) rename alto-core/standard-service-models/model-costmap/{api => }/src/main/yang/alto-model-costmap.yang (100%) delete mode 100644 alto-core/standard-service-models/model-endpointcost/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java delete mode 100644 alto-core/standard-service-models/model-endpointcost/karaf/pom.xml rename alto-core/standard-service-models/model-endpointcost/{api => }/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java (100%) rename alto-core/standard-service-models/model-endpointcost/{api => }/src/main/yang/alto-model-endpointcost-rfc7285.yang (100%) rename alto-core/standard-service-models/model-endpointcost/{api => }/src/main/yang/alto-model-endpointcost.yang (100%) delete mode 100644 alto-core/standard-service-models/model-endpointproperty/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java delete mode 100644 alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml rename alto-core/standard-service-models/model-endpointproperty/{api => }/src/main/yang/alto-model-endpointproperty-rfc7285.yang (100%) rename alto-core/standard-service-models/model-endpointproperty/{api => }/src/main/yang/alto-model-endpointproperty.yang (100%) delete mode 100644 alto-core/standard-service-models/model-ird/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-ird/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-ird/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-ird/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-ird/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java delete mode 100644 alto-core/standard-service-models/model-ird/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java delete mode 100644 alto-core/standard-service-models/model-ird/karaf/pom.xml rename alto-core/standard-service-models/model-ird/{api => }/src/main/yang/alto-model-ird.yang (100%) delete mode 100644 alto-core/standard-service-models/model-networkmap/api/pom.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/artifacts/pom.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/features/pom.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/pom.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java delete mode 100644 alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java delete mode 100644 alto-core/standard-service-models/model-networkmap/it/pom.xml delete mode 100644 alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java delete mode 100644 alto-core/standard-service-models/model-networkmap/karaf/pom.xml rename alto-core/standard-service-models/model-networkmap/{api => }/src/main/yang/alto-model-networkmap-rfc7285.yang (100%) rename alto-core/standard-service-models/model-networkmap/{api => }/src/main/yang/alto-model-networkmap.yang (100%) delete mode 100644 alto-extensions/simple-pce/artifacts/pom.xml delete mode 100644 alto-extensions/simple-pce/features/pom.xml delete mode 100644 alto-extensions/simple-pce/features/src/main/features/features.xml delete mode 100644 alto-extensions/simple-pce/karaf/pom.xml diff --git a/.gitignore b/.gitignore index 63637467..42378d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ *.ipr *.iws *.swp -*.swp +*.old +*.bak *.xmi *~ .DS_STORE diff --git a/alto-basic/auto-maps/api/pom.xml b/alto-basic/auto-maps/api/pom.xml index 3beae85b..a3c69d85 100644 --- a/alto-basic/auto-maps/api/pom.xml +++ b/alto-basic/auto-maps/api/pom.xml @@ -19,5 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.basic alto-auto-maps-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-basic/auto-maps/artifacts/pom.xml b/alto-basic/auto-maps/artifacts/pom.xml deleted file mode 100644 index 02e45f0c..00000000 --- a/alto-basic/auto-maps/artifacts/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 2.0.0 - - - - org.opendaylight.alto.basic - alto-auto-maps-artifacts - 0.5.0-SNAPSHOT - pom - - - - - ${project.groupId} - alto-auto-maps-api - ${project.version} - - - ${project.groupId} - alto-auto-maps-impl - ${project.version} - - - ${project.groupId} - alto-auto-maps-features - ${project.version} - features - xml - - - - diff --git a/alto-basic/auto-maps/features/pom.xml b/alto-basic/auto-maps/features/pom.xml deleted file mode 100644 index 6d0634c5..00000000 --- a/alto-basic/auto-maps/features/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - - org.opendaylight.alto.basic - alto-auto-maps-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - - 3.1.1 - - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-auto-maps-impl - ${project.version} - - - ${project.groupId} - alto-auto-maps-api - ${project.version} - - - ${project.groupId} - alto-auto-maps-cli - ${project.version} - - - diff --git a/alto-basic/auto-maps/features/src/main/features/features.xml b/alto-basic/auto-maps/features/src/main/features/features.xml deleted file mode 100644 index f488c6d9..00000000 --- a/alto-basic/auto-maps/features/src/main/features/features.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features - mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features - mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features - - odl-mdsal-models - mvn:org.opendaylight.alto.basic/alto-auto-maps-api/{{VERSION}} - - - odl-mdsal-broker - odl-alto-auto-maps-api - mvn:org.opendaylight.alto.basic/alto-auto-maps-impl/{{VERSION}} - - - odl-alto-auto-maps - odl-restconf - - - odl-alto-auto-maps-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - odl-alto-auto-maps - mvn:org.opendaylight.alto.basic/alto-auto-maps-cli/{{VERSION}} - - - diff --git a/alto-basic/auto-maps/impl/pom.xml b/alto-basic/auto-maps/impl/pom.xml index 7349ae4b..8ebc754b 100644 --- a/alto-basic/auto-maps/impl/pom.xml +++ b/alto-basic/auto-maps/impl/pom.xml @@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.basic alto-auto-maps-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle @@ -42,13 +43,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} org.opendaylight.alto.core - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} diff --git a/alto-basic/auto-maps/it/pom.xml b/alto-basic/auto-maps/it/pom.xml deleted file mode 100644 index 3cc974af..00000000 --- a/alto-basic/auto-maps/it/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - org.opendaylight.alto.basic - alto-auto-maps-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.basic - alto-auto-maps-karaf - 0.3.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-auto-maps-features - ${project.version} - - - diff --git a/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java b/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java deleted file mode 100644 index ea670cd4..00000000 --- a/alto-basic/auto-maps/it/src/test/java/org/opendaylight/alto/basic/it/AltoAutoMapsIT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2016 SNLAB 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.alto.basic.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoAutoMapsIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoAutoMapsIT.class); - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.basic") - .artifactId("alto-auto-maps-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-auto-maps-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoAutoMapsIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testAltoAutoMapsFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-basic/auto-maps/karaf/pom.xml b/alto-basic/auto-maps/karaf/pom.xml deleted file mode 100644 index 67077dd8..00000000 --- a/alto-basic/auto-maps/karaf/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - - org.opendaylight.alto.basic - alto-auto-maps-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - - 3.1.1 - - - - odl-alto-auto-maps-ui - - - - - - ${project.groupId} - alto-auto-maps-artifacts - ${project.version} - pom - import - - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-auto-maps-features - features - xml - runtime - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-basic/auto-maps/pom.xml b/alto-basic/auto-maps/pom.xml index c24c6909..37b9c856 100644 --- a/alto-basic/auto-maps/pom.xml +++ b/alto-basic/auto-maps/pom.xml @@ -25,6 +25,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 + + api + impl + + @@ -45,81 +50,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - minimal - - true - - - api - impl - - - - - alto-dev - - api - impl - features - artifacts - - - - - alto-test - - api - impl - features - artifacts - karaf - - - - - - - maven-site - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/alto-basic/manual-maps/api/pom.xml b/alto-basic/manual-maps/api/pom.xml index 31b5df79..af8870cb 100644 --- a/alto-basic/manual-maps/api/pom.xml +++ b/alto-basic/manual-maps/api/pom.xml @@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core - alto-service-model-base-api + alto-service-model-base ${project.version} diff --git a/alto-basic/manual-maps/artifacts/pom.xml b/alto-basic/manual-maps/artifacts/pom.xml deleted file mode 100644 index de80d80f..00000000 --- a/alto-basic/manual-maps/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../ - - - 4.0.0 - org.opendaylight.alto.basic - alto-manual-maps-artifacts - ODL :: alto :: ${project.artifactId} - pom - - - - - ${project.groupId} - alto-manual-maps-api - ${project.version} - - - ${project.groupId} - alto-manual-maps-impl - ${project.version} - - - ${project.groupId} - alto-manual-maps-features - ${project.version} - features - xml - - - - diff --git a/alto-basic/manual-maps/features/pom.xml b/alto-basic/manual-maps/features/pom.xml deleted file mode 100644 index a2ed43a4..00000000 --- a/alto-basic/manual-maps/features/pom.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.basic - alto-manual-maps-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 0.11.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - org.opendaylight.alto.core - alto-northbound-features - ${project.version} - features - xml - runtime - - - org.opendaylight.alto.core - alto-resourcepool-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-service-model-networkmap-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-service-model-costmap-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - org.opendaylight.alto.core - alto-service-model-config-api - ${project.version} - - - ${project.groupId} - alto-manual-maps-impl - ${project.version} - - - ${project.groupId} - alto-manual-maps-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-manual-maps-api - ${project.version} - - - diff --git a/alto-basic/manual-maps/features/src/main/features/features.xml b/alto-basic/manual-maps/features/src/main/features/features.xml deleted file mode 100644 index 1db8b581..00000000 --- a/alto-basic/manual-maps/features/src/main/features/features.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-northbound-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-costmap-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-resourcepool-api - mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-config-api/${project.version} - mvn:org.opendaylight.alto.basic/alto-manual-maps-api/${project.version} - - - odl-mdsal-broker - odl-alto-manual-maps-api - odl-alto-northbound - odl-alto-resourcepool - odl-alto-service-model-networkmap - odl-alto-service-model-costmap - mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version} - mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version}/xml/config - - - odl-alto-manual-maps - odl-restconf - - - odl-alto-manual-maps-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-basic/manual-maps/impl/pom.xml b/alto-basic/manual-maps/impl/pom.xml index 392dedf6..442bff5d 100644 --- a/alto-basic/manual-maps/impl/pom.xml +++ b/alto-basic/manual-maps/impl/pom.xml @@ -36,19 +36,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core - alto-service-model-ird-api + alto-service-model-ird ${project.version} org.opendaylight.alto.core - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} org.opendaylight.alto.core - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} diff --git a/alto-basic/manual-maps/karaf/pom.xml b/alto-basic/manual-maps/karaf/pom.xml deleted file mode 100644 index 44230f57..00000000 --- a/alto-basic/manual-maps/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.basic - alto-manual-maps-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-manual-maps-ui - - - - - ${project.groupId} - alto-manual-maps-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-manual-maps-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-basic/manual-maps/pom.xml b/alto-basic/manual-maps/pom.xml index 616fe2a8..2011956b 100644 --- a/alto-basic/manual-maps/pom.xml +++ b/alto-basic/manual-maps/pom.xml @@ -7,75 +7,47 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - - org.opendaylight.odlparent - odlparent - 2.0.0 - - + + org.opendaylight.odlparent + odlparent + 2.0.0 + + - org.opendaylight.alto.basic - alto-manual-maps-aggregator - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - impl - - + org.opendaylight.alto.basic + alto-manual-maps-aggregator + 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} + pom + 4.0.0 + + 3.1.1 + - - alto-dev - - api - impl - features - artifacts - - + + api + impl + - - alto-test - - api - impl - features - artifacts - karaf - - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + diff --git a/alto-basic/simple-ecs/artifacts/pom.xml b/alto-basic/simple-ecs/artifacts/pom.xml deleted file mode 100644 index 696668c6..00000000 --- a/alto-basic/simple-ecs/artifacts/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - 4.0.0 - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../ - - - org.opendaylight.alto.basic - 0.5.0-SNAPSHOT - alto-simple-ecs-artifacts - ODL :: alto :: ${project.artifactId} - pom - - - - - ${project.groupId} - alto-simple-ecs-api - ${project.version} - - - ${project.groupId} - alto-simple-ecs-impl - ${project.version} - - - ${project.groupId} - alto-simple-ecs-features - ${project.version} - features - xml - - - - diff --git a/alto-basic/simple-ecs/features/pom.xml b/alto-basic/simple-ecs/features/pom.xml deleted file mode 100644 index 114c629d..00000000 --- a/alto-basic/simple-ecs/features/pom.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.basic - 0.5.0-SNAPSHOT - alto-simple-ecs-features - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - org.opendaylight.alto.core - alto-northbound-features - ${project.version} - features - xml - runtime - - - org.opendaylight.alto.core - alto-resourcepool-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-service-model-networkmap-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-service-model-endpointcost-features - features - ${project.version} - xml - runtime - - - - org.opendaylight.openflowplugin - features-openflowplugin - features - ${openflow.plugin.version} - xml - runtime - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - org.opendaylight.alto.core - alto-service-model-ird-api - ${project.version} - - - ${project.groupId} - alto-simple-ecs-impl - ${project.version} - - - ${project.groupId} - alto-simple-ecs-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-simple-ecs-api - ${project.version} - - - - - org.opendaylight.controller.model - model-inventory - jar - - - org.opendaylight.openflowplugin.model - model-flow-statistics - ${openflow.plugin.version} - jar - - - org.opendaylight.l2switch - features-l2switch - features - ${l2switch.version} - xml - runtime - - - org.opendaylight.l2switch.addresstracker - addresstracker-model - ${l2switch.version} - jar - - - org.opendaylight.l2switch.hosttracker - hosttracker-model - ${l2switch.version} - jar - - - diff --git a/alto-basic/simple-ecs/features/src/main/features/features.xml b/alto-basic/simple-ecs/features/src/main/features/features.xml deleted file mode 100644 index 0719353c..00000000 --- a/alto-basic/simple-ecs/features/src/main/features/features.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-northbound-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features - mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features - mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features - - - odl-mdsal-models - odl-alto-resourcepool-api - mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version} - mvn:org.opendaylight.alto.basic/alto-simple-ecs-api/${project.version} - - - odl-mdsal-broker - odl-alto-simple-ecs-api - odl-alto-northbound - odl-alto-resourcepool - odl-alto-service-model-networkmap - odl-alto-service-model-endpointcost - odl-l2switch-hosttracker - odl-l2switch-addresstracker - odl-openflowplugin-flow-services - mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version} - mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config - - - odl-alto-simple-ecs - odl-restconf - - - odl-alto-simple-ecs-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-basic/simple-ecs/hostnodetracker/pom.xml b/alto-basic/simple-ecs/hostnodetracker/pom.xml deleted file mode 100644 index f84ac3f5..00000000 --- a/alto-basic/simple-ecs/hostnodetracker/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - - org.opendaylight.alto.basic - hostnodetracker - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - bundle - - - - org.opendaylight.l2switch.hosttracker - hosttracker-model - 0.7.0-SNAPSHOT - - - - org.opendaylight.l2switch.addresstracker - addresstracker-model - 0.7.0-SNAPSHOT - - - - org.opendaylight.alto.core - alto-service-model-base-api - 0.5.0-SNAPSHOT - - - org.opendaylight.alto.core - alto-service-model-endpointcost-api - 0.5.0-SNAPSHOT - - - - org.opendaylight.controller - sal-binding-api - 1.7.0-SNAPSHOT - - - - diff --git a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java b/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java deleted file mode 100644 index c453c655..00000000 --- a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.basic.hostnode.tracker.topology.api; - -public interface HostNodeTrackerService { - String getIpByMac(String macAddress); - - String getMacByIp(String ipAddress); - - Boolean isValidHost(String ipAddress); -} diff --git a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java b/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java deleted file mode 100644 index 7e574ce2..00000000 --- a/alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.basic.hostnode.tracker.topology.impl; - -import org.opendaylight.alto.basic.hostnode.tracker.topology.api.HostNodeTrackerService; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.address.tracker.rev140617.address.node.connector.Addresses; -import org.opendaylight.yang.gen.v1.urn.opendaylight.host.tracker.rev140624.HostNode; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -public class HostNodeTrackerImpl implements HostNodeTrackerService,DataChangeListener{ - private static final Logger log = LoggerFactory - .getLogger(HostNodeTrackerImpl.class); - private static final int CPUS = Runtime.getRuntime().availableProcessors(); - private ExecutorService exec = Executors.newFixedThreadPool(CPUS); - private DataBroker dataBroker = null; - private Map macToIp; - private Map ipToMac; - - private ListenerRegistration hostListener = null; - public HostNodeTrackerImpl (DataBroker dataBroker) { - this.log.info("AddressConvertServiceImpl initial."); - this.dataBroker = dataBroker; - macToIp = new HashMap(); - ipToMac = new HashMap(); - registerPortListener(); - } - - private void registerPortListener() { - InstanceIdentifier hostNodes = InstanceIdentifier - .builder(NetworkTopology.class) - .child(Topology.class) - .child(Node.class).augmentation(HostNode.class).build(); - this.hostListener = this.dataBroker - .registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - hostNodes, this, AsyncDataBroker.DataChangeScope.SUBTREE); - } - public String getIpByMac(String macAddress) { - return this.macToIp.get(macAddress); - } - - public String getMacByIp(String ipAddress) { - return this.ipToMac.get(ipAddress); - } - - public Boolean isValidHost(String ipAddress) { - return this.ipToMac.containsKey(ipAddress); - } - - public void onDataChanged(final AsyncDataChangeEvent, DataObject> change) { - exec.submit(new Runnable() { - @Override - public void run() { - if (change == null) { - log.info("In onDataChanged: No processing done as change even is null."); - return; - } - Map, DataObject> updatedData = change - .getUpdatedData(); - Map, DataObject> createdData = change - .getCreatedData(); - Map, DataObject> originalData = change - .getOriginalData(); - Set> deletedData = change - .getRemovedPaths(); - - for (InstanceIdentifier iid : deletedData) { - log.info("deletedData"); - if (iid.getTargetType().equals(Node.class)) { - Node node = ((Node) originalData.get(iid)); - HostNode hostNode = node - .getAugmentation(HostNode.class); - if (hostNode != null) { - List addrList = hostNode.getAddresses(); - for (Addresses eachAddress : addrList) { - macToIp.remove(eachAddress.getMac().getValue()); - ipToMac.remove(eachAddress.getIp().getIpv4Address().getValue()); - } - } - } - } - - for (Map.Entry, DataObject> entrySet : updatedData - .entrySet()) { - InstanceIdentifier iiD = entrySet.getKey(); - final DataObject dataObject = entrySet.getValue(); - if (dataObject instanceof Addresses) { - Addresses addrs = (Addresses) dataObject; - Addresses origAddr = (Addresses) originalData.get(iiD); - log.info("updatedData addresses:" + addrs + "~~" + origAddr); - macToIp.remove(origAddr.getMac().getValue()); - macToIp.put(addrs.getMac().getValue(), addrs.getIp().getIpv4Address().getValue()); - ipToMac.remove(origAddr.getIp().getIpv4Address().getValue()); - ipToMac.put(addrs.getIp().getIpv4Address().getValue(), addrs.getMac().getValue()); - } - } - - for (Map.Entry, DataObject> entrySet : createdData - .entrySet()) { - InstanceIdentifier iiD = entrySet.getKey(); - final DataObject dataObject = entrySet.getValue(); - if (dataObject instanceof Addresses) { - Addresses addrs = (Addresses) dataObject; - log.info("createdData addresses:" + addrs); - macToIp.put(addrs.getMac().getValue(), addrs.getIp().getIpv4Address().getValue()); - ipToMac.put(addrs.getIp().getIpv4Address().getValue(), addrs.getMac().getValue()); - } - } - } - }); - } - -} diff --git a/alto-basic/simple-ecs/impl/pom.xml b/alto-basic/simple-ecs/impl/pom.xml index 5e15f03b..026813ea 100644 --- a/alto-basic/simple-ecs/impl/pom.xml +++ b/alto-basic/simple-ecs/impl/pom.xml @@ -37,13 +37,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} org.opendaylight.alto.core - alto-service-model-endpointcost-api + alto-service-model-endpointcost ${project.version} diff --git a/alto-basic/simple-ecs/it/pom.xml b/alto-basic/simple-ecs/it/pom.xml deleted file mode 100644 index cab248cd..00000000 --- a/alto-basic/simple-ecs/it/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.basic - 0.5.0-SNAPSHOT - alto-simple-ecs-it - ODL :: alto :: ${project.artifactId} - bundle - - - false - org.opendaylight.alto.basic - 0.5.0-SNAPSHOT - alto-simple-ecs-karaf - zip - - - - - ${project.groupId} - alto-simple-ecs-features - ${project.version} - - - - diff --git a/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java b/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java deleted file mode 100644 index 4fd33552..00000000 --- a/alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.basic.endpointcostservice.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class EndpointcostserviceIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(EndpointcostserviceIT.class); - - @Override - public String getModuleName() { - return "endpointcostservice"; - } - - @Override - public String getInstanceName() { - return "endpointcostservice-default"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.basic") - .artifactId("endpointcostservice-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-endpointcostservice-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(EndpointcostserviceIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testendpointcostserviceFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-basic/simple-ecs/karaf/pom.xml b/alto-basic/simple-ecs/karaf/pom.xml deleted file mode 100644 index b91ba50f..00000000 --- a/alto-basic/simple-ecs/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.basic - 0.5.0-SNAPSHOT - alto-simple-ecs-karaf - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-simple-ecs-ui - - - - - ${project.groupId} - alto-simple-ecs-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-simple-ecs-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-basic/simple-ecs/pom.xml b/alto-basic/simple-ecs/pom.xml index 7f217b45..c6ecb6bc 100644 --- a/alto-basic/simple-ecs/pom.xml +++ b/alto-basic/simple-ecs/pom.xml @@ -23,40 +23,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - - - alto-dev - - api - impl - features - artifacts - - + + api + impl + - - alto-test - - api - impl - features - artifacts - karaf - it - - - diff --git a/alto-basic/simple-ird/artifacts/pom.xml b/alto-basic/simple-ird/artifacts/pom.xml deleted file mode 100644 index d3e88234..00000000 --- a/alto-basic/simple-ird/artifacts/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 2.0.0 - - - - org.opendaylight.alto.basic - alto-simple-ird-artifacts - 0.5.0-SNAPSHOT - - ODL :: alto :: ${project.artifactId} - pom - - - - - ${project.groupId} - alto-simple-ird-api - ${project.version} - - - ${project.groupId} - alto-simple-ird-impl - ${project.version} - - - ${project.groupId} - alto-simple-ird-features - ${project.version} - features - xml - - - - diff --git a/alto-basic/simple-ird/features/pom.xml b/alto-basic/simple-ird/features/pom.xml deleted file mode 100644 index 63d60e45..00000000 --- a/alto-basic/simple-ird/features/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - - org.opendaylight.alto.basic - alto-simple-ird-features - 0.5.0-SNAPSHOT - - ODL :: alto :: ${project.artifactId} - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-simple-ird-impl - ${project.version} - - - ${project.groupId} - alto-simple-ird-api - ${project.version} - - - diff --git a/alto-basic/simple-ird/features/src/main/features/features.xml b/alto-basic/simple-ird/features/src/main/features/features.xml deleted file mode 100644 index 76084600..00000000 --- a/alto-basic/simple-ird/features/src/main/features/features.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features - mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features - mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/{{VERSION}}/xml/features - - odl-mdsal-models - mvn:org.opendaylight.alto.basic/alto-simple-ird-api/{{VERSION}} - - - odl-mdsal-broker - odl-alto-simple-ird-api - mvn:org.opendaylight.alto.basic/alto-simple-ird-impl/{{VERSION}} - - - odl-alto-simple-ird - odl-restconf - - - odl-alto-simple-ird-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - - diff --git a/alto-basic/simple-ird/impl/pom.xml b/alto-basic/simple-ird/impl/pom.xml index a6196e64..b5f6512e 100644 --- a/alto-basic/simple-ird/impl/pom.xml +++ b/alto-basic/simple-ird/impl/pom.xml @@ -42,25 +42,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core - alto-service-model-ird-api + alto-service-model-ird ${project.version} org.opendaylight.alto.core - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} org.opendaylight.alto.core - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} org.opendaylight.alto.core - alto-service-model-endpointcost-api + alto-service-model-endpointcost ${project.version} diff --git a/alto-basic/simple-ird/it/pom.xml b/alto-basic/simple-ird/it/pom.xml deleted file mode 100644 index aee82e39..00000000 --- a/alto-basic/simple-ird/it/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - org.opendaylight.alto.basic - alto-simple-ird-it - 0.5.0-SNAPSHOT - - ODL :: alto :: ${project.artifactId} - bundle - - - false - org.opendaylight.alto.basic - alto-simple-ird-karaf - 0.2.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-simple-ird-features - ${project.version} - - - diff --git a/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java b/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java deleted file mode 100644 index 6879f68b..00000000 --- a/alto-basic/simple-ird/it/src/test/java/org/opendaylight/alto/basic/it/AltoSimpleIrdIT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2017 SNLab 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.alto.basic.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoSimpleIrdIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoSimpleIrdIT.class); - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.basic") - .artifactId("alto-simple-ird-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-simple-ird-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoSimpleIrdIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testSimpleIrdFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-basic/simple-ird/karaf/pom.xml b/alto-basic/simple-ird/karaf/pom.xml deleted file mode 100644 index 5b54a594..00000000 --- a/alto-basic/simple-ird/karaf/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - org.opendaylight.alto.basic - alto-simple-ird-karaf - 0.5.0-SNAPSHOT - - ODL :: alto :: ${project.artifactId} - - - odl-alto-simple-ird-ui - - - - - - ${project.groupId} - alto-simple-ird-artifacts - ${project.version} - pom - import - - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-simple-ird-features - features - xml - runtime - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-basic/simple-ird/pom.xml b/alto-basic/simple-ird/pom.xml index 6a7429ee..02fc19b5 100644 --- a/alto-basic/simple-ird/pom.xml +++ b/alto-basic/simple-ird/pom.xml @@ -20,6 +20,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ODL :: alto :: ${project.artifactId} pom 4.0.0 + + + api + impl + + @@ -40,91 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - minimal - - true - - - api - impl - - - - - alto-dev - - api - impl - features - artifacts - - - - - alto-test - - api - impl - features - artifacts - karaf - it - - - - - maven-site - - - ${user.dir}/deploy-site.xml - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - maven-checkstyle-plugin - - true - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/alto-core/northbound/artifacts/pom.xml b/alto-core/northbound/artifacts/pom.xml deleted file mode 100644 index 6bfaeb54..00000000 --- a/alto-core/northbound/artifacts/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-northbound-artifacts - ODL :: alto :: ${project.artifactId} - pom - - - - - ${project.groupId} - alto-northbound-api - ${project.version} - - - ${project.groupId} - alto-northbound-impl - ${project.version} - - - ${project.groupId} - alto-northbound-features - ${project.version} - features - xml - - - - diff --git a/alto-core/northbound/features/pom.xml b/alto-core/northbound/features/pom.xml deleted file mode 100644 index 36636824..00000000 --- a/alto-core/northbound/features/pom.xml +++ /dev/null @@ -1,207 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-northbound-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-northbound-impl - ${project.version} - - - ${project.groupId} - alto-northbound-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-northbound-api - ${project.version} - - - ${project.groupId} - alto-northbound-route-example - ${project.version} - - - ${project.groupId} - alto-northbound-route-example - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-northbound-route-networkmap-api - ${project.version} - - - ${project.groupId} - alto-northbound-route-networkmap-impl - ${project.version} - - - ${project.groupId} - alto-northbound-route-networkmap-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-networkmap-features - features - ${project.version} - xml - runtime - - - - ${project.groupId} - alto-northbound-route-costmap-api - ${project.version} - - - ${project.groupId} - alto-northbound-route-costmap-impl - ${project.version} - - - ${project.groupId} - alto-northbound-route-costmap-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-costmap-features - features - ${project.version} - xml - runtime - - - - ${project.groupId} - alto-northbound-route-endpointcost-api - ${project.version} - - - ${project.groupId} - alto-northbound-route-endpointcost-impl - ${project.version} - - - ${project.groupId} - alto-northbound-route-endpointcost-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-endpointcost-features - features - ${project.version} - xml - runtime - - - diff --git a/alto-core/northbound/features/src/main/features/features.xml b/alto-core/northbound/features/src/main/features/features.xml deleted file mode 100644 index e13bf8e4..00000000 --- a/alto-core/northbound/features/src/main/features/features.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-costmap-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features - - - odl-mdsal-models - odl-restconf - mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version} - - - odl-mdsal-broker - odl-alto-northbound-api - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config - - - odl-alto-northbound - mvn:org.opendaylight.alto.core/alto-northbound-route-example/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-route-example/${project.version}/xml/config - - - odl-alto-service-model-networkmap - mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-route-networkmap-impl/${project.version}/xml/config - - - odl-alto-service-model-costmap - mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-route-costmap-impl/${project.version}/xml/config - - - odl-alto-service-model-endpointcost - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointcost-impl/${project.version}/xml/config - - - - - odl-alto-northbound - odl-alto-northbound-route-test - - - odl-alto-northbound-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/northbound/it/pom.xml b/alto-core/northbound/it/pom.xml deleted file mode 100644 index a83f5e97..00000000 --- a/alto-core/northbound/it/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-northbound-it - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - bundle - - - false - org.opendaylight.alto.core - alto-northbound-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-northbound-features - ${project.version} - - - - diff --git a/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java b/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java deleted file mode 100644 index 3fc23885..00000000 --- a/alto-core/northbound/it/src/test/java/org/opendaylight/alto/core/it/AltoNorthboundIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoNorthboundIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoNorthboundIT.class); - - @Override - public String getModuleName() { - return "alto-northbound"; - } - - @Override - public String getInstanceName() { - return "alto-northbound-default"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-northbound-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-northbound-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoNorthboundIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testnorthboundFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/northbound/karaf/pom.xml b/alto-core/northbound/karaf/pom.xml deleted file mode 100644 index f4ef5fe2..00000000 --- a/alto-core/northbound/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-northbound-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-northbound-ui - - - - - ${project.groupId} - alto-northbound-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-northbound-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/northbound/pom.xml b/alto-core/northbound/pom.xml index 6aa192ff..bd5351a5 100644 --- a/alto-core/northbound/pom.xml +++ b/alto-core/northbound/pom.xml @@ -24,40 +24,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - + + api + impl + - - alto-dev - - api - impl - features - artifacts - - - - - alto-test - - api - impl - karaf - features - artifacts - it - - - diff --git a/alto-core/resourcepool/api/pom.xml b/alto-core/resourcepool/api/pom.xml index 3620f044..8a0a322b 100644 --- a/alto-core/resourcepool/api/pom.xml +++ b/alto-core/resourcepool/api/pom.xml @@ -18,6 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-resourcepool-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-core/resourcepool/impl/pom.xml b/alto-core/resourcepool/impl/pom.xml index 1e6a4e10..8020096f 100644 --- a/alto-core/resourcepool/impl/pom.xml +++ b/alto-core/resourcepool/impl/pom.xml @@ -19,6 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-resourcepool-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-core/resourcepool/pom.xml b/alto-core/resourcepool/pom.xml index 14f639c4..83e5aa71 100644 --- a/alto-core/resourcepool/pom.xml +++ b/alto-core/resourcepool/pom.xml @@ -21,18 +21,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL pom 4.0.0 - - - minimal - - true - - - api - impl - - - + + api + impl + diff --git a/alto-core/standard-northbound-routes/costmap/api/pom.xml b/alto-core/standard-northbound-routes/costmap/api/pom.xml index edaf10c2..ec6cf79b 100644 --- a/alto-core/standard-northbound-routes/costmap/api/pom.xml +++ b/alto-core/standard-northbound-routes/costmap/api/pom.xml @@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-costmap-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle ${project.groupId} - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} diff --git a/alto-core/standard-northbound-routes/costmap/impl/pom.xml b/alto-core/standard-northbound-routes/costmap/impl/pom.xml index 0022605a..1546879c 100644 --- a/alto-core/standard-northbound-routes/costmap/impl/pom.xml +++ b/alto-core/standard-northbound-routes/costmap/impl/pom.xml @@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-costmap-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle @@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.groupId} - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} diff --git a/alto-core/standard-northbound-routes/costmap/pom.xml b/alto-core/standard-northbound-routes/costmap/pom.xml index 6eb84de0..581da047 100644 --- a/alto-core/standard-northbound-routes/costmap/pom.xml +++ b/alto-core/standard-northbound-routes/costmap/pom.xml @@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - + + api + impl + - - alto-dev - - api - impl - - - - - alto-test - - api - impl - - - diff --git a/alto-core/standard-northbound-routes/endpointcost/api/pom.xml b/alto-core/standard-northbound-routes/endpointcost/api/pom.xml index b9dd8e19..326a2341 100644 --- a/alto-core/standard-northbound-routes/endpointcost/api/pom.xml +++ b/alto-core/standard-northbound-routes/endpointcost/api/pom.xml @@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-endpointcost-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle ${project.groupId} - alto-service-model-endpointcost-api + alto-service-model-endpointcost ${project.version} diff --git a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml index 20d08c91..f186a06e 100644 --- a/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml +++ b/alto-core/standard-northbound-routes/endpointcost/impl/pom.xml @@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-endpointcost-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle @@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.groupId} - alto-service-model-endpointcost-api + alto-service-model-endpointcost ${project.version} diff --git a/alto-core/standard-northbound-routes/endpointcost/pom.xml b/alto-core/standard-northbound-routes/endpointcost/pom.xml index b4559a27..325847ca 100644 --- a/alto-core/standard-northbound-routes/endpointcost/pom.xml +++ b/alto-core/standard-northbound-routes/endpointcost/pom.xml @@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - + + api + impl + - - alto-dev - - api - impl - - - - - alto-test - - api - impl - - - diff --git a/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml index 197e9624..a55a8114 100644 --- a/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml +++ b/alto-core/standard-northbound-routes/endpointproperty/api/pom.xml @@ -19,12 +19,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-endpointproperty-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle ${project.groupId} - alto-service-model-endpointproperty-api + alto-service-model-endpointproperty ${project.version} diff --git a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml index 5e4ace1e..9ea8bb7f 100644 --- a/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml +++ b/alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml @@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-endpointproperty-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle @@ -41,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.groupId} - alto-service-model-endpointproperty-api + alto-service-model-endpointproperty ${project.version} diff --git a/alto-core/standard-northbound-routes/endpointproperty/pom.xml b/alto-core/standard-northbound-routes/endpointproperty/pom.xml index 13a3657a..275c6ce2 100644 --- a/alto-core/standard-northbound-routes/endpointproperty/pom.xml +++ b/alto-core/standard-northbound-routes/endpointproperty/pom.xml @@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - + + api + impl + - - alto-dev - - api - impl - - - - - alto-test - - api - impl - - - diff --git a/alto-core/standard-northbound-routes/example/pom.xml b/alto-core/standard-northbound-routes/example/pom.xml deleted file mode 100644 index 51037e48..00000000 --- a/alto-core/standard-northbound-routes/example/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-northbound-route-example - 0.5.0-SNAPSHOT - bundle - - - org.opendaylight.controller - config-api - - - - ${project.groupId} - alto-northbound-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-json-org - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - org.eclipse.jetty - jetty-servlets - - - com.sun.jersey - jersey-server - - - javax.servlet - javax.servlet-api - - - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - - *, - com.sun.jersey.spi.container.servlet, - org.eclipse.jetty.servlets;version="[8.1,10)" - - /alto - - - - - - - diff --git a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml b/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml deleted file mode 100644 index b4e63696..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/config/default-config.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - urn:alto:northbound:route:example:impl?module=alto-northbound-route-example-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - urn:alto:northbound?module=alto-northbound&revision=2015-10-21 - - - - - - - prefix:alto-northbound-route-example-impl - alto-northbound-route-example - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - alto-northbound-router:alto-northbound-router - alto-northbound-router - - - - - - diff --git a/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml b/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml deleted file mode 100644 index a48a9a58..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-northbound-impl - 0.2.1-SNAPSHOT - - - true - - 20151105030453 - - - config - xml - 0.2.1-SNAPSHOT - 20151105030453 - - - - diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java deleted file mode 100644 index a1900db0..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/alto/core/northbound/route/example/impl/AltoNorthboundRouteExample.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2015 Yale University 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.alto.core.northbound.route.example.impl; - -import javax.servlet.http.HttpServletRequest; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; - -import org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute; - -@Path("/") -public class AltoNorthboundRouteExample implements AltoNorthboundRoute { - - @Path("{echo}") - @GET - @Produces("application/alto-test+json") - public String route(@Context HttpServletRequest req, @PathParam("echo") String echo) { - if (req == null) { - System.out.println("We are screwed"); - } - return "Hello world! " + echo - + "\nFrom: " + req.getContextPath() + "/" + req.getPathTranslated() - + "\nTo: " + req.getRemoteAddr(); - } - -} diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java deleted file mode 100644 index b60d48a5..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModule.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021; - -import org.opendaylight.alto.core.northbound.route.example.impl.AltoNorthboundRouteExample; - -public class AltoNorthboundRouteExampleModule extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModule { - public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoNorthboundRouteExampleModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AltoNorthboundRouteExampleModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - getAltoNorthboundRouterDependency().addRoute("example", new AltoNorthboundRouteExample()); - - return new AutoCloseable() { - @Override - public void close() { - getAltoNorthboundRouterDependency().removeRoute("example"); - } - }; - } - -} diff --git a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java b/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java deleted file mode 100644 index 650d23ed..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-northbound-route-example-impl yang module local name: alto-northbound-route-example-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Nov 05 12:06:09 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021; -public class AltoNorthboundRouteExampleModuleFactory extends org.opendaylight.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021.AbstractAltoNorthboundRouteExampleModuleFactory { - -} diff --git a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang b/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang deleted file mode 100644 index 22e6a572..00000000 --- a/alto-core/standard-northbound-routes/example/src/main/yang/alto-northbound-route-example-impl.yang +++ /dev/null @@ -1,45 +0,0 @@ -module alto-northbound-route-example-impl { - yang-version 1; - namespace "urn:alto:northbound:route:example:impl"; - prefix "alto-northbound-router-example-impl"; - - import alto-northbound { prefix alto-northbound; revision-date 2015-10-21; } - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for northbound project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-northbound-route-example-impl { - base config:module-type; - config:java-name-prefix AltoNorthboundRouteExample; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-northbound-route-example { - when "/config:modules/config:module/config:type = 'alto-northbound-route-example-impl'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - - container alto-northbound-router { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity alto-northbound:alto-northbound-router; - } - } - } - } - } -} diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java deleted file mode 100644 index 50ac5c35..00000000 --- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021; - -import org.junit.Test; - -public class AltoNorthboundRouteExampleModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoNorthboundRouteExampleModuleFactory(); - } -} diff --git a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java b/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java deleted file mode 100644 index 355de10f..00000000 --- a/alto-core/standard-northbound-routes/example/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/northbound/route/example/impl/rev151021/AltoNorthboundRouteExampleModuleTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.alto.northbound.route.example.impl.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoNorthboundRouteExampleModuleTest { - @Test - public void testCustomValidation() { - AltoNorthboundRouteExampleModule module = new AltoNorthboundRouteExampleModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - AltoNorthboundRouter router = mock(AltoNorthboundRouter.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - when(dependencyResolver.resolveInstance(eq(AltoNorthboundRouter.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(router); - - // create instance of module with injected mocks - AltoNorthboundRouteExampleModule module = new AltoNorthboundRouteExampleModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // ensure no exceptions on close - closeable.close(); - - // verify that the route is released after closed - verify(router).removeRoute("example"); - } -} diff --git a/alto-core/standard-northbound-routes/networkmap/api/pom.xml b/alto-core/standard-northbound-routes/networkmap/api/pom.xml index 89e1b238..0cb3b96a 100644 --- a/alto-core/standard-northbound-routes/networkmap/api/pom.xml +++ b/alto-core/standard-northbound-routes/networkmap/api/pom.xml @@ -18,12 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-networkmap-api 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle ${project.groupId} - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} diff --git a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml index 7d6a00af..4d14fa95 100644 --- a/alto-core/standard-northbound-routes/networkmap/impl/pom.xml +++ b/alto-core/standard-northbound-routes/networkmap/impl/pom.xml @@ -20,6 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.alto.core alto-northbound-route-networkmap-impl 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} bundle @@ -35,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.groupId} - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} diff --git a/alto-core/standard-northbound-routes/networkmap/pom.xml b/alto-core/standard-northbound-routes/networkmap/pom.xml index 799cc1a8..0acbde40 100644 --- a/alto-core/standard-northbound-routes/networkmap/pom.xml +++ b/alto-core/standard-northbound-routes/networkmap/pom.xml @@ -23,34 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - api - impl - - + + api + impl + - - alto-dev - - api - impl - - - - - alto-test - - api - impl - - - diff --git a/alto-core/standard-northbound-routes/pom.xml b/alto-core/standard-northbound-routes/pom.xml index 965d6b3e..2bc755c0 100644 --- a/alto-core/standard-northbound-routes/pom.xml +++ b/alto-core/standard-northbound-routes/pom.xml @@ -23,41 +23,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - networkmap - costmap - endpointcost - endpointproperty - - + + networkmap + costmap + endpointcost + endpointproperty + - - alto-dev - - example - networkmap - costmap - endpointcost - endpointproperty - - - - - alto-test - - example - networkmap - costmap - endpointcost - - - diff --git a/alto-core/standard-service-models/model-base/api/pom.xml b/alto-core/standard-service-models/model-base/api/pom.xml deleted file mode 100644 index 34ede38c..00000000 --- a/alto-core/standard-service-models/model-base/api/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-base-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - diff --git a/alto-core/standard-service-models/model-base/artifacts/pom.xml b/alto-core/standard-service-models/model-base/artifacts/pom.xml deleted file mode 100644 index 06de7d7b..00000000 --- a/alto-core/standard-service-models/model-base/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-base-artifacts - pom - - - - - ${project.groupId} - alto-service-mode-basel-api - ${project.version} - - - ${project.groupId} - alto-service-mode-basel-impl - ${project.version} - - - ${project.groupId} - alto-service-mode-basel-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-base/features/pom.xml b/alto-core/standard-service-models/model-base/features/pom.xml deleted file mode 100644 index 38210cc9..00000000 --- a/alto-core/standard-service-models/model-base/features/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-base-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-impl - ${project.version} - - - ${project.groupId} - alto-service-model-base-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - org.opendaylight.alto.core - alto-basic-types-features - features - ${project.version} - xml - runtime - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-features - features - ${project.version} - xml - runtime - - - - diff --git a/alto-core/standard-service-models/model-base/features/src/main/features/features.xml b/alto-core/standard-service-models/model-base/features/src/main/features/features.xml deleted file mode 100644 index d22ff853..00000000 --- a/alto-core/standard-service-models/model-base/features/src/main/features/features.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-resourcepool-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-basic-types-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-basic-types - odl-alto-resourcepool-api - mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version} - - - odl-mdsal-broker - odl-alto-service-model-base-api - odl-alto-resourcepool - mvn:org.opendaylight.alto.core/alto-service-model-base-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-base-impl/${project.version}/xml/config - - - odl-alto-service-model-base - odl-restconf - - - odl-alto-service-model-base-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-base/impl/pom.xml b/alto-core/standard-service-models/model-base/impl/pom.xml deleted file mode 100644 index 4910d65a..00000000 --- a/alto-core/standard-service-models/model-base/impl/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-base-impl - 0.5.0-SNAPSHOT - bundle - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml deleted file mode 100644 index 2475e5c5..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test?module=alto-model-base-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-base-test - alto-model-base-test-impl - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index 55725fb5..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-base-impl - 0.2.1-SNAPSHOT - - - true - - 20151022111158 - - - config - xml - 0.2.1-SNAPSHOT - 20151022111158 - - - - diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java deleted file mode 100644 index 87bdbe86..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/alto/core/impl/AltoModelBaseProvider.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; - -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils; -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener; - -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId; - -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.AltoModelBaseService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.ResourceTypeError; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.QueryOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.alto.response.error.response.ErrorResponseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.rev151021.alto.response.error.response.error.response.ErrorBuilder; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -public class AltoModelBaseProvider implements BindingAwareProvider, AutoCloseable, AltoModelBaseService { - - private static final Logger LOG = LoggerFactory.getLogger(AltoModelBaseProvider.class); - - private DataBroker m_dataBroker = null; - private RoutedRpcRegistration m_serviceReg = null; - private ListenerRegistration m_listener = null; - - private static final String TEST_BASE_NAME = "test-model-base"; - private static final ResourceId TEST_BASE_RID = new ResourceId(TEST_BASE_NAME); - private InstanceIdentifier m_testIID = null; - - protected void createContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_BASE_NAME, ResourceTypeError.class, wx); - - ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_BASE_NAME, wx); - - wx.submit().get(); - } - - protected void removeContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_BASE_NAME, wx); - - wx.submit().get(); - } - - protected void setupListener() { - ContextTagListener listener = new ContextTagListener(m_testIID, m_serviceReg); - m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testIID,listener, DataChangeScope.SUBTREE); - - assert m_listener != null; - } - - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelBaseProvider Session Initiated"); - - m_dataBroker = session.getSALService(DataBroker.class); - m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, TEST_BASE_NAME); - m_serviceReg = session.addRoutedRpcImplementation(AltoModelBaseService.class, this); - - try { - setupListener(); - createContextTag(); - } catch (Exception e) { - } - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - - if (m_serviceReg != null) { - m_serviceReg.close(); - } - - try { - removeContextTag(); - } catch (Exception e) { - } - } - - @Override - public Future> query(QueryInput input) { - ErrorBuilder errorBuilder = new ErrorBuilder(); - errorBuilder.setErrorCode("E_TEST"); - - ErrorResponseBuilder erBuilder = new ErrorResponseBuilder(); - erBuilder.setError(errorBuilder.build()); - - QueryOutputBuilder builder = new QueryOutputBuilder(); - builder.setType(ResourceTypeError.class); - builder.setResponse(erBuilder.build()); - return RpcResultBuilder.success(builder.build()).buildFuture(); - } - -} diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java deleted file mode 100644 index b0a276ff..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021; - -import org.opendaylight.alto.core.impl.AltoModelBaseProvider; - -public class AltoModelBaseModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AbstractAltoModelBaseModule { - public AltoModelBaseModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoModelBaseModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AltoModelBaseModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoModelBaseProvider provider = new AltoModelBaseProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java b/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java deleted file mode 100644 index 08839576..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: model-base-test-impl yang module local name: service-model-base-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Oct 22 11:14:40 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021; -public class AltoModelBaseModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021.AbstractAltoModelBaseModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang b/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang deleted file mode 100644 index f2b73957..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/main/yang/service-model-base-test-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-model-base-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test"; - prefix "alto-model-base-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for service-model-base project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-base-test { - base config:module-type; - config:java-name-prefix AltoModelBase; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-base-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-base-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java b/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java deleted file mode 100644 index 581a838a..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021; - -import org.junit.Test; - -public class AltoModelBaseModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoModelBaseModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java b/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java deleted file mode 100644 index 2b0107f3..00000000 --- a/alto-core/standard-service-models/model-base/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/rev151021/AltoModelBaseModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.AltoModelBaseProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoModelBaseModuleTest { - @Test - public void testCustomValidation() { - AltoModelBaseModule module = new AltoModelBaseModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoModelBaseModule module = new AltoModelBaseModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoModelBaseProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-base/it/pom.xml b/alto-core/standard-service-models/model-base/it/pom.xml deleted file mode 100644 index cdcf4ea2..00000000 --- a/alto-core/standard-service-models/model-base/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-base-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-base-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-base-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java b/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java deleted file mode 100644 index 7de3a134..00000000 --- a/alto-core/standard-service-models/model-base/it/src/test/java/org/opendaylight/alto/core/it/AltoModelBaseIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoModelBaseIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoModelBaseIT.class); - - @Override - public String getModuleName() { - return "alto-model-base-test"; - } - - @Override - public String getInstanceName() { - return "alto-model-base-test-impl"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-base-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-base-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoModelBaseIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testAltoServiceModelBaseFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-base/karaf/pom.xml b/alto-core/standard-service-models/model-base/karaf/pom.xml deleted file mode 100644 index 8ae07d3f..00000000 --- a/alto-core/standard-service-models/model-base/karaf/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-base-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-base-ui - - - - - ${project.groupId} - alto-service-model-base-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-base-features - ${project.version} - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-base/pom.xml b/alto-core/standard-service-models/model-base/pom.xml index 18ba07c1..2fdcd482 100644 --- a/alto-core/standard-service-models/model-base/pom.xml +++ b/alto-core/standard-service-models/model-base/pom.xml @@ -1,79 +1,43 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-base-aggregator + alto-service-model-base 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + diff --git a/alto-core/standard-service-models/model-base/api/src/main/yang/service-model-base.yang b/alto-core/standard-service-models/model-base/src/main/yang/service-model-base.yang similarity index 100% rename from alto-core/standard-service-models/model-base/api/src/main/yang/service-model-base.yang rename to alto-core/standard-service-models/model-base/src/main/yang/service-model-base.yang diff --git a/alto-core/standard-service-models/model-config/api/pom.xml b/alto-core/standard-service-models/model-config/api/pom.xml deleted file mode 100644 index a6b03127..00000000 --- a/alto-core/standard-service-models/model-config/api/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-config-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - diff --git a/alto-core/standard-service-models/model-config/artifacts/pom.xml b/alto-core/standard-service-models/model-config/artifacts/pom.xml deleted file mode 100644 index 40a0b25c..00000000 --- a/alto-core/standard-service-models/model-config/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-config-artifacts - pom - - - - - ${project.groupId} - alto-service-model-config-api - ${project.version} - - - ${project.groupId} - alto-service-model-config-impl - ${project.version} - - - ${project.groupId} - alto-service-model-config-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-config/features/pom.xml b/alto-core/standard-service-models/model-config/features/pom.xml deleted file mode 100644 index 3d3351e3..00000000 --- a/alto-core/standard-service-models/model-config/features/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-config-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 0.11.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-config-impl - ${project.version} - - - ${project.groupId} - alto-service-model-config-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-config-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - diff --git a/alto-core/standard-service-models/model-config/features/src/main/features/features.xml b/alto-core/standard-service-models/model-config/features/src/main/features/features.xml deleted file mode 100644 index 9f5242e7..00000000 --- a/alto-core/standard-service-models/model-config/features/src/main/features/features.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - mvn:org.opendaylight.alto.core/alto-service-model-config-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-config-api - mvn:org.opendaylight.alto.core/alto-service-model-config-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-config-impl/${project.version}/xml/config - - - - odl-alto-service-model-config - odl-restconf - - - - odl-alto-service-model-config-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-config/impl/pom.xml b/alto-core/standard-service-models/model-config/impl/pom.xml deleted file mode 100644 index cbb3e955..00000000 --- a/alto-core/standard-service-models/model-config/impl/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-config-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-config-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml deleted file mode 100644 index 1b2e55ab..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:config?module=alto-config-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-config-test - alto-config-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index aa67347d..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-config-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java deleted file mode 100644 index 49a1964c..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/alto/core/impl/config/test/AltoConfigProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.config.test; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoConfigProvider implements BindingAwareProvider, AutoCloseable { - - private static final Logger LOG = LoggerFactory.getLogger(AltoConfigProvider.class); - - private DataBroker m_dataBrokerService = null; - - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelConfigProvider Session Initiated"); - m_dataBrokerService = session.getSALService(DataBroker.class); - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - } -} diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java deleted file mode 100644 index bd3478a0..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021; - -import org.opendaylight.alto.core.impl.config.test.AltoConfigProvider; - -public class AltoConfigModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AbstractAltoConfigModule { - public AltoConfigModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoConfigModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AltoConfigModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoConfigProvider provider = new AltoConfigProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java b/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java deleted file mode 100644 index 2ff8ef9f..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-config-test-impl yang module local name: alto-model-config-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Oct 28 11:47:28 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021; -public class AltoConfigModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021.AbstractAltoConfigModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang b/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang deleted file mode 100644 index b890f714..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/main/yang/config-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-config-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:config"; - prefix "alto-model-config-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for config project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-config-test { - base config:module-type; - config:java-name-prefix AltoConfig; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-config-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-config-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java b/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java deleted file mode 100644 index 1ddc3bd6..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021; - -import org.junit.Test; - -public class AltoConfigModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoConfigModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java b/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java deleted file mode 100644 index ef7ef086..00000000 --- a/alto-core/standard-service-models/model-config/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/config/rev151021/AltoConfigModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.config.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.config.test.AltoConfigProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoConfigModuleTest { - @Test - public void testCustomValidation() { - AltoConfigModule module = new AltoConfigModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoConfigModule module = new AltoConfigModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoConfigProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-config/it/pom.xml b/alto-core/standard-service-models/model-config/it/pom.xml deleted file mode 100644 index abc2e537..00000000 --- a/alto-core/standard-service-models/model-config/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-config-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-config-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-config-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java b/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java deleted file mode 100644 index c240b3cf..00000000 --- a/alto-core/standard-service-models/model-config/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoIrdIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoIrdIT.class); - - @Override - public String getModuleName() { - return "alto-model-ird-test"; - } - - @Override - public String getInstanceName() { - return "alto-ird-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-ird-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-ird-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoIrdIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testirdFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-config/karaf/pom.xml b/alto-core/standard-service-models/model-config/karaf/pom.xml deleted file mode 100644 index 7c57a924..00000000 --- a/alto-core/standard-service-models/model-config/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-config-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-config-ui - - - - - ${project.groupId} - alto-service-model-config-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-config-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-config/pom.xml b/alto-core/standard-service-models/model-config/pom.xml index 7f1ec1e8..16569161 100644 --- a/alto-core/standard-service-models/model-config/pom.xml +++ b/alto-core/standard-service-models/model-config/pom.xml @@ -1,79 +1,53 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-config-aggregator + alto-service-model-config-api 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + diff --git a/alto-core/standard-service-models/model-config/api/src/main/yang/alto-model-config.yang b/alto-core/standard-service-models/model-config/src/main/yang/alto-model-config.yang similarity index 100% rename from alto-core/standard-service-models/model-config/api/src/main/yang/alto-model-config.yang rename to alto-core/standard-service-models/model-config/src/main/yang/alto-model-config.yang diff --git a/alto-core/standard-service-models/model-costmap/api/pom.xml b/alto-core/standard-service-models/model-costmap/api/pom.xml deleted file mode 100644 index 9411265d..00000000 --- a/alto-core/standard-service-models/model-costmap/api/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-costmap-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-endpointcost-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - diff --git a/alto-core/standard-service-models/model-costmap/artifacts/pom.xml b/alto-core/standard-service-models/model-costmap/artifacts/pom.xml deleted file mode 100644 index 79461f9a..00000000 --- a/alto-core/standard-service-models/model-costmap/artifacts/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-costmap-artifacts - 0.5.0-SNAPSHOT - pom - - - - - ${project.groupId} - alto-service-model-costmap-api - ${project.version} - - - ${project.groupId} - alto-service-model-costmap-impl - ${project.version} - - - ${project.groupId} - alto-service-model-costmap-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-costmap/features/pom.xml b/alto-core/standard-service-models/model-costmap/features/pom.xml deleted file mode 100644 index 37c8d649..00000000 --- a/alto-core/standard-service-models/model-costmap/features/pom.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-costmap-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-costmap-impl - ${project.version} - - - ${project.groupId} - alto-service-model-costmap-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-costmap-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - ${project.groupId} - alto-service-model-endpointcost-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-endpointcost-api - ${project.version} - - - ${project.groupId} - alto-service-model-networkmap-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - diff --git a/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml b/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml deleted file mode 100644 index 73b91bb0..00000000 --- a/alto-core/standard-service-models/model-costmap/features/src/main/features/features.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - odl-alto-service-model-networkmap-api - odl-alto-service-model-endpointcost-api - mvn:org.opendaylight.alto.core/alto-service-model-costmap-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-costmap-api - mvn:org.opendaylight.alto.core/alto-service-model-costmap-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-costmap-impl/${project.version}/xml/config - - - - odl-alto-service-model-costmap - odl-restconf - - - - odl-alto-service-model-costmap-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-costmap/impl/pom.xml b/alto-core/standard-service-models/model-costmap/impl/pom.xml deleted file mode 100644 index 5840a8bd..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-costmap-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-endpointcost-api - ${project.version} - - - - ${project.groupId} - alto-service-model-costmap-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml deleted file mode 100644 index edbc005d..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:costmap?module=alto-costmap-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-costmap-test - alto-costmap-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index 66c25f72..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-costmap-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java deleted file mode 100644 index 1d960239..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/alto/core/impl/costmap/test/AltoCostmapProvider.java +++ /dev/null @@ -1,248 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.costmap.test; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils; -import org.opendaylight.alto.core.service.model.costmap.CostmapUtils; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource; -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder; - -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.AltoModelCostmapService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.QueryOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeCostmap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.ResourceTypeFilteredCostmap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.alto.request.costmap.request.CostmapRequest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.alto.response.costmap.response.CostmapResponseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.cost.type.data.CostType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.request.data.CostmapParams; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.CostmapResponseDataBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.CostmapSource; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.CostmapSourceBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.CostmapDestination; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.CostmapDestinationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rev151021.costmap.response.data.costmap.response.data.costmap.source.costmap.destination.Cost; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.costmap.filter.data.CostmapFilter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.input.request.costmap.request.costmap.params.filter.CostmapFilterData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.output.response.costmap.response.costmap.response.data.costmap.source.costmap.destination.cost.NumericalBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.costmap.rfc7285.rev151021.query.output.response.costmap.response.costmap.response.data.costmap.source.costmap.destination.cost.OrdinalBuilder; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostTypeBuilder; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoCostmapProvider implements BindingAwareProvider, AutoCloseable, AltoModelCostmapService { - - private static final Logger LOG = LoggerFactory.getLogger(AltoCostmapProvider.class); - - - private DataBroker m_dataBroker = null; - private BindingAwareBroker.RoutedRpcRegistration m_serviceReg = null; - private ListenerRegistration m_listener=null; - - private static final String TEST_COSTMAP_NAME="test-model-costmap"; - private static final String TEST_FILTERED_COSTMAP_NAME="test-model-filtered-costmap"; - private static final ResourceId TEST_COSTMAP_RID = new ResourceId(TEST_COSTMAP_NAME); - private static final CostMetric COST_METRIC_ROUTINGCOST = new CostMetric("routingcost"); - private static final String COST_MODE_ORDINAL = "ordinal"; - private InstanceIdentifier m_testIID = null; - - protected void createContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - CapabilitiesCostTypeBuilder cctBuilder = new CapabilitiesCostTypeBuilder(); - cctBuilder.setCostType(Arrays.asList( - CostmapUtils.createCostTypeCapability(COST_METRIC_ROUTINGCOST, - COST_MODE_ORDINAL) - )); - CapabilitiesBuilder builder = new CapabilitiesBuilder(); - builder.addAugmentation(CapabilitiesCostType.class, cctBuilder.build()); - - ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_COSTMAP_NAME, - ResourceTypeCostmap.class, - builder.build(), wx); - - ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_COSTMAP_NAME, wx); - - ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_COSTMAP_NAME, - ResourceTypeFilteredCostmap.class, - builder.build(), wx); - - ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_COSTMAP_NAME, wx); - - wx.submit().get(); - } - - - protected void removeContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_COSTMAP_NAME, wx); - - wx.submit().get(); - } - - protected void setupListener() { - ResourcepoolUtils.ContextTagListener listener = new ResourcepoolUtils.ContextTagListener(m_testIID, m_serviceReg); - m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testIID,listener, AsyncDataBroker.DataChangeScope.SUBTREE); - - assert m_listener != null; - } - - @Override - public void onSessionInitiated(BindingAwareBroker.ProviderContext session) { - LOG.info("AltoModelCostmapProvider Session Initiated"); - - m_dataBroker = session.getSALService(DataBroker.class); - m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_COSTMAP_NAME); - m_serviceReg = session.addRoutedRpcImplementation(AltoModelCostmapService.class, this); - - - try{ - setupListener(); - createContextTag(); - } catch (Exception e){ - } - - } - - protected Cost createNumericalCost(double cost) { - NumericalBuilder builder; - builder = new NumericalBuilder(); - builder.setCost(new BigDecimal(cost)); - return builder.build(); - } - - protected Cost createOrdinalCost(int order) { - OrdinalBuilder builder=new OrdinalBuilder(); - builder.setCost(order); - return builder.build(); - } - - - @Override - public void close() throws Exception { - LOG.info("AltoModelCostProvider Closed"); - - if (m_serviceReg != null) { - m_serviceReg.close(); - } - - try { - removeContextTag(); - } catch (Exception e) { - } - } - - - - - @Override - public Future> query(QueryInput input) { - if (!input.getType().equals(ResourceTypeCostmap.class) - && !input.getType().equals(ResourceTypeFilteredCostmap.class)) { - return RpcResultBuilder.failed().buildFuture(); - } - - CostmapRequest request = (CostmapRequest)input.getRequest(); - CostmapParams params = request.getCostmapParams(); - - CostType costType = params.getCostType(); -// if(!(params.getFilter() instanceof CostmapFilter)){ -// return RpcResultBuilder.failed().buildFuture(); -// } -// if(!costType.getCostMode().equals("ordinal")){ -// LOG.warn(costType.getCostMode().toString()); -// return RpcResultBuilder.failed().buildFuture(); -// } -// if(!costType.getCostMetric().equals(COST_METRIC_ROUTINGCOST)){ -// LOG.warn(costType.getCostMetric().toString()); -// return RpcResultBuilder.failed().buildFuture(); -// } - LOG.info("query test3"); - - CostmapFilter costmapFilter=((CostmapFilterData)params.getFilter()).getCostmapFilter(); - List pid_src=costmapFilter.getPidSource(); - List pid_dst=costmapFilter.getPidDestination(); - int order = 0; - LinkedList costmapSources = new LinkedList(); - for(PidName src:pid_src){ - LinkedList costmapDestinations= new LinkedList(); - - for (PidName dst : pid_dst){ - CostmapDestinationBuilder costmapDestinationBuilder= new CostmapDestinationBuilder(); - costmapDestinationBuilder.setPidDestination(dst); - costmapDestinationBuilder.setCost(createOrdinalCost(++order)); - costmapDestinations.add(costmapDestinationBuilder.build()); - } - CostmapSourceBuilder costmapSourceBuilder= new CostmapSourceBuilder(); - costmapSourceBuilder.setPidSource(src); - costmapSourceBuilder.setCostmapDestination(costmapDestinations); - costmapSources.add(costmapSourceBuilder.build()); - } - - - - - - CostmapResponseDataBuilder costmapResponseDataBuilder= new CostmapResponseDataBuilder(); - costmapResponseDataBuilder.setCostType(costType); - costmapResponseDataBuilder.setCostmapSource(costmapSources); - - CostmapResponseBuilder costmapResponseBuilder= new CostmapResponseBuilder(); - costmapResponseBuilder.setCostmapResponseData(costmapResponseDataBuilder.build()); - - - QueryOutputBuilder builder = new QueryOutputBuilder(); - - builder.setType(ResourceTypeCostmap.class).setResponse(costmapResponseBuilder.build()); - - - return RpcResultBuilder.success(builder.build()).buildFuture(); - } -} diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java deleted file mode 100644 index bbc4a3cb..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021; - -import org.opendaylight.alto.core.impl.costmap.test.AltoCostmapProvider; - -public class AltoCostmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AbstractAltoCostmapModule { - public AltoCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoCostmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AltoCostmapModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoCostmapProvider provider = new AltoCostmapProvider(); - getBrokerDependency().registerProvider(provider); - return provider; - - } - -} diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java b/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java deleted file mode 100644 index 94d39b87..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-costmap-test-impl yang module local name: alto-model-costmap-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon Nov 23 10:49:33 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021; -public class AltoCostmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021.AbstractAltoCostmapModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang b/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang deleted file mode 100644 index 21f87166..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/main/yang/costmap-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-costmap-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:costmap"; - prefix "alto-model-costmap-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for costmap project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-costmap-test { - base config:module-type; - config:java-name-prefix AltoCostmap; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-costmap-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-costmap-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java b/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java deleted file mode 100644 index ca8d6e32..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021; - -import org.junit.Test; - -public class AltoCostmapModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoCostmapModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java b/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java deleted file mode 100644 index ed42656c..00000000 --- a/alto-core/standard-service-models/model-costmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/costmap/rev151021/AltoCostmapModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.costmap.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.costmap.test.AltoCostmapProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoCostmapModuleTest { - @Test - public void testCustomValidation() { - AltoCostmapModule module = new AltoCostmapModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoCostmapModule module = new AltoCostmapModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoCostmapProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-costmap/it/pom.xml b/alto-core/standard-service-models/model-costmap/it/pom.xml deleted file mode 100644 index ce83a202..00000000 --- a/alto-core/standard-service-models/model-costmap/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-costmap-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-costmap-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-costmap-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java b/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java deleted file mode 100644 index 18f42306..00000000 --- a/alto-core/standard-service-models/model-costmap/it/src/test/java/org/opendaylight/alto/core/it/AltoCostmapIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoCostmapIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoCostmapIT.class); - - @Override - public String getModuleName() { - return "alto-model-costmap-test"; - } - - @Override - public String getInstanceName() { - return "alto-costmap-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-costmap-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-costmap-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoCostmapIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testcostmapFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-costmap/karaf/pom.xml b/alto-core/standard-service-models/model-costmap/karaf/pom.xml deleted file mode 100644 index dc208c74..00000000 --- a/alto-core/standard-service-models/model-costmap/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-costmap-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-costmap-ui - - - - - ${project.groupId} - alto-service-model-costmap-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-costmap-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-costmap/pom.xml b/alto-core/standard-service-models/model-costmap/pom.xml index 26d8cb79..ffec9476 100644 --- a/alto-core/standard-service-models/model-costmap/pom.xml +++ b/alto-core/standard-service-models/model-costmap/pom.xml @@ -1,81 +1,59 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-costmap-aggregator + alto-service-model-costmap 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + - - - minimal - - true + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + - - - api - - + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-endpointcost + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java b/alto-core/standard-service-models/model-costmap/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java similarity index 100% rename from alto-core/standard-service-models/model-costmap/api/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java rename to alto-core/standard-service-models/model-costmap/src/main/java/org/opendaylight/alto/core/service/model/costmap/CostmapUtils.java diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap-rfc7285.yang b/alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap-rfc7285.yang similarity index 100% rename from alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap-rfc7285.yang rename to alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap-rfc7285.yang diff --git a/alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap.yang b/alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap.yang similarity index 100% rename from alto-core/standard-service-models/model-costmap/api/src/main/yang/alto-model-costmap.yang rename to alto-core/standard-service-models/model-costmap/src/main/yang/alto-model-costmap.yang diff --git a/alto-core/standard-service-models/model-endpointcost/api/pom.xml b/alto-core/standard-service-models/model-endpointcost/api/pom.xml deleted file mode 100644 index 81816ca0..00000000 --- a/alto-core/standard-service-models/model-endpointcost/api/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointcost-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-networkmap-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - diff --git a/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml b/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml deleted file mode 100644 index 3dc49acb..00000000 --- a/alto-core/standard-service-models/model-endpointcost/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointcost-artifacts - pom - - - - - ${project.groupId} - alto-service-model-endpointcost-api - ${project.version} - - - ${project.groupId} - alto-service-model-endpointcost-impl - ${project.version} - - - ${project.groupId} - alto-service-model-endpointcost-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/features/pom.xml b/alto-core/standard-service-models/model-endpointcost/features/pom.xml deleted file mode 100644 index b136280f..00000000 --- a/alto-core/standard-service-models/model-endpointcost/features/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-endpointcost-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-endpointcost-impl - ${project.version} - - - ${project.groupId} - alto-service-model-endpointcost-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-endpointcost-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - diff --git a/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml b/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml deleted file mode 100644 index e5968cfb..00000000 --- a/alto-core/standard-service-models/model-endpointcost/features/src/main/features/features.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - odl-alto-service-model-networkmap-api - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-endpointcost-api - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-impl/${project.version}/xml/config - - - - odl-alto-service-model-endpointcost - odl-restconf - - - - odl-alto-service-model-endpointcost-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-endpointcost/impl/pom.xml b/alto-core/standard-service-models/model-endpointcost/impl/pom.xml deleted file mode 100644 index 9dabb499..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointcost-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - - ${project.groupId} - alto-service-model-endpointcost-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml deleted file mode 100644 index cad56de2..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:endpointcost?module=alto-endpointcost-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-endpointcost-test - alto-endpointcost-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index de7797c7..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-endpointcost-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java deleted file mode 100644 index d268a3b4..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/alto/core/impl/endpointcost/test/AltoEndpointCostProvider.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.endpointcost.test; - -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; - -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils; -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener; -import org.opendaylight.alto.core.service.model.endpointcost.EndpointcostUtils; - -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostMetric; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.CostTypeData; - -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource; -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.resource.CapabilitiesBuilder; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.AltoModelEndpointcostService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostType; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.CapabilitiesCostTypeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.ResourceTypeEndpointcost; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.alto.request.endpointcost.request.EndpointcostRequest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.alto.response.endpointcost.response.EndpointcostResponseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.endpointcost.request.data.EndpointcostParams; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv4AddressData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv6AddressData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpoint.filter.data.EndpointFilter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.EndpointCostMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.EndpointCost; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.EndpointCostBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.Cost; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.DestinationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.endpointcostmap.response.data.endpoint.cost.map.endpoint.cost.SourceBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.input.request.endpointcost.request.endpointcost.params.filter.EndpointFilterData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.EndpointCostmapDataBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.cost.NumericalBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.cost.OrdinalBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.typed.address.data.Address; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoEndpointCostProvider implements BindingAwareProvider, AutoCloseable, AltoModelEndpointcostService { - - private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointCostProvider.class); - - private DataBroker m_dataBroker = null; - private RoutedRpcRegistration m_serviceReg = null; - private ListenerRegistration m_listener = null; - - private static final String TEST_ENDPOINTCOST_NAME = "test-model-endpointcost"; - private static final ResourceId TEST_ENDPOINTCOST_RID = new ResourceId(TEST_ENDPOINTCOST_NAME); - private static final CostMetric COST_METRIC_ROUTINGCOST = new CostMetric("routingcost"); - private static final String COST_MODE_ORDINAL = "ordinal"; - private InstanceIdentifier m_testIID = null; - - protected void createContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - CapabilitiesCostTypeBuilder cctBuilder = new CapabilitiesCostTypeBuilder(); - cctBuilder.setCostType(Arrays.asList( - EndpointcostUtils.createCostTypeCapability(COST_METRIC_ROUTINGCOST, - COST_MODE_ORDINAL) - )); - CapabilitiesBuilder builder = new CapabilitiesBuilder(); - builder.addAugmentation(CapabilitiesCostType.class, cctBuilder.build()); - - ResourcepoolUtils.createResourceWithCapabilities(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTCOST_NAME, - ResourceTypeEndpointcost.class, - builder.build(), wx); - - ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTCOST_NAME, wx); - - wx.submit().get(); - } - - protected void removeContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTCOST_NAME, wx); - - wx.submit().get(); - } - - protected void setupListener() { - ContextTagListener listener = new ContextTagListener(m_testIID, m_serviceReg); - m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testIID,listener, DataChangeScope.SUBTREE); - - assert m_listener != null; - } - - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelEndpointCostProvider Session Initiated"); - - m_dataBroker = session.getSALService(DataBroker.class); - m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTCOST_NAME); - m_serviceReg = session.addRoutedRpcImplementation(AltoModelEndpointcostService.class, this); - - try { - setupListener(); - createContextTag(); - } catch (Exception e) { - } - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - - if (m_serviceReg != null) { - m_serviceReg.close(); - } - - try { - removeContextTag(); - } catch (Exception e) { - } - } - - protected Cost createNumericalCost(double cost) { - NumericalBuilder builder; - builder = new NumericalBuilder(); - - builder.setCost(new BigDecimal(cost)); - return builder.build(); - } - - protected Cost createOrdinalCost(int order) { - OrdinalBuilder builder; - builder = new OrdinalBuilder(); - - builder.setCost(order); - return builder.build(); - } - - protected Address createSourceAddress(Address from) { - if (from instanceof Ipv4AddressData) { - org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv4Builder builder; - builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv4Builder(); - - builder.fieldsFrom((Ipv4AddressData)from); - return builder.build(); - } else if (from instanceof Ipv6AddressData) { - org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv6Builder builder; - builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.source.address.Ipv6Builder(); - - builder.fieldsFrom((Ipv6AddressData)from); - return builder.build(); -} - return null; - } - - protected Address createDestinationAddress(Address from) { - if (from instanceof Ipv4AddressData) { - org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv4Builder builder; - builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv4Builder(); - - builder.fieldsFrom((Ipv4AddressData)from); - return builder.build(); - } else if (from instanceof Ipv6AddressData) { - org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv6Builder builder; - builder = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.query.output.response.endpointcost.response.endpointcost.data.endpoint.costmap.data.endpoint.cost.map.endpoint.cost.destination.address.Ipv6Builder(); - - builder.fieldsFrom((Ipv6AddressData)from); - return builder.build(); -} - return null; - } - - @Override - public Future> query(QueryInput input) { - if (!input.getType().equals(ResourceTypeEndpointcost.class)) { - return RpcResultBuilder.failed().buildFuture(); - } - EndpointcostRequest request = (EndpointcostRequest)input.getRequest(); - EndpointcostParams params = request.getEndpointcostParams(); - - CostTypeData costType = params.getCostType(); - if (!costType.getCostMode().equals(COST_MODE_ORDINAL)) { - LOG.warn(costType.getCostMode().toString()); - return RpcResultBuilder.failed().buildFuture(); - } - if (!costType.getCostMetric().equals(COST_METRIC_ROUTINGCOST)) { - LOG.warn(costType.getCostMetric().toString()); - return RpcResultBuilder.failed().buildFuture(); - } - - if (!(params.getFilter() instanceof EndpointFilterData)) { - return RpcResultBuilder.failed().buildFuture(); - } - - EndpointFilter filter = ((EndpointFilterData)params.getFilter()).getEndpointFilter(); - List source = filter.getSource(); - List destination = filter.getDestination(); - - int order = 0; - LinkedList ecList = new LinkedList(); - for (TypedAddressData src: source) { - for (TypedAddressData dst: destination) { - SourceBuilder srcBuilder = new SourceBuilder(); - srcBuilder.setAddress(createSourceAddress(src.getAddress())); - - DestinationBuilder dstBuilder = new DestinationBuilder(); - dstBuilder.setAddress(createDestinationAddress(dst.getAddress())); - - - EndpointCostBuilder ecBuilder = new EndpointCostBuilder(); - ecBuilder.setSource(srcBuilder.build()); - ecBuilder.setDestination(dstBuilder.build()); - ecBuilder.setCost(createOrdinalCost(++order)); - - ecList.add(ecBuilder.build()); - } - } - - EndpointCostMapBuilder ecmBuilder = new EndpointCostMapBuilder(); - ecmBuilder.setEndpointCost(ecList); - - EndpointCostmapDataBuilder ecmdBuilder = new EndpointCostmapDataBuilder(); - ecmdBuilder.setEndpointCostMap(ecmBuilder.build()); - - EndpointcostResponseBuilder ecrBuilder = new EndpointcostResponseBuilder(); - ecrBuilder.setEndpointcostData(ecmdBuilder.build()); - - QueryOutputBuilder builder = new QueryOutputBuilder(); - builder.setType(ResourceTypeEndpointcost.class).setResponse(ecrBuilder.build()); - return RpcResultBuilder.success(builder.build()).buildFuture(); - } - -} diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java deleted file mode 100644 index 8b836866..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021; - -import org.opendaylight.alto.core.impl.endpointcost.test.AltoEndpointCostProvider; - -public class AltoEndpointCostModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AbstractAltoEndpointCostModule { - public AltoEndpointCostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoEndpointCostModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AltoEndpointCostModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoEndpointCostProvider provider = new AltoEndpointCostProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java b/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java deleted file mode 100644 index beaac024..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-endpointcost-test-impl yang module local name: alto-model-endpointcost-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Oct 28 21:04:15 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021; -public class AltoEndpointCostModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021.AbstractAltoEndpointCostModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang b/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang deleted file mode 100644 index afee1fad..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/main/yang/alto-endpoint-test-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-endpointcost-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:endpointcost"; - prefix "alto-model-endpointcost-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for endpointcost project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-endpointcost-test { - base config:module-type; - config:java-name-prefix AltoEndpointCost; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-endpointcost-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-endpointcost-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java b/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java deleted file mode 100644 index 64c86846..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021; - -import org.junit.Test; - -public class AltoEndpointCostModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoEndpointCostModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java b/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java deleted file mode 100644 index ce088dd3..00000000 --- a/alto-core/standard-service-models/model-endpointcost/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointcost/rev151021/AltoEndpointCostModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointcost.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.endpointcost.test.AltoEndpointCostProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoEndpointCostModuleTest { - @Test - public void testCustomValidation() { - AltoEndpointCostModule module = new AltoEndpointCostModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoEndpointCostModule module = new AltoEndpointCostModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoEndpointCostProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-endpointcost/it/pom.xml b/alto-core/standard-service-models/model-endpointcost/it/pom.xml deleted file mode 100644 index 22feaefe..00000000 --- a/alto-core/standard-service-models/model-endpointcost/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointcost-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-endpointcost-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-endpointcost-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java b/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java deleted file mode 100644 index 533f25c3..00000000 --- a/alto-core/standard-service-models/model-endpointcost/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoEndpointcostIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointcostIT.class); - - @Override - public String getModuleName() { - return "alto-model-endpointcost-test"; - } - - @Override - public String getInstanceName() { - return "alto-endpointcost-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-endpointcost-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-endpointcost-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoEndpointcostIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testendpointcostFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml b/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml deleted file mode 100644 index bb15f342..00000000 --- a/alto-core/standard-service-models/model-endpointcost/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointcost-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-endpointcost-ui - - - - - ${project.groupId} - alto-service-model-endpointcost-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-endpointcost-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-endpointcost/pom.xml b/alto-core/standard-service-models/model-endpointcost/pom.xml index 170c774e..2a18b57a 100644 --- a/alto-core/standard-service-models/model-endpointcost/pom.xml +++ b/alto-core/standard-service-models/model-endpointcost/pom.xml @@ -1,79 +1,59 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-endpointcost-aggregator + alto-service-model-endpointcost 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-networkmap + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java b/alto-core/standard-service-models/model-endpointcost/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java similarity index 100% rename from alto-core/standard-service-models/model-endpointcost/api/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java rename to alto-core/standard-service-models/model-endpointcost/src/main/java/org/opendaylight/alto/core/service/model/endpointcost/EndpointcostUtils.java diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost-rfc7285.yang b/alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost-rfc7285.yang similarity index 100% rename from alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost-rfc7285.yang rename to alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost-rfc7285.yang diff --git a/alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost.yang b/alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost.yang similarity index 100% rename from alto-core/standard-service-models/model-endpointcost/api/src/main/yang/alto-model-endpointcost.yang rename to alto-core/standard-service-models/model-endpointcost/src/main/yang/alto-model-endpointcost.yang diff --git a/alto-core/standard-service-models/model-endpointproperty/api/pom.xml b/alto-core/standard-service-models/model-endpointproperty/api/pom.xml deleted file mode 100644 index 569b31eb..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/api/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointproperty-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-networkmap-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml b/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml deleted file mode 100644 index 85d6da69..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/artifacts/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointproperty-artifacts - 0.5.0-SNAPSHOT - pom - - - - - ${project.groupId} - alto-service-model-endpointproperty-api - ${project.version} - - - ${project.groupId} - alto-service-model-endpointproperty-impl - ${project.version} - - - ${project.groupId} - alto-service-model-endpointproperty-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/features/pom.xml b/alto-core/standard-service-models/model-endpointproperty/features/pom.xml deleted file mode 100644 index 145a1d11..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/features/pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-endpointproperty-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-endpointproperty-impl - ${project.version} - - - ${project.groupId} - alto-service-model-endpointproperty-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-endpointproperty-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - org.opendaylight.alto.core - alto-northbound-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-impl - ${project.version} - xml - config - - - - org.opendaylight.alto.core - alto-service-model-ird-api - ${project.version} - - - - org.opendaylight.alto.basic - alto-simple-ird-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointproperty-api - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointproperty-impl - ${project.version} - - - - org.opendaylight.alto.core - alto-northbound-route-endpointproperty-impl - ${project.version} - xml - config - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml b/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml deleted file mode 100644 index 127e9f57..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/features/src/main/features/features.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-endpointproperty-api - mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config - - mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-impl/${project.version}/xml/config - - - - odl-alto-service-model-endpointproperty - odl-restconf - - - - odl-alto-service-model-endpointproperty-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - - odl-mdsal-models - mvn:org.opendaylight.alto.core/alto-basic-types/${project.version} - - - - - odl-alto-standard-service-models - odl-alto-northbound - - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-route-endpointproperty-impl/${project.version}/xml/config - - - - - odl-restconf - odl-mdsal-models - odl-mdsal-broker - - mvn:org.opendaylight.alto.core/alto-northbound-api/${project.version} - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version} - - mvn:org.opendaylight.alto.core/alto-northbound-impl/${project.version}/xml/config - - - - - odl-mdsal-models - odl-alto-standard-types - odl-alto-resourcepool - - mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-ird-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-costmap-api/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-endpointproperty-api/${project.version} - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml b/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml deleted file mode 100644 index ed42bb72..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointproperty-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - - ${project.groupId} - alto-service-model-endpointproperty-api - ${project.version} - - - - ${project.groupId} - alto-northbound-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml deleted file mode 100644 index 4f2b278d..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:endpointproperty?module=alto-endpointproperty-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-endpointproperty-test - alto-endpointproperty-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index 954d50d3..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-endpointproperty-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java deleted file mode 100644 index f3dcb2d4..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/alto/core/impl/endpointproperty/test/AltoEndpointPropertyProvider.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.endpointproperty.test; - - -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.opendaylight.alto.core.northbound.api.exception.AltoBadFormatException; -import org.opendaylight.alto.core.northbound.api.exception.AltoErrorTestException; -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.SpecificEndpointProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.AltoModelEndpointpropertyService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.QueryOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.ResourceTypeEndpointproperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.alto.request.endpointproperty.request.EndpointpropertyRequest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.alto.response.endpointproperty.response.EndpointpropertyResponseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rev151021.endpointproperty.request.data.EndpointpropertyParams; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.TypedAddressData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointproperty.filter.data.endpointproperty.filter.PropertyFilter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.EndpointPropertyMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.EndpointProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.EndpointPropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.Properties; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.PropertiesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.SourceBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.endpointpropertymap.response.data.endpoint.property.map.endpoint.property.properties.PropertyContainerBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.input.request.endpointproperty.request.endpointproperty.params.filter.EndpointpropertyFilterData; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.input.request.endpointproperty.request.endpointproperty.params.filter.endpointproperty.filter.data.endpointproperty.filter.property.filter.property.InputGlobalProperty; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.EndpointPropertymapDataBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.endpoint.propertymap.data.endpoint.property.map.endpoint.property.properties.property.container.property.OutputResourceSpecificPropertyBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointproperty.rfc7285.rev151021.query.output.response.endpointproperty.response.endpointproperty.data.endpoint.propertymap.data.endpoint.property.map.endpoint.property.properties.property.value.PidNameBuilder; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoEndpointPropertyProvider implements BindingAwareProvider, AutoCloseable, AltoModelEndpointpropertyService { - - private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointPropertyProvider.class); - - private DataBroker m_dataBroker = null; - private RoutedRpcRegistration m_serviceReg = null; - private ListenerRegistration m_listener=null; - - private static final String TEST_ENDPOINTPROPERTY_NAME="test-model-endpointproperty"; - private static final ResourceId TEST_ENDPOINTPROPERTY_RID = new ResourceId(TEST_ENDPOINTPROPERTY_NAME); - private InstanceIdentifier m_testIID = null; - - protected void createContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTPROPERTY_NAME, - ResourceTypeEndpointproperty.class, - wx - ); - - ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTPROPERTY_NAME, wx); - - wx.submit().get(); - } - - - protected void removeContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTPROPERTY_NAME, wx); - - wx.submit().get(); - } - - protected void setupListener() { - ResourcepoolUtils.ContextTagListener listener = new ResourcepoolUtils.ContextTagListener(m_testIID, m_serviceReg); - m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testIID,listener, AsyncDataBroker.DataChangeScope.SUBTREE); - - assert m_listener != null; - } - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelEndpoinPropertyProvider Session Initiated"); - - m_dataBroker = session.getSALService(DataBroker.class); - m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_ENDPOINTPROPERTY_NAME); - m_serviceReg = session.addRoutedRpcImplementation(AltoModelEndpointpropertyService.class, this); - - try { - setupListener(); - createContextTag(); - } catch (Exception e) { - } - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - if (m_serviceReg != null) { - m_serviceReg.close(); - } - - try { - removeContextTag(); - } catch (Exception e) { - } - } - - @Override - public Future> query(QueryInput input) { - LOG.info("test-model-endpointproperty has been called"); - if (!input.getType().equals(ResourceTypeEndpointproperty.class)) { - return RpcResultBuilder.failed().buildFuture(); - } - - EndpointpropertyRequest request = (EndpointpropertyRequest)input.getRequest(); - EndpointpropertyParams params = request.getEndpointpropertyParams(); - EndpointpropertyFilterData filter= (EndpointpropertyFilterData)params.getFilter(); - - List endpoints=filter.getEndpointpropertyFilter().getEndpointFilter(); - List properties = filter.getEndpointpropertyFilter().getPropertyFilter(); - - for (PropertyFilter property: properties) { - if (property.getProperty() instanceof InputGlobalProperty) { - String propertyString = ((InputGlobalProperty)property.getProperty()).getGlobalProperty().getValue(); - if (propertyString.equals("no-such-property")) { - throw new AltoBadFormatException(AltoErrorTestException.ERROR_CODES.E_INVALID_FIELD_VALUE.name(), "properties", "no-such-property"); - } - } - } - - int order = 0; - LinkedList eppist = new LinkedList(); - for (TypedAddressData endpoint: endpoints) { - SourceBuilder srcBuilder = new SourceBuilder(); - srcBuilder.setAddress(endpoint.getAddress()); - - PidName pidName = new PidName("PID1"); - PidNameBuilder pidNameBuilder = new PidNameBuilder(); - pidNameBuilder.setValue(pidName); - - EndpointPropertyBuilder epBuilder = new EndpointPropertyBuilder(); - epBuilder.setSource(srcBuilder.build()); - - LinkedList propertiesInResponse = new LinkedList(); - PropertiesBuilder propertiesBuilder = new PropertiesBuilder(); - PropertyContainerBuilder pcBuilder = new PropertyContainerBuilder(); - pcBuilder.setProperty( - new OutputResourceSpecificPropertyBuilder(). - setResourceSpecificProperty(new SpecificEndpointProperty("my-default-networkmap.pid")).build()); - propertiesBuilder.setPropertyContainer(pcBuilder.build()).setPropertyValue(pidNameBuilder.build()); - propertiesInResponse.add(propertiesBuilder.build()); - epBuilder.setProperties(propertiesInResponse); - //propertiesBuilder.setPropertyContainer(new PropertyContainerBuilder().build()).setPropertyValue(pidName); - - - /*for (TypedPropertyData property: properties) { - - - // SourceBuilder srcBuilder = new SourceBuilder(); - // srcBuilder.setAddress(endpoint.getAddress()); - - - // PropertyContainerBuilder propertyBuilder = new PropertyContainerBuilder(); - // propertyBuilder.setProperty(property.getProperty()); - - PidName pidName = new PidName("PID1"); - PidNameBuilder pidNameBuilder = new PidNameBuilder(); - pidNameBuilder.setValue(pidName); - - - - EndpointPropertyBuilder epBuilder = new EndpointPropertyBuilder(); - epBuilder.setSource(srcBuilder.build()); - epBuilder.setProperties() - setProperty(propertyBuilder.build()); - epBuilder.setPropertyValue(pidNameBuilder.build()); - - - eppist.add(epBuilder.build()); - }*/ - eppist.add(epBuilder.build()); - } - - EndpointPropertyMapBuilder endpointPropertyMapBuilder = new EndpointPropertyMapBuilder(); - endpointPropertyMapBuilder.setEndpointProperty(eppist); - - EndpointPropertymapDataBuilder endpointPropertymapDataBuilder = new EndpointPropertymapDataBuilder(); - endpointPropertymapDataBuilder.setEndpointPropertyMap(endpointPropertyMapBuilder.build()); - - EndpointpropertyResponseBuilder endpointpropertyResponseBuilder = new EndpointpropertyResponseBuilder(); - endpointpropertyResponseBuilder.setEndpointpropertyData(endpointPropertymapDataBuilder.build()); - - QueryOutputBuilder queryOutputBuilder = new QueryOutputBuilder(); - queryOutputBuilder.setType(ResourceTypeEndpointproperty.class).setResponse(endpointpropertyResponseBuilder.build()); - return RpcResultBuilder.success(queryOutputBuilder.build()).buildFuture(); - } - -} diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java deleted file mode 100644 index a22d0a99..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021; - -import org.opendaylight.alto.core.impl.endpointproperty.test.AltoEndpointPropertyProvider; - -public class AltoEndpointPropertyModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021.AbstractAltoEndpointPropertyModule { - public AltoEndpointPropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoEndpointPropertyModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, AltoEndpointPropertyModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoEndpointPropertyProvider provider = new AltoEndpointPropertyProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java deleted file mode 100644 index 2a22a1b7..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-endpointproperty-test-impl yang module local name: alto-model-endpointproperty-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Nov 25 19:28:28 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021; -public class AltoEndpointPropertyModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021.AbstractAltoEndpointPropertyModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang b/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang deleted file mode 100644 index 093fe863..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/main/yang/alto-endpoint-test-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-endpointproperty-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:endpointproperty"; - prefix "alto-model-endpointproperty-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for endpointproperty project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-endpointproperty-test { - base config:module-type; - config:java-name-prefix AltoEndpointProperty; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-endpointproperty-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-endpointproperty-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java deleted file mode 100644 index 3562fe33..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleFactoryTest.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021; - -import org.junit.Test; - - -public class AltoEndpointPropertyModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoEndpointPropertyModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java b/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java deleted file mode 100644 index 91b4fb01..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/endpointproperty/rev151021/AltoEndpointPropertyModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.endpointproperty.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.endpointproperty.test.AltoEndpointPropertyProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoEndpointPropertyModuleTest { - @Test - public void testCustomValidation() { - AltoEndpointPropertyModule module = new AltoEndpointPropertyModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoEndpointPropertyModule module = new AltoEndpointPropertyModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoEndpointPropertyProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-endpointproperty/it/pom.xml b/alto-core/standard-service-models/model-endpointproperty/it/pom.xml deleted file mode 100644 index 98e73346..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointproperty-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-endpointproperty-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-endpointproperty-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java b/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java deleted file mode 100644 index 533f25c3..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/it/src/test/java/org/opendaylight/alto/core/it/AltoEndpointcostIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoEndpointcostIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoEndpointcostIT.class); - - @Override - public String getModuleName() { - return "alto-model-endpointcost-test"; - } - - @Override - public String getInstanceName() { - return "alto-endpointcost-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-endpointcost-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-endpointcost-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoEndpointcostIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testendpointcostFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml b/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml deleted file mode 100644 index 17b19b42..00000000 --- a/alto-core/standard-service-models/model-endpointproperty/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-endpointproperty-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-endpointproperty-ui - - - - - ${project.groupId} - alto-service-model-endpointproperty-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-endpointproperty-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-endpointproperty/pom.xml b/alto-core/standard-service-models/model-endpointproperty/pom.xml index 1db45563..576c3c1f 100644 --- a/alto-core/standard-service-models/model-endpointproperty/pom.xml +++ b/alto-core/standard-service-models/model-endpointproperty/pom.xml @@ -1,79 +1,59 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-endpointproperty-aggregator + alto-service-model-endpointproperty 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + + + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-networkmap + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + diff --git a/alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty-rfc7285.yang b/alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty-rfc7285.yang similarity index 100% rename from alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty-rfc7285.yang rename to alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty-rfc7285.yang diff --git a/alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty.yang b/alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty.yang similarity index 100% rename from alto-core/standard-service-models/model-endpointproperty/api/src/main/yang/alto-model-endpointproperty.yang rename to alto-core/standard-service-models/model-endpointproperty/src/main/yang/alto-model-endpointproperty.yang diff --git a/alto-core/standard-service-models/model-ird/api/pom.xml b/alto-core/standard-service-models/model-ird/api/pom.xml deleted file mode 100644 index 6a79d9c8..00000000 --- a/alto-core/standard-service-models/model-ird/api/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-ird-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.mdsal.model - yang-ext - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - diff --git a/alto-core/standard-service-models/model-ird/artifacts/pom.xml b/alto-core/standard-service-models/model-ird/artifacts/pom.xml deleted file mode 100644 index 3dddb62d..00000000 --- a/alto-core/standard-service-models/model-ird/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-ird-artifacts - pom - - - - - ${project.groupId} - alto-service-model-ird-api - ${project.version} - - - ${project.groupId} - alto-service-model-ird-impl - ${project.version} - - - ${project.groupId} - alto-service-model-ird-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-ird/features/pom.xml b/alto-core/standard-service-models/model-ird/features/pom.xml deleted file mode 100644 index 1aed60c0..00000000 --- a/alto-core/standard-service-models/model-ird/features/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-ird-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-ird-impl - ${project.version} - - - ${project.groupId} - alto-service-model-ird-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-ird-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - diff --git a/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml b/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml deleted file mode 100644 index 39650f32..00000000 --- a/alto-core/standard-service-models/model-ird/features/src/main/features/features.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - mvn:org.opendaylight.alto.core/alto-service-model-ird-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-ird-api - mvn:org.opendaylight.alto.core/alto-service-model-ird-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-ird-impl/${project.version}/xml/config - - - - odl-alto-service-model-ird - odl-restconf - - - - odl-alto-service-model-ird-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-ird/impl/pom.xml b/alto-core/standard-service-models/model-ird/impl/pom.xml deleted file mode 100644 index 5cec77de..00000000 --- a/alto-core/standard-service-models/model-ird/impl/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-ird-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-ird-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml deleted file mode 100644 index 9c566159..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:ird?module=alto-ird-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-ird-test - alto-ird-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index 0ef1e20f..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-ird-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java deleted file mode 100644 index 27e45dab..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/alto/core/impl/ird/test/AltoIrdProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.ird.test; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoIrdProvider implements BindingAwareProvider, AutoCloseable { - - private static final Logger LOG = LoggerFactory.getLogger(AltoIrdProvider.class); - - private DataBroker m_dataBrokerService = null; - - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelIrdProvider Session Initiated"); - m_dataBrokerService = session.getSALService(DataBroker.class); - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - } -} diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java deleted file mode 100644 index 19cadc87..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021; - -import org.opendaylight.alto.core.impl.ird.test.AltoIrdProvider; - -public class AltoIrdModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AbstractAltoIrdModule { - public AltoIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoIrdModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AltoIrdModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoIrdProvider provider = new AltoIrdProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java b/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java deleted file mode 100644 index b7698743..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-ird-test-impl yang module local name: alto-model-ird-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Oct 28 11:47:28 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021; -public class AltoIrdModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021.AbstractAltoIrdModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang b/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang deleted file mode 100644 index 08e9d95a..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/main/yang/ird-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-ird-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:ird"; - prefix "alto-model-ird-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for ird project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-ird-test { - base config:module-type; - config:java-name-prefix AltoIrd; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-ird-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-ird-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java b/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java deleted file mode 100644 index 347e70ba..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021; - -import org.junit.Test; - -public class AltoIrdModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoIrdModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java b/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java deleted file mode 100644 index 07009419..00000000 --- a/alto-core/standard-service-models/model-ird/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/ird/rev151021/AltoIrdModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.ird.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.ird.test.AltoIrdProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoIrdModuleTest { - @Test - public void testCustomValidation() { - AltoIrdModule module = new AltoIrdModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoIrdModule module = new AltoIrdModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoIrdProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-ird/it/pom.xml b/alto-core/standard-service-models/model-ird/it/pom.xml deleted file mode 100644 index e432523f..00000000 --- a/alto-core/standard-service-models/model-ird/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-ird-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-ird-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-ird-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java b/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java deleted file mode 100644 index c240b3cf..00000000 --- a/alto-core/standard-service-models/model-ird/it/src/test/java/org/opendaylight/alto/core/it/AltoIrdIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoIrdIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoIrdIT.class); - - @Override - public String getModuleName() { - return "alto-model-ird-test"; - } - - @Override - public String getInstanceName() { - return "alto-ird-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-ird-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-ird-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoIrdIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testirdFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-ird/karaf/pom.xml b/alto-core/standard-service-models/model-ird/karaf/pom.xml deleted file mode 100644 index 3cb60668..00000000 --- a/alto-core/standard-service-models/model-ird/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-ird-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-ird-ui - - - - - ${project.groupId} - alto-service-model-ird-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-ird-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-ird/pom.xml b/alto-core/standard-service-models/model-ird/pom.xml index 1b12ce2b..dd47ea1b 100644 --- a/alto-core/standard-service-models/model-ird/pom.xml +++ b/alto-core/standard-service-models/model-ird/pom.xml @@ -1,79 +1,53 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-ird-aggregator + alto-service-model-ird 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + yang-ext + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + + diff --git a/alto-core/standard-service-models/model-ird/api/src/main/yang/alto-model-ird.yang b/alto-core/standard-service-models/model-ird/src/main/yang/alto-model-ird.yang similarity index 100% rename from alto-core/standard-service-models/model-ird/api/src/main/yang/alto-model-ird.yang rename to alto-core/standard-service-models/model-ird/src/main/yang/alto-model-ird.yang diff --git a/alto-core/standard-service-models/model-networkmap/api/pom.xml b/alto-core/standard-service-models/model-networkmap/api/pom.xml deleted file mode 100644 index ade13d19..00000000 --- a/alto-core/standard-service-models/model-networkmap/api/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - org.opendaylight.mdsal - binding-parent - 0.11.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-networkmap-api - 0.5.0-SNAPSHOT - bundle - - - - org.opendaylight.alto.core - alto-basic-types - ${project.version} - - - - org.opendaylight.alto.core - alto-resourcepool-api - ${project.version} - - - - org.opendaylight.alto.core - alto-service-model-base-api - ${project.version} - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - - org.opendaylight.mdsal.model - yang-ext - - - diff --git a/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml b/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml deleted file mode 100644 index cc69e8fc..00000000 --- a/alto-core/standard-service-models/model-networkmap/artifacts/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - org.opendaylight.alto - alto-parent - 0.5.0-SNAPSHOT - ../../../../ - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-networkmap-artifacts - pom - - - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - ${project.groupId} - alto-service-model-networkmap-impl - ${project.version} - - - ${project.groupId} - alto-service-model-networkmap-features - ${project.version} - features - xml - - - - diff --git a/alto-core/standard-service-models/model-networkmap/features/pom.xml b/alto-core/standard-service-models/model-networkmap/features/pom.xml deleted file mode 100644 index 622dcd92..00000000 --- a/alto-core/standard-service-models/model-networkmap/features/pom.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.core - alto-service-model-networkmap-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - ${project.groupId} - alto-service-model-networkmap-impl - ${project.version} - - - ${project.groupId} - alto-service-model-networkmap-impl - ${project.version} - xml - config - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - ${project.groupId} - alto-service-model-base-features - features - ${project.version} - xml - runtime - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - diff --git a/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml b/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml deleted file mode 100644 index 3388f4ae..00000000 --- a/alto-core/standard-service-models/model-networkmap/features/src/main/features/features.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.alto.core/alto-service-model-base-features/${project.version}/xml/features - - - odl-mdsal-models - odl-alto-service-model-base - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version} - - - - odl-mdsal-broker - odl-alto-service-model-networkmap-api - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-impl/${project.version} - mvn:org.opendaylight.alto.core/alto-service-model-networkmap-impl/${project.version}/xml/config - - - - odl-alto-service-model-networkmap - odl-restconf - - - - odl-alto-service-model-networkmap-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-core/standard-service-models/model-networkmap/impl/pom.xml b/alto-core/standard-service-models/model-networkmap/impl/pom.xml deleted file mode 100644 index 2870cb98..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-networkmap-impl - 0.5.0-SNAPSHOT - bundle - - - ${project.groupId} - alto-service-model-base-api - ${project.version} - - - - ${project.groupId} - alto-resourcepool-api - ${project.version} - - - - ${project.groupId} - alto-service-model-networkmap-api - ${project.version} - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml b/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml deleted file mode 100644 index 6a6a4c01..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/default-config.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - urn:opendaylight:alto:service:model:test:networkmap?module=alto-networkmap-test-impl&revision=2015-10-21 - urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 - - - - - - - prefix:alto-model-networkmap-test - alto-networkmap-test - - binding:binding-broker-osgi-registry - binding-osgi-broker - - - - - - diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml b/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml deleted file mode 100644 index 7df2f5e2..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/config/maven-metadata-local.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - org.opendaylight.alto.core - alto-service-model-networkmap-impl - 0.2.1-SNAPSHOT - - - true - - 20151028073152 - - - config - xml - 0.2.1-SNAPSHOT - 20151028073152 - - - - diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java deleted file mode 100644 index 8d70c717..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/alto/core/impl/networkmap/test/AltoNetworkmapProvider.java +++ /dev/null @@ -1,230 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.impl.networkmap.test; - -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; - -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; - -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; -import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; - -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils; -import org.opendaylight.alto.core.resourcepool.ResourcepoolUtils.ContextTagListener; - -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; - -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.PidName; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId; -import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.Tag; - -import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeBase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv4; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AddressTypeIpv6; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.AltoModelNetworkmapService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.QueryOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.ResourceTypeFilteredNetworkmap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.ResourceTypeNetworkmap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.alto.request.networkmap.request.NetworkmapRequest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.alto.response.networkmap.response.NetworkmapResponseBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.request.data.NetworkmapFilter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.NetworkMapBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.network.map.Partition; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rev151021.networkmap.response.data.network.map.PartitionBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv4PrefixList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv4PrefixListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv6PrefixList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.networkmap.rfc7285.rev151021.Ipv6PrefixListBuilder; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class AltoNetworkmapProvider implements BindingAwareProvider, AutoCloseable, AltoModelNetworkmapService { - - private static final Logger LOG = LoggerFactory.getLogger(AltoNetworkmapProvider.class); - - private DataBroker m_dataBroker = null; - private RoutedRpcRegistration m_serviceReg = null; - private ListenerRegistration m_listener = null; - private ListenerRegistration m_filteredListener = null; - - private static final String TEST_NETWORKMAP_NAME = "test-model-networkmap"; - private static final String TEST_FILTERED_NETWORKMAP_NAME = "test-model-filtered-networkmap"; - private static final ResourceId TEST_NETWORKMAP_RID = new ResourceId(TEST_NETWORKMAP_NAME); - private InstanceIdentifier m_testIID = null; - private InstanceIdentifier m_testFilteredIID = null; - - protected void createContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_NETWORKMAP_NAME, - ResourceTypeNetworkmap.class, wx); - - Tag tag = ResourcepoolUtils.lazyUpdateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_NETWORKMAP_NAME, wx); - - ResourcepoolUtils.createResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_NETWORKMAP_NAME, - ResourceTypeFilteredNetworkmap.class, wx); - - List> dependencies = new LinkedList<>(); - dependencies.add( - (InstanceIdentifier)ResourcepoolUtils.getContextTagIID( - ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_NETWORKMAP_NAME, tag.getValue()) - ); - ResourcepoolUtils.updateResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_NETWORKMAP_NAME, - dependencies, wx); - wx.submit().get(); - } - - protected void removeContextTag() - throws InterruptedException, ExecutionException, TransactionCommitFailedException { - WriteTransaction wx = m_dataBroker.newWriteOnlyTransaction(); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_NETWORKMAP_NAME, wx); - - ResourcepoolUtils.deleteResource(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_NETWORKMAP_NAME, wx); - - wx.submit().get(); - } - - protected void setupListener() { - ContextTagListener listener; - - listener = new ContextTagListener(m_testIID, m_serviceReg); - m_listener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testIID, listener, DataChangeScope.SUBTREE); - - listener = new ContextTagListener(m_testFilteredIID, m_serviceReg); - m_filteredListener = m_dataBroker.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, - m_testFilteredIID, listener, DataChangeScope.SUBTREE); - - assert m_listener != null; - assert m_filteredListener != null; - } - - protected void closeListener() { - if (m_listener != null) { - m_listener.close(); - } - if (m_filteredListener != null) { - m_filteredListener.close(); - } - } - - @Override - public void onSessionInitiated(ProviderContext session) { - LOG.info("AltoModelNetworkProvider Session Initiated"); - - m_dataBroker = session.getSALService(DataBroker.class); - m_serviceReg = session.addRoutedRpcImplementation(AltoModelNetworkmapService.class, this); - m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_NETWORKMAP_NAME); - m_testFilteredIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT, - TEST_FILTERED_NETWORKMAP_NAME); - - try { - setupListener(); - createContextTag(); - } catch (Exception e) { - } - } - - @Override - public void close() throws Exception { - LOG.info("AltoModelBaseProvider Closed"); - - if (m_serviceReg != null) { - m_serviceReg.close(); - } - - try { - removeContextTag(); - } catch (Exception e) { - } - } - - @Override - public Future> query(QueryInput input) { - if (!input.getType().equals(ResourceTypeNetworkmap.class)) { - return RpcResultBuilder.failed().buildFuture(); - } - NetworkmapRequest request = (NetworkmapRequest)input.getRequest(); - NetworkmapFilter filter = request.getNetworkmapFilter(); - - List pids = filter.getPid(); - List> types = filter.getAddressType(); - - List partitionList = new LinkedList<>(); - int index = 0; - for (PidName pid: pids) { - ++index; - - PartitionBuilder partitionBuilder = new PartitionBuilder(); - partitionBuilder.setPid(pid); - - if (types.contains(AddressTypeIpv4.class)) { - LinkedList ipv4List = new LinkedList(); - ipv4List.add(new Ipv4Prefix("192.168." + index + ".0/24")); - - Ipv4PrefixListBuilder v4Builder = new Ipv4PrefixListBuilder(); - v4Builder.setIpv4(ipv4List); - - partitionBuilder.addAugmentation(Ipv4PrefixList.class, v4Builder.build()); - } - if (types.contains(AddressTypeIpv6.class)) { - LinkedList ipv6List = new LinkedList(); - ipv6List.add(new Ipv6Prefix("2001:b8:ca2:" + index + "::0/64")); - - Ipv6PrefixListBuilder v6Builder = new Ipv6PrefixListBuilder(); - v6Builder.setIpv6(ipv6List); - - partitionBuilder.addAugmentation(Ipv6PrefixList.class, v6Builder.build()); - } - - partitionList.add(partitionBuilder.build()); - } - - NetworkMapBuilder nmBuilder = new NetworkMapBuilder(); - nmBuilder.setPartition(partitionList); - - NetworkmapResponseBuilder nmrBuilder = new NetworkmapResponseBuilder(); - nmrBuilder.setNetworkMap(nmBuilder.build()); - - QueryOutputBuilder builder = new QueryOutputBuilder(); - - builder.setType(ResourceTypeNetworkmap.class).setResponse(nmrBuilder.build()); - return RpcResultBuilder.success(builder.build()).buildFuture(); - } - -} diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java deleted file mode 100644 index 5da46248..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModule.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021; - -import org.opendaylight.alto.core.impl.networkmap.test.AltoNetworkmapProvider; - -public class AltoNetworkmapModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AbstractAltoNetworkmapModule { - public AltoNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public AltoNetworkmapModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AltoNetworkmapModule oldModule, java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - AltoNetworkmapProvider provider = new AltoNetworkmapProvider(); - - getBrokerDependency().registerProvider(provider); - return provider; - } - -} diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java b/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java deleted file mode 100644 index 35eff9bd..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: alto-networkmap-test-impl yang module local name: alto-model-networkmap-test -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Oct 28 11:47:28 CST 2015 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021; -public class AltoNetworkmapModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021.AbstractAltoNetworkmapModuleFactory { - -} diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang b/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang deleted file mode 100644 index 89ece97c..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/main/yang/networkmap-impl.yang +++ /dev/null @@ -1,35 +0,0 @@ -module alto-networkmap-test-impl { - yang-version 1; - namespace "urn:opendaylight:alto:service:model:test:networkmap"; - prefix "alto-model-networkmap-test-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} - - description - "Service definition for networkmap project"; - - revision "2015-10-21" { - description - "Initial revision"; - } - - identity alto-model-networkmap-test { - base config:module-type; - config:java-name-prefix AltoNetworkmap; - } - - augment "/config:modules/config:module/config:configuration" { - case alto-model-networkmap-test-impl { - when "/config:modules/config:module/config:type = 'alto-model-networkmap-test'"; - container broker { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity md-sal-binding:binding-broker-osgi-registry; - } - } - } - } - } -} diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java b/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java deleted file mode 100644 index b0989327..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleFactoryTest.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021; - -import org.junit.Test; - -public class AltoNetworkmapModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new AltoNetworkmapModuleFactory(); - } -} diff --git a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java b/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java deleted file mode 100644 index 8d9b2ead..00000000 --- a/alto-core/standard-service-models/model-networkmap/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/model/test/networkmap/rev151021/AltoNetworkmapModuleTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.yang.gen.v1.urn.opendaylight.alto.service.model.test.networkmap.rev151021; - -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.alto.core.impl.networkmap.test.AltoNetworkmapProvider; - -import javax.management.ObjectName; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -public class AltoNetworkmapModuleTest { - @Test - public void testCustomValidation() { - AltoNetworkmapModule module = new AltoNetworkmapModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))).thenReturn(broker); - - // create instance of module with injected mocks - AltoNetworkmapModule module = new AltoNetworkmapModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // verify that the module registered the returned provider with the broker - verify(broker).registerProvider((AltoNetworkmapProvider)closeable); - - // ensure no exceptions on close - closeable.close(); - } -} diff --git a/alto-core/standard-service-models/model-networkmap/it/pom.xml b/alto-core/standard-service-models/model-networkmap/it/pom.xml deleted file mode 100644 index 876ba105..00000000 --- a/alto-core/standard-service-models/model-networkmap/it/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.opendaylight.controller - mdsal-it-parent - 1.6.0-SNAPSHOT - - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-networkmap-it - 0.5.0-SNAPSHOT - bundle - - - false - org.opendaylight.alto.core - alto-service-model-networkmap-karaf - 0.5.0-SNAPSHOT - zip - - - - - ${project.groupId} - alto-service-model-networkmap-features - ${project.version} - - - - diff --git a/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java b/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java deleted file mode 100644 index f54b8a61..00000000 --- a/alto-core/standard-service-models/model-networkmap/it/src/test/java/org/opendaylight/alto/core/it/AltoNetworkmapIT.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2015 Yale University 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.alto.core.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut; - -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class AltoNetworkmapIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(AltoNetworkmapIT.class); - - @Override - public String getModuleName() { - return "alto-model-networkmap-test"; - } - - @Override - public String getInstanceName() { - return "alto-networkmap-test"; - } - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.alto.core") - .artifactId("alto-service-model-networkmap-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-alto-service-model-networkmap-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(AltoNetworkmapIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testnetworkmapFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/alto-core/standard-service-models/model-networkmap/karaf/pom.xml b/alto-core/standard-service-models/model-networkmap/karaf/pom.xml deleted file mode 100644 index 14842468..00000000 --- a/alto-core/standard-service-models/model-networkmap/karaf/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.core - alto-service-model-networkmap-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-service-model-networkmap-ui - - - - - ${project.groupId} - alto-service-model-networkmap-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-service-model-networkmap-features - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-core/standard-service-models/model-networkmap/pom.xml b/alto-core/standard-service-models/model-networkmap/pom.xml index 224def77..b5d26bfa 100644 --- a/alto-core/standard-service-models/model-networkmap/pom.xml +++ b/alto-core/standard-service-models/model-networkmap/pom.xml @@ -1,79 +1,53 @@ - - org.opendaylight.odlparent - odlparent - 2.0.0 + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT + 4.0.0 org.opendaylight.alto.core - alto-service-model-networkmap-aggregator + alto-service-model-networkmap 0.5.0-SNAPSHOT ODL :: alto :: ${project.artifactId} - pom - 4.0.0 - - 3.1.1 - - - - minimal - - true - - - api - - + bundle + + + + org.opendaylight.alto.core + alto-basic-types + ${project.version} + + + + org.opendaylight.alto.core + alto-resourcepool-api + ${project.version} + - - alto-dev - - api - impl - features - artifacts - - + + org.opendaylight.alto.core + alto-service-model-base + ${project.version} + - - alto-test - - api - impl - features - artifacts - karaf - it - - - + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - + + org.opendaylight.mdsal.model + yang-ext + + diff --git a/alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap-rfc7285.yang b/alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap-rfc7285.yang similarity index 100% rename from alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap-rfc7285.yang rename to alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap-rfc7285.yang diff --git a/alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap.yang b/alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap.yang similarity index 100% rename from alto-core/standard-service-models/model-networkmap/api/src/main/yang/alto-model-networkmap.yang rename to alto-core/standard-service-models/model-networkmap/src/main/yang/alto-model-networkmap.yang diff --git a/alto-extensions/incremental-update/api/pom.xml b/alto-extensions/incremental-update/api/pom.xml index 4a480d5c..a86290aa 100644 --- a/alto-extensions/incremental-update/api/pom.xml +++ b/alto-extensions/incremental-update/api/pom.xml @@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/incremental-update/impl/pom.xml b/alto-extensions/incremental-update/impl/pom.xml index da289109..2a97313b 100644 --- a/alto-extensions/incremental-update/impl/pom.xml +++ b/alto-extensions/incremental-update/impl/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/incremental-update/pom.xml b/alto-extensions/incremental-update/pom.xml index aa936879..75840922 100644 --- a/alto-extensions/incremental-update/pom.xml +++ b/alto-extensions/incremental-update/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto incremental-update-aggregator 0.2.0-SNAPSHOT - incremental-update + ODL :: alto :: ${project.artifactId} pom @@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - - maven-site - - - ${user.dir}/deploy-site.xml - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - maven-checkstyle-plugin - - true - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/alto-extensions/multicost/api/pom.xml b/alto-extensions/multicost/api/pom.xml index 57c68827..5299255e 100644 --- a/alto-extensions/multicost/api/pom.xml +++ b/alto-extensions/multicost/api/pom.xml @@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/multicost/impl/pom.xml b/alto-extensions/multicost/impl/pom.xml index db8eca42..88439fc4 100644 --- a/alto-extensions/multicost/impl/pom.xml +++ b/alto-extensions/multicost/impl/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/multicost/pom.xml b/alto-extensions/multicost/pom.xml index 953079f2..5a01267d 100644 --- a/alto-extensions/multicost/pom.xml +++ b/alto-extensions/multicost/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto multicost-aggregator 0.2.0-SNAPSHOT - alto-multicost + ODL :: alto :: ${project.artifactId} pom @@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - - maven-site - - - ${user.dir}/deploy-site.xml - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - maven-checkstyle-plugin - - true - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/alto-extensions/rsade/api/pom.xml b/alto-extensions/rsade/api/pom.xml index 42917353..dfc43f61 100644 --- a/alto-extensions/rsade/api/pom.xml +++ b/alto-extensions/rsade/api/pom.xml @@ -23,6 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/rsade/impl/pom.xml b/alto-extensions/rsade/impl/pom.xml index 972f3f81..08dc49c7 100644 --- a/alto-extensions/rsade/impl/pom.xml +++ b/alto-extensions/rsade/impl/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT - ODL :: org.opendaylight.alto :: ${project.artifactId} + ODL :: alto :: ${project.artifactId} bundle diff --git a/alto-extensions/rsade/pom.xml b/alto-extensions/rsade/pom.xml index 1013a9cd..abdc12d9 100644 --- a/alto-extensions/rsade/pom.xml +++ b/alto-extensions/rsade/pom.xml @@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto routingstate-abstraction-aggregator 0.5.0-SNAPSHOT - routingstate-abstraction + ODL :: alto :: ${project.artifactId} pom @@ -46,59 +46,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - - - maven-site - - - ${user.dir}/deploy-site.xml - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - false - - - aggregate - - aggregate - - package - - - - - maven-checkstyle-plugin - - true - - - - - - - - - ${odl.site.url}/${project.groupId}/${stream}/ - - - - opendaylight-site - ${nexus.site.url}/ - - diff --git a/alto-extensions/simple-pce/artifacts/pom.xml b/alto-extensions/simple-pce/artifacts/pom.xml deleted file mode 100644 index c9ae24e9..00000000 --- a/alto-extensions/simple-pce/artifacts/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - org.opendaylight.alto.ext - alto-spce-artifacts - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - pom - - - - - ${project.groupId} - alto-spce-api - ${project.version} - - - ${project.groupId} - alto-spce-impl - ${project.version} - - - ${project.groupId} - alto-spce-features - ${project.version} - features - xml - - - - diff --git a/alto-extensions/simple-pce/features/pom.xml b/alto-extensions/simple-pce/features/pom.xml deleted file mode 100644 index 35b84351..00000000 --- a/alto-extensions/simple-pce/features/pom.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - org.opendaylight.odlparent - features-parent - 2.0.0 - - - org.opendaylight.alto.ext - alto-spce-features - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - 4.0.0 - - 3.1.1 - - - 0.11.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.6.0-SNAPSHOT - 1.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - etc/opendaylight/karaf - - - - - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.l2switch - l2switch-artifacts - ${l2switch.version} - import - pom - - - - - - org.opendaylight.yangtools - features-yangtools - features - ${yangtools.version} - xml - runtime - - - org.opendaylight.mdsal.model - features-mdsal-model - ${mdsal.model.version} - features - xml - runtime - - - org.opendaylight.controller - features-mdsal - features - ${mdsal.version} - xml - runtime - - - org.opendaylight.netconf - features-restconf - features - ${restconf.version} - xml - runtime - - - org.opendaylight.dluxapps - features-dluxapps - features - ${dluxapps.version} - xml - runtime - - - org.opendaylight.openflowplugin - features-openflowplugin - features - ${openflow.plugin.version} - xml - runtime - - - ${project.groupId} - alto-spce-impl - ${project.version} - - - ${project.groupId} - alto-spce-impl - ${project.version} - xml - config - - - org.opendaylight.alto.ext - alto-spce-api - ${project.version} - - - - org.opendaylight.l2switch - features-l2switch - features - ${l2switch.version} - xml - runtime - - - - - org.opendaylight.alto.spce.network - network-tracker-config - ${l2switch.version} - xml - config - - - - org.opendaylight.alto.spce.network - network-tracker-impl - ${project.version} - runtime - - - org.opendaylight.alto.spce.network - network-tracker-impl - ${project.version} - xml - config - runtime - - - org.opendaylight.alto.spce.network - network-tracker-api - ${project.version} - runtime - - - - org.opendaylight.controller.model - model-inventory - ${mdsal.version} - jar - - - - diff --git a/alto-extensions/simple-pce/features/src/main/features/features.xml b/alto-extensions/simple-pce/features/src/main/features/features.xml deleted file mode 100644 index 907c582d..00000000 --- a/alto-extensions/simple-pce/features/src/main/features/features.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features - mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features - mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features - mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features - mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features - mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features - - odl-mdsal-models - mvn:org.opendaylight.alto.spce.network/network-tracker-api/${project.version} - - - - odl-mdsal-broker - odl-network-tracker-l2switch - odl-network-tracker-api - mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version} - mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}/xml/config - - - - odl-openflowplugin-flow-services - odl-openflowplugin-southbound - - odl-l2switch-switch - - - - - - odl-network-tracker - odl-restconf - - - - odl-network-tracker-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - - odl-mdsal-models - mvn:org.opendaylight.alto.ext/alto-spce-api/${project.version} - - - odl-mdsal-broker - odl-openflowplugin-southbound - odl-openflowplugin-flow-services - odl-alto-spce-api - odl-network-tracker - mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version} - mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}/xml/config - - - odl-alto-spce - odl-restconf - - - odl-alto-spce-rest - odl-mdsal-apidocs - odl-dluxapps-yangman - - - diff --git a/alto-extensions/simple-pce/karaf/pom.xml b/alto-extensions/simple-pce/karaf/pom.xml deleted file mode 100644 index 8264f163..00000000 --- a/alto-extensions/simple-pce/karaf/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - org.opendaylight.odlparent - karaf4-parent - 2.0.0 - - - 4.0.0 - org.opendaylight.alto.ext - alto-spce-karaf - 0.5.0-SNAPSHOT - ODL :: alto :: ${project.artifactId} - - 3.1.1 - - - odl-alto-spce-ui - - - - - ${project.groupId} - alto-spce-artifacts - ${project.version} - pom - import - - - - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - alto-spce-features - features - xml - runtime - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/alto-extensions/simple-pce/pom.xml b/alto-extensions/simple-pce/pom.xml index f28ecc62..597ecc0c 100644 --- a/alto-extensions/simple-pce/pom.xml +++ b/alto-extensions/simple-pce/pom.xml @@ -23,42 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 3.1.1 - - - minimal - - true - - - network-tracker - api - impl - - - - - alto-dev - - network-tracker - api - impl - features - artifacts - - - - - alto-test - - network-tracker - api - impl - features - artifacts - karaf - - - + + network-tracker + api + impl + diff --git a/alto-release-features/features-alto/pom.xml b/alto-release-features/features-alto/pom.xml index dcccee97..ffcda20c 100644 --- a/alto-release-features/features-alto/pom.xml +++ b/alto-release-features/features-alto/pom.xml @@ -17,6 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto features4-alto 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} feature diff --git a/alto-release-features/odl-alto-auto-maps/pom.xml b/alto-release-features/odl-alto-auto-maps/pom.xml index 10b9e907..51fbd18e 100644 --- a/alto-release-features/odl-alto-auto-maps/pom.xml +++ b/alto-release-features/odl-alto-auto-maps/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Auto-maps + OpenDaylight :: alto :: Auto Maps org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-manual-maps/pom.xml b/alto-release-features/odl-alto-manual-maps/pom.xml index df161c64..9ab7a428 100644 --- a/alto-release-features/odl-alto-manual-maps/pom.xml +++ b/alto-release-features/odl-alto-manual-maps/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Manual-maps + OpenDaylight :: alto :: Manual Maps org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-multicost/pom.xml b/alto-release-features/odl-alto-multicost/pom.xml index 23b28a3c..3e2ede66 100644 --- a/alto-release-features/odl-alto-multicost/pom.xml +++ b/alto-release-features/odl-alto-multicost/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Mutlicost support + OpenDaylight :: alto :: Mutlicost Support org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml index 60556ccc..a8ee14c1 100644 --- a/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml +++ b/alto-release-features/odl-alto-nonstandard-northbound-route/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Nonstandard-northbound-route + OpenDaylight :: alto :: Nonstandard Northbound Route diff --git a/alto-release-features/odl-alto-nonstandard-service-models/pom.xml b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml index 9ef411f8..1ef095e8 100644 --- a/alto-release-features/odl-alto-nonstandard-service-models/pom.xml +++ b/alto-release-features/odl-alto-nonstandard-service-models/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Nonstandard-service-models + OpenDaylight :: alto :: Nonstandard Service Models diff --git a/alto-release-features/odl-alto-nonstandard-types/pom.xml b/alto-release-features/odl-alto-nonstandard-types/pom.xml index 544a6d22..200f81d4 100644 --- a/alto-release-features/odl-alto-nonstandard-types/pom.xml +++ b/alto-release-features/odl-alto-nonstandard-types/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Nonstandard-types + OpenDaylight :: alto :: Nonstandard Types diff --git a/alto-release-features/odl-alto-rsabs/pom.xml b/alto-release-features/odl-alto-rsabs/pom.xml index 4cc4baae..df5f211d 100644 --- a/alto-release-features/odl-alto-rsabs/pom.xml +++ b/alto-release-features/odl-alto-rsabs/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Routing state abstraction + OpenDaylight :: alto :: Routing State Abstraction org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-simpleecs/pom.xml b/alto-release-features/odl-alto-simpleecs/pom.xml index 6cb33a6f..e7809e51 100644 --- a/alto-release-features/odl-alto-simpleecs/pom.xml +++ b/alto-release-features/odl-alto-simpleecs/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Simple-ECS + OpenDaylight :: alto :: Simple ECS org.opendaylight.l2switch diff --git a/alto-release-features/odl-alto-simpleird/pom.xml b/alto-release-features/odl-alto-simpleird/pom.xml index b1d3e662..50dad8f1 100644 --- a/alto-release-features/odl-alto-simpleird/pom.xml +++ b/alto-release-features/odl-alto-simpleird/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Simple-IRD + OpenDaylight :: alto :: Simple IRD org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-spce/pom.xml b/alto-release-features/odl-alto-spce/pom.xml index 0c0012d2..0e7918a2 100644 --- a/alto-release-features/odl-alto-spce/pom.xml +++ b/alto-release-features/odl-alto-spce/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: SPCE + OpenDaylight :: alto :: Simple Path Computation Engine org.opendaylight.mdsal.model diff --git a/alto-release-features/odl-alto-standard-northbound-route/pom.xml b/alto-release-features/odl-alto-standard-northbound-route/pom.xml index 6f87fb41..3b766359 100644 --- a/alto-release-features/odl-alto-standard-northbound-route/pom.xml +++ b/alto-release-features/odl-alto-standard-northbound-route/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Standard-northbound-route + OpenDaylight :: alto :: Standard Northbound Route diff --git a/alto-release-features/odl-alto-standard-resource-translator/pom.xml b/alto-release-features/odl-alto-standard-resource-translator/pom.xml index 66884b94..9a21defd 100644 --- a/alto-release-features/odl-alto-standard-resource-translator/pom.xml +++ b/alto-release-features/odl-alto-standard-resource-translator/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Standard-resource-translator + OpenDaylight :: alto :: Standard Resource Translator diff --git a/alto-release-features/odl-alto-standard-service-models/pom.xml b/alto-release-features/odl-alto-standard-service-models/pom.xml index 6a486a5e..05bf0b63 100644 --- a/alto-release-features/odl-alto-standard-service-models/pom.xml +++ b/alto-release-features/odl-alto-standard-service-models/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Standard-service-model + OpenDaylight :: alto :: Standard Service Model org.opendaylight.mdsal.model @@ -53,32 +53,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto.core - alto-service-model-base-api + alto-service-model-base ${project.version} org.opendaylight.alto.core - alto-service-model-ird-api + alto-service-model-ird ${project.version} org.opendaylight.alto.core - alto-service-model-networkmap-api + alto-service-model-networkmap ${project.version} org.opendaylight.alto.core - alto-service-model-endpointcost-api + alto-service-model-endpointcost ${project.version} org.opendaylight.alto.core - alto-service-model-costmap-api + alto-service-model-costmap ${project.version} org.opendaylight.alto.core - alto-service-model-endpointproperty-api + alto-service-model-endpointproperty ${project.version} diff --git a/alto-release-features/odl-alto-standard-types/pom.xml b/alto-release-features/odl-alto-standard-types/pom.xml index 613130a3..e27c3942 100644 --- a/alto-release-features/odl-alto-standard-types/pom.xml +++ b/alto-release-features/odl-alto-standard-types/pom.xml @@ -22,7 +22,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - OpenDaylight :: alto :: Standard-types + OpenDaylight :: alto :: Standard Types org.opendaylight.mdsal.model diff --git a/alto-release-features/pom.xml b/alto-release-features/pom.xml index f0bbb734..bb96166f 100644 --- a/alto-release-features/pom.xml +++ b/alto-release-features/pom.xml @@ -17,28 +17,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.alto features-aggregator 0.5.0-SNAPSHOT + ODL :: alto :: ${project.artifactId} pom + features-alto odl-alto-release odl-alto-core odl-alto-basic odl-alto-extension - odl-alto-spce + + odl-alto-standard-types odl-alto-resourcepool odl-alto-northbound odl-alto-standard-service-models odl-alto-standard-northbound-route odl-alto-standard-resource-translator + odl-alto-nonstandard-types + odl-alto-nonstandard-service-models + odl-alto-nonstandard-northbound-route + + odl-alto-simpleird odl-alto-manual-maps odl-alto-simpleecs odl-alto-auto-maps - odl-alto-nonstandard-types - odl-alto-nonstandard-service-models - odl-alto-nonstandard-northbound-route + + + odl-alto-spce odl-alto-multicost odl-alto-iupd odl-alto-rsabs diff --git a/pom.xml b/pom.xml index 3798e06f..f63ce9d3 100644 --- a/pom.xml +++ b/pom.xml @@ -56,4 +56,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL + + ${odl.site.url}/${project.groupId}/${stream}/ + + + + opendaylight-site + ${nexus.site.url}/ + + -- 2.36.6