Convert the blueprint and remove CSS remnants 85/61185/1
authorTom Pantelis <tompantelis@gmail.com>
Fri, 4 Aug 2017 16:22:01 +0000 (12:22 -0400)
committerTom Pantelis <tompantelis@gmail.com>
Fri, 4 Aug 2017 16:24:25 +0000 (12:24 -0400)
Converted the remaining bundles to use blueprint as the config
subsystem is being deprecated in Nitrogen. Also removed the use
of config-parent and other CSS artifacts.

Change-Id: I9e333b1dc54f90dbf8ef838152cdfc2d785639d6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
65 files changed:
alto-basic/auto-maps/cli/pom.xml
alto-basic/auto-maps/impl/pom.xml
alto-basic/manual-maps/impl/pom.xml
alto-basic/manual-maps/impl/src/main/config/default-config.xml [deleted file]
alto-basic/manual-maps/impl/src/main/config/maven-metadata-local.xml [deleted file]
alto-basic/manual-maps/impl/src/main/java/org/opendaylight/alto/basic/impl/AltoManualMapsProvider.java
alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java [deleted file]
alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java [deleted file]
alto-basic/manual-maps/impl/src/main/resources/org/opendaylight/blueprint/manual-maps-impl.xml [new file with mode: 0644]
alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang [deleted file]
alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java [deleted file]
alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java [deleted file]
alto-basic/simple-ecs/impl/pom.xml
alto-basic/simple-ecs/impl/src/main/config/default-config.xml [deleted file]
alto-basic/simple-ecs/impl/src/main/config/maven-metadata-local.xml [deleted file]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/AltoModelEndpointcostServiceImpl.java [new file with mode: 0644]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkElementImpl.java
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModule.java [deleted file]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactory.java [deleted file]
alto-basic/simple-ecs/impl/src/main/resources/org/opendaylight/blueprint/simple-ecs-impl.xml [new file with mode: 0644]
alto-basic/simple-ecs/impl/src/main/yang/endpointcostservice-impl.yang [deleted file]
alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactoryTest.java [deleted file]
alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleTest.java [deleted file]
alto-basic/simple-ird/impl/pom.xml
alto-core/northbound/api/pom.xml
alto-core/northbound/api/src/main/yang/alto-northbound.yang [deleted file]
alto-core/northbound/impl/pom.xml
alto-core/resourcepool/impl/pom.xml
alto-core/standard-northbound-routes/costmap/api/src/main/yang/alto-nbr-costmap.yang
alto-core/standard-northbound-routes/costmap/impl/pom.xml
alto-core/standard-northbound-routes/endpointcost/api/src/main/yang/alto-nbr-endpointcost.yang
alto-core/standard-northbound-routes/endpointcost/impl/pom.xml
alto-core/standard-northbound-routes/endpointproperty/api/src/main/yang/alto-nbr-endpointproperty.yang
alto-core/standard-northbound-routes/endpointproperty/impl/pom.xml
alto-core/standard-northbound-routes/networkmap/api/src/main/yang/alto-nbr-networkmap.yang
alto-core/standard-northbound-routes/networkmap/impl/pom.xml
alto-extensions/incremental-update/impl/pom.xml
alto-extensions/multicost/impl/pom.xml
alto-extensions/rsade/impl/pom.xml
alto-extensions/simple-pce/impl/pom.xml
alto-extensions/simple-pce/impl/src/main/config/default-config.xml [deleted file]
alto-extensions/simple-pce/impl/src/main/config/maven-metadata-local.xml [deleted file]
alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceProvider.java [deleted file]
alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModule.java [deleted file]
alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModuleFactory.java [deleted file]
alto-extensions/simple-pce/impl/src/main/resources/org/opendaylight/blueprint/simple-pce-impl.xml [new file with mode: 0644]
alto-extensions/simple-pce/impl/src/main/yang/alto-spce-impl.yang [deleted file]
alto-extensions/simple-pce/network-tracker/config/pom.xml
alto-extensions/simple-pce/network-tracker/impl/pom.xml
alto-extensions/simple-pce/network-tracker/impl/src/main/config/default-config.xml [deleted file]
alto-extensions/simple-pce/network-tracker/impl/src/main/config/maven-metadata-local.xml [deleted file]
alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/alto/spce/network/impl/NetworkTrackerProvider.java [deleted file]
alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/alto/spce/network/impl/NetworkTrackerRpcHandler.java
alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModule.java [deleted file]
alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModuleFactory.java [deleted file]
alto-extensions/simple-pce/network-tracker/impl/src/main/resources/org/opendaylight/blueprint/network-tracker-impl.xml [new file with mode: 0644]
alto-extensions/simple-pce/network-tracker/impl/src/main/yang/network-tracker-impl.yang [deleted file]
alto-karaf/pom.xml
alto-release-features/odl-alto-manual-maps/pom.xml
alto-release-features/odl-alto-manual-maps/src/main/feature/feature.xml
alto-release-features/odl-alto-simpleecs/pom.xml
alto-release-features/odl-alto-simpleecs/src/main/feature/feature.xml
alto-release-features/odl-alto-spce/pom.xml
alto-release-features/odl-alto-spce/src/main/feature/feature.xml

index eb3049941cd707741efd74198785d733b4e0fe46..3a8867e3188cae94bfd87cebabf423a2b68393b3 100644 (file)
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -22,7 +22,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+
     <!-- Project Dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
index 8ebc754be0474a435906c41e8e799188bfc7ce6c..9646a6dc81b51280514641225eb477240423444b 100644 (file)
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -24,7 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>bundle</packaging>
 
   <properties>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
     <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
   </properties>
 
@@ -52,13 +51,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>alto-service-model-costmap</artifactId>
       <version>${project.version}</version>
     </dependency>
-
+<!--
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
-
+-->
     <dependency>
       <groupId>org.opendaylight.l2switch.hosttracker</groupId>
       <artifactId>hosttracker-model</artifactId>
index 442bff5de537c271d5c10d8da90c13dc2b012c88..16c957617216eabc81113e7534718878b18dd311 100644 (file)
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -21,6 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <version>0.5.0-SNAPSHOT</version>
     <name>ODL :: alto :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/alto-basic/manual-maps/impl/src/main/config/default-config.xml b/alto-basic/manual-maps/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index e299942..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-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
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:alto:manual:maps:impl?module=alto-manual-maps-impl&amp;revision=2015-10-21</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-      <capability>urn:alto:northbound?module=alto-northbound&amp;revision=2015-10-21</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:alto:manual:maps:impl">prefix:alto-manual-maps</type>
-          <name>alto-manual-maps-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-          <alto-northbound-router>
-            <type xmlns:alto-northbound-router="urn:alto:northbound">alto-northbound-router:alto-northbound-router</type>
-            <name>alto-northbound-router</name>
-          </alto-northbound-router>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/alto-basic/manual-maps/impl/src/main/config/maven-metadata-local.xml b/alto-basic/manual-maps/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index eb59a69..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>alto-simple-ird-impl</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151112013601</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>0.2.1-SNAPSHOT</value>
-        <updated>20151112013601</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
index 71f84e22ce3acd3e225349a3755a3b4e76b4a08f..13e2c35d1e8aa1bdd6b067564aaeb4671bfad344 100644 (file)
@@ -7,52 +7,54 @@
  */
 package org.opendaylight.alto.basic.impl;
 
+import java.util.LinkedList;
+import java.util.List;
 import org.opendaylight.alto.basic.manual.maps.ManualMapsUtils;
 import org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute;
 import org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.config.rev151021.AltoModelConfigService;
 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.networkmap.rev151021.AltoModelNetworkmapService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.LinkedList;
-import java.util.List;
-
-public class AltoManualMapsProvider implements BindingAwareProvider, AutoCloseable {
+public class AltoManualMapsProvider implements AutoCloseable {
     public static final String RESOURCE_CONFIG_ROUTE_NAME = "config";
     public static final String RESOURCE_CONFIG_CONTEXT_NAME = "alto-manual-maps";
 
     private static final Logger LOG = LoggerFactory.getLogger(AltoManualMapsProvider.class);
 
-    private DataBroker dataBroker = null;
-    private ManualMapsListener manualMapsListener = null;
-    private BindingAwareBroker.RpcRegistration<AltoModelConfigService> altoModelConfigService = null;
-    private BindingAwareBroker.RoutedRpcRegistration<AltoModelNetworkmapService> altoModelNetworkmapService = null;
-    private BindingAwareBroker.RoutedRpcRegistration<AltoModelCostmapService> altoModelCostmapService = null;
+    private final DataBroker dataBroker;
+    private final AltoNorthboundRouter router;
+    private final ManualMapsListener manualMapsListener = new ManualMapsListener();
+    private final BindingAwareBroker.RoutedRpcRegistration<AltoModelNetworkmapService> altoModelNetworkmapService;
+    private final BindingAwareBroker.RoutedRpcRegistration<AltoModelCostmapService> altoModelCostmapService;
 
     private AltoNorthboundRouter m_router = null;
     private List<Uuid> m_contexts = null;
 
+    public AltoManualMapsProvider(DataBroker dataBroker,
+            AltoNorthboundRouter router,
+            RoutedRpcRegistration<AltoModelNetworkmapService> altoModelNetworkmapService,
+            RoutedRpcRegistration<AltoModelCostmapService> altoModelCostmapService) {
+        this.dataBroker = dataBroker;
+        this.router = router;
+        this.altoModelNetworkmapService = altoModelNetworkmapService;
+        this.altoModelCostmapService = altoModelCostmapService;
+    }
+
     protected void setupListener() {
-        manualMapsListener = new ManualMapsListener();
         manualMapsListener.register(dataBroker);
         manualMapsListener.setNetworkmapServiceReg(altoModelNetworkmapService);
         manualMapsListener.setCostmapServiceReg(altoModelCostmapService);
     }
 
     protected void closeListener() throws Exception {
-        if (manualMapsListener != null) {
-            manualMapsListener.close();
-        }
+        manualMapsListener.close();
     }
 
     protected void initializeConfigContext() throws Exception {
@@ -70,24 +72,17 @@ public class AltoManualMapsProvider implements BindingAwareProvider, AutoCloseab
         wx.submit().get();
     }
 
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoManualMapsProvider Session Initiated");
-
-        dataBroker = session.getSALService(DataBroker.class);
-        altoModelConfigService = session.addRpcImplementation(AltoModelConfigService.class,
-                new AltoModelConfigImpl(dataBroker));
-        altoModelNetworkmapService = session.addRoutedRpcImplementation(AltoModelNetworkmapService.class,
-                new AltoManualNetworkmapServiceImpl(dataBroker));
-        altoModelCostmapService = session.addRoutedRpcImplementation(AltoModelCostmapService.class,
-                new AltoManualCostmapServiceImpl(dataBroker));
+    public void init() {
         try {
             setupListener();
             initializeConfigContext();
         } catch (Exception e) {
-            LOG.error("Failed to create top-level containers");
-            e.printStackTrace();
+            LOG.error("Failed to create top-level containers", e);
         }
+
+        setupRoute();
+
+        LOG.info("AltoManualMapsProvider Session Initiated");
     }
 
     @Override
@@ -101,19 +96,11 @@ public class AltoManualMapsProvider implements BindingAwareProvider, AutoCloseab
         } catch (Exception e) {
             LOG.error("Failed to remove route");
         }
-        if (altoModelConfigService != null) {
-            altoModelConfigService.close();
-        }
-        if (altoModelNetworkmapService != null) {
-            altoModelNetworkmapService.close();
-        }
-        if (altoModelCostmapService != null) {
-            altoModelCostmapService.close();
-        }
+
         LOG.info("AltoManualMapsProvider Closed");
     }
 
-    public void setupRoute(AltoNorthboundRouter router) {
+    private void setupRoute() {
         AltoNorthboundRoute route = new ManualMapsRoute(this);
         String base_url = router.addRoute(RESOURCE_CONFIG_ROUTE_NAME, route);
         if (base_url == null) {
diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModule.java
deleted file mode 100644 (file)
index 8514111..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
-
-import org.opendaylight.alto.basic.impl.AltoManualMapsProvider;
-
-public class AltoManualMapsModule extends AbstractAltoManualMapsModule {
-    public AltoManualMapsModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoManualMapsModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, AltoManualMapsModule 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() {
-        final AltoManualMapsProvider provider = new AltoManualMapsProvider();
-
-        try {
-            getBrokerDependency().registerProvider(provider);
-            provider.setupRoute(getAltoNorthboundRouterDependency());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-        return provider;
-    }
-
-}
diff --git a/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java b/alto-basic/manual-maps/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactory.java
deleted file mode 100644 (file)
index 6ffc823..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-manual-maps-impl yang module local name: alto-manual-maps
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Wed Nov 11 21:58:28 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.alto.manual.maps.impl.rev151021;
-public class AltoManualMapsModuleFactory extends AbstractAltoManualMapsModuleFactory {
-
-}
diff --git a/alto-basic/manual-maps/impl/src/main/resources/org/opendaylight/blueprint/manual-maps-impl.xml b/alto-basic/manual-maps/impl/src/main/resources/org/opendaylight/blueprint/manual-maps-impl.xml
new file mode 100644 (file)
index 0000000..cf65343
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+    odl:use-default-for-reference-types="true">
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+  <reference id="altoNorthboundRouter" interface="org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter"/>
+
+  <bean id="altoModelConfig" class="org.opendaylight.alto.basic.impl.AltoModelConfigImpl">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:rpc-implementation ref="altoModelConfig"/>
+
+  <bean id="altoManualCostmapService" class="org.opendaylight.alto.basic.impl.AltoManualCostmapServiceImpl">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:routed-rpc-implementation id="altoManualCostmapServiceReg" ref="altoManualCostmapService"/>
+
+  <bean id="altoManualNetworkmapService" class="org.opendaylight.alto.basic.impl.AltoManualNetworkmapServiceImpl">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:routed-rpc-implementation id="altoManualNetworkmapServiceReg" ref="altoManualNetworkmapService"/>
+
+  <bean id="altoManualMapsProvider" class="org.opendaylight.alto.basic.impl.AltoManualMapsProvider"
+      init-method="init" destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="altoNorthboundRouter"/>
+    <argument ref="altoManualNetworkmapServiceReg"/>
+    <argument ref="altoManualCostmapServiceReg"/>
+  </bean>
+</blueprint>
diff --git a/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang b/alto-basic/manual-maps/impl/src/main/yang/alto-manual-maps-impl.yang
deleted file mode 100644 (file)
index 5e66c83..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-module alto-manual-maps-impl {
-    yang-version 1;
-    namespace "urn:alto:manual:maps:impl";
-    prefix "alto-manual-maps";
-
-    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 alto-manual-maps project";
-
-    revision "2015-10-21" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-manual-maps {
-        base config:module-type;
-        config:java-name-prefix AltoManualMaps;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-manual-maps {
-            when "/config:modules/config:module/config:type = 'alto-manual-maps'";
-            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;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleFactoryTest.java
deleted file mode 100644 (file)
index b392f60..0000000
+++ /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.manual.maps.impl.rev151021;
-
-import org.junit.Test;
-
-public class AltoManualMapsModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new AltoManualMapsModuleFactory();
-    }
-}
diff --git a/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java b/alto-basic/manual-maps/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/alto/manual/maps/impl/rev151021/AltoManualMapsModuleTest.java
deleted file mode 100644 (file)
index 85bbb52..0000000
+++ /dev/null
@@ -1,24 +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.manual.maps.impl.rev151021;
-
-import org.junit.Test;
-import org.opendaylight.alto.basic.impl.AltoManualMapsProvider;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-
-public class AltoManualMapsModuleTest {
-    @Test
-    public void testCustomValidation() {
-        //TODO
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        //TODO
-    }
-}
index 026813ea78faf4f37635849f4199f7b4de73e39b..947d6320579b37e8ddede52e324f8964db6be83f 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -78,13 +78,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>0.6.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-      <version>${mdsal.version}</version>
-      <type>jar</type>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-statistics</artifactId>
diff --git a/alto-basic/simple-ecs/impl/src/main/config/default-config.xml b/alto-basic/simple-ecs/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index 6e6ba33..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-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
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:endpointcostservice:impl?module=endpointcostservice-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:endpointcostservice:impl">prefix:endpointcostservice</type>
-          <name>endpointcostservice-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/alto-basic/simple-ecs/impl/src/main/config/maven-metadata-local.xml b/alto-basic/simple-ecs/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index fff5998..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.basic.endpointcostservice</groupId>
-  <artifactId>endpointcostservice-impl</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151224114708</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>1.0.1-SNAPSHOT</value>
-        <updated>20151224114708</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/AltoModelEndpointcostServiceImpl.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/AltoModelEndpointcostServiceImpl.java
new file mode 100644 (file)
index 0000000..0ce3818
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2017 Inocybe Technologies 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.impl;
+
+import java.util.concurrent.Future;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+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.QueryInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rev151021.QueryOutput;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+
+public class AltoModelEndpointcostServiceImpl implements AltoModelEndpointcostService {
+
+    private final BasicECSImplementation basicEcsImpl;
+
+    public AltoModelEndpointcostServiceImpl(DataBroker dataBroker) {
+        basicEcsImpl = new BasicECSImplementation(dataBroker);
+    }
+
+
+    @Override
+    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
+        return basicEcsImpl.getECS(input);
+    }
+}
index 46719490a0004779aa8bb55b20199b55adbf12cd..ba485ac5eb72d7cc5dd1a6d95f82742387418952 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.alto.basic.endpointcostservice.impl;
 
+import java.util.concurrent.ExecutionException;
 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;
@@ -15,36 +16,34 @@ 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.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
 import org.opendaylight.yang.gen.v1.urn.alto.resourcepool.rev150921.context.Resource;
 import org.opendaylight.yang.gen.v1.urn.alto.types.rev150921.ResourceId;
 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.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.ResourceTypeEndpointcost;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-public class EndpointcostserviceProvider implements BindingAwareProvider, AutoCloseable,AltoModelEndpointcostService {
+public class EndpointcostserviceProvider implements AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(EndpointcostserviceProvider.class);
 
-    private DataBroker m_dataBroker = null;
-    private BindingAwareBroker.RoutedRpcRegistration<AltoModelEndpointcostService> m_serviceReg = null;
-    private ListenerRegistration<DataChangeListener> m_listener = null;
+    private final DataBroker m_dataBroker;
+    private final BindingAwareBroker.RoutedRpcRegistration<AltoModelEndpointcostService> m_serviceReg;
+    private ListenerRegistration<DataChangeListener> m_listener;
 
     private static final String SERVICE_ENDPOINTCOST_NAME = "service-endpointcost";
     private static final ResourceId SERVICE_ENDPOINTCOST_RID = new ResourceId(SERVICE_ENDPOINTCOST_NAME);
-    private InstanceIdentifier<Resource> m_testIID = null;
+    private final InstanceIdentifier<Resource> m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
+            SERVICE_ENDPOINTCOST_NAME);
 
-    private BasicECSImplementation basicEcsImpl;
+    public EndpointcostserviceProvider(DataBroker m_dataBroker,
+            RoutedRpcRegistration<AltoModelEndpointcostService> m_serviceReg) {
+        this.m_dataBroker = m_dataBroker;
+        this.m_serviceReg = m_serviceReg;
+    }
 
     protected void createContextTag()
             throws InterruptedException, ExecutionException, TransactionCommitFailedException {
@@ -79,38 +78,25 @@ public class EndpointcostserviceProvider implements BindingAwareProvider, AutoCl
         assert m_listener != null;
     }
 
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("EndpointcostserviceProvider Session Initiated");
-
-        m_dataBroker = session.getSALService(DataBroker.class);
-        m_testIID = ResourcepoolUtils.getResourceIID(ResourcepoolUtils.DEFAULT_CONTEXT,
-                SERVICE_ENDPOINTCOST_NAME);
-        m_serviceReg = session.addRoutedRpcImplementation(AltoModelEndpointcostService.class, this);
-        basicEcsImpl = new BasicECSImplementation(m_dataBroker);
+    public void init() {
         try {
             setupListener();
             createContextTag();
         } catch (Exception e) {
+            LOG.error("Failed to initialize", e);
         }
+
+        LOG.info("EndpointcostserviceProvider Session Initiated");
     }
 
     @Override
     public void close() throws Exception {
-        LOG.info("EndpointcostserviceProvider Closed");
-
-        if (m_serviceReg != null) {
-            m_serviceReg.close();
-        }
         try {
             removeContextTag();
         } catch (Exception e) {
+            LOG.debug("Error remocing context tag", e);
         }
-    }
 
-    @Override
-    public Future<RpcResult<QueryOutput>> query(QueryInput input) {
-        return basicEcsImpl.getECS(input);
+        LOG.info("EndpointcostserviceProvider Closed");
     }
-
 }
index ed6968924639a655abc28558484bc4fd79228985..84a5af71b3ea4ca0a420da484ea48a44306b2cff 100644 (file)
@@ -7,12 +7,17 @@
  */
 package org.opendaylight.alto.basic.endpointcostservice.suportservice.impl;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.opendaylight.alto.basic.endpointcostservice.helper.DataStoreHelper;
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.exception.ReadDataFailedException;
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.service.LinkService;
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.service.NetworkElementService;
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.service.NetworkFlowCapableNodeService;
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.service.NetworkHostNodeService;
-import org.opendaylight.alto.basic.endpointcostservice.helper.DataStoreHelper;
 import org.opendaylight.alto.basic.endpointcostservice.util.InstanceIdentifierUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
@@ -29,25 +34,19 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 public class NetworkElementImpl implements NetworkElementService, DataChangeListener, AutoCloseable {
     private static final Logger log = LoggerFactory
             .getLogger(NetworkElementImpl.class);
     private static final int CPUS = Runtime.getRuntime().availableProcessors();
-    private ExecutorService exec = Executors.newFixedThreadPool(CPUS);
+    private final ExecutorService exec = Executors.newFixedThreadPool(CPUS);
 
-    private DataBroker dataBroker;
+    private final DataBroker dataBroker;
     private ListenerRegistration<DataChangeListener> hostNodeListRegistration;
     private ListenerRegistration<DataChangeListener> linkListRegistration;
 
-    private NetworkHostNodeService hostNodeService;
-    private LinkService linkService;
-    private NetworkFlowCapableNodeService flowCapableNodeService;
+    private final NetworkHostNodeService hostNodeService;
+    private final LinkService linkService;
+    private final NetworkFlowCapableNodeService flowCapableNodeService;
 
 
     public NetworkElementImpl(DataBroker dataBroker) {
@@ -70,8 +69,7 @@ public class NetworkElementImpl implements NetworkElementService, DataChangeList
             addExistingHostNodes(topology);
             addExistingLinks(topology);
         } catch (ReadDataFailedException e) {
-            e.printMessage("Read topology failed");
-            e.printStackTrace();
+            log.error("Read topology failed", e);
         }
     }
     private void addExistingHostNodes(Topology topology) {
diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModule.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModule.java
deleted file mode 100644 (file)
index c7fc008..0000000
+++ /dev/null
@@ -1,39 +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.params.xml.ns.yang.endpointcostservice.impl.rev141210;
-
-import org.opendaylight.alto.basic.endpointcostservice.impl.EndpointcostserviceProvider;
-
-
-public class EndpointcostserviceModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.endpointcostservice.impl.rev141210.AbstractEndpointcostserviceModule {
-    public EndpointcostserviceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public EndpointcostserviceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.endpointcostservice.impl.rev141210.EndpointcostserviceModule 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() {
-        final EndpointcostserviceProvider provider = new EndpointcostserviceProvider();
-        try {
-            getBrokerDependency().registerProvider(provider);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-        return provider;
-    }
-
-}
diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactory.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactory.java
deleted file mode 100644 (file)
index 0c3e47c..0000000
+++ /dev/null
@@ -1,20 +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
- */
-/*
-* Generated file
-*
-* Generated from: yang module name: endpointcostservice yang module local name: endpointcostservice
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Fri Jan 02 13:49:24 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.endpointcostservice.impl.rev141210;
-public class EndpointcostserviceModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.endpointcostservice.impl.rev141210.AbstractEndpointcostserviceModuleFactory {
-
-}
diff --git a/alto-basic/simple-ecs/impl/src/main/resources/org/opendaylight/blueprint/simple-ecs-impl.xml b/alto-basic/simple-ecs/impl/src/main/resources/org/opendaylight/blueprint/simple-ecs-impl.xml
new file mode 100644 (file)
index 0000000..3a48d36
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+    odl:use-default-for-reference-types="true">
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+
+  <bean id="altoModelEndpointcostService"
+      class="org.opendaylight.alto.basic.endpointcostservice.impl.AltoModelEndpointcostServiceImpl">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:routed-rpc-implementation id="altoModelEndpointcostServiceReg" ref="altoModelEndpointcostService"/>
+
+  <bean id="endpointcostserviceProvider" class="org.opendaylight.alto.basic.endpointcostservice.impl.EndpointcostserviceProvider"
+      init-method="init" destroy-method="close">
+    <argument ref="dataBroker"/>
+    <argument ref="altoModelEndpointcostServiceReg"/>
+  </bean>
+</blueprint>
diff --git a/alto-basic/simple-ecs/impl/src/main/yang/endpointcostservice-impl.yang b/alto-basic/simple-ecs/impl/src/main/yang/endpointcostservice-impl.yang
deleted file mode 100644 (file)
index 040efe5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-module endpointcostservice-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:endpointcostservice:impl";
-    prefix "endpointcostservice-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 endpointcostservice project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity endpointcostservice {
-        base config:module-type;
-        config:java-name-prefix Endpointcostservice;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case endpointcostservice {
-            when "/config:modules/config:module/config:type = 'endpointcostservice'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactoryTest.java b/alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactoryTest.java
deleted file mode 100644 (file)
index 7f808fd..0000000
+++ /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.params.xml.ns.yang.endpointcostservice.impl.rev141210;
-
-import org.junit.Test;
-
-public class EndpointcostserviceModuleFactoryTest {
-    @Test
-    public void testFactoryConstructor() {
-        // ensure no exceptions on construction
-        new EndpointcostserviceModuleFactory();
-    }
-}
diff --git a/alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleTest.java b/alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleTest.java
deleted file mode 100644 (file)
index b906c15..0000000
+++ /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.params.xml.ns.yang.endpointcostservice.impl.rev141210;
-
-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.basic.endpointcostservice.impl.EndpointcostserviceProvider;
-
-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 EndpointcostserviceModuleTest {
-    @Test
-    public void testCustomValidation() {
-        EndpointcostserviceModule module = new EndpointcostserviceModule(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
-        EndpointcostserviceModule module = new EndpointcostserviceModule(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((EndpointcostserviceProvider)closeable);
-
-        // ensure no exceptions on close
-        closeable.close();
-    }
-}
index b5f6512e3139366d4653dd11b7bcff0912c9e295..8d0971c31e9dbcadd7265ea24da677c3c087fd91 100644 (file)
@@ -13,9 +13,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+   <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index 640f3d6c3faea3ec612a9cf106bd6ce78a7b5a2b..5a4a608f1b7e05125399c74c87690e3e7d0e5d43 100644 (file)
@@ -8,9 +8,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>2.0.2</version>
     <relativePath/>
   </parent>
 
diff --git a/alto-core/northbound/api/src/main/yang/alto-northbound.yang b/alto-core/northbound/api/src/main/yang/alto-northbound.yang
deleted file mode 100644 (file)
index acb6de0..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-module alto-northbound {
-    yang-version 1;
-
-    namespace "urn:alto:northbound";
-
-    prefix "alto-northbound";
-
-    import config { prefix config; revision-date 2013-04-05; }
-
-    organization "Yale University";
-
-    contact "alto-dev@lists.opendaylight.org";
-
-    revision "2015-10-21" {
-        description "Initial revision of alto-northbound model";
-    }
-
-    identity alto-northbound-router {
-        base "config:service-type";
-        config:java-class "org.opendaylight.alto.core.northbound.api.AltoNorthboundRouter";
-    }
-
-    identity alto-northbound-route {
-        base "config:service-type";
-        config:java-class "org.opendaylight.alto.core.northbound.api.AltoNorthboundRoute";
-    }
-
-}
index eddcee655884fc816922df1ce84cbbdd885eb6ab..a4c7ece354a32bb0370b001548076a986f303193 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound-api</artifactId>
index 8020096f0f4fe58c2f506cbb566e97c7b4c12dbb..2ed96d2461841e8160ba196da62550ca94cb7b37 100644 (file)
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
index ae0bf2596e86e261d58c6ec2717d48927ad852bc..f02b8f80cf0f9f692f2fea956219f7de1cb06e09 100644 (file)
@@ -5,7 +5,6 @@ module alto-nbr-costmap {
 
     prefix "alto-nbr-costmap";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types { prefix ietf-inet; revision-date 2013-07-15; }
     import alto-model-costmap { prefix costmap-model; revision-date 2015-10-21; }
 
index 1546879c0fe55a184b6f53db50f7c42fdefb338f..2402289384c0ee92f774bf91cf0d03bb94bfeacf 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound-api</artifactId>
index 834732fffedf8259c73ca7f63a2050a10cbaeec1..55a3c263467b462b4d7934754bce6b9a4b3c4ebf 100644 (file)
@@ -5,7 +5,6 @@ module alto-nbr-endpointcost {
 
     prefix "alto-nbr-endpointcost";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types { prefix ietf-inet; revision-date 2013-07-15; }
     import alto-model-endpointcost { prefix endpointcost-model; revision-date 2015-10-21; }
 
index f186a06eee2516b9d8fc83f870ab6641de954d92..9cf6b4898f9cc40b13ce11bcb54b46ba1e4ae5d5 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound-api</artifactId>
index 0a7c55144fe6e0b32725022da25f38f5a8035adc..845d8e9a5cfb645ea7d7aaf0234f4fcb56e7f881 100644 (file)
@@ -3,7 +3,6 @@ module alto-nbr-endpointproperty {
     namespace "urn:alto:northbound:route:endpointproperty";
     prefix "alto-nbr-endpointproperty";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types { prefix ietf-inet; revision-date 2013-07-15; }
 
     organization "Yale University";
index 9ea8bb7f223f47f5a277593f282cb3dc4670668b..94a4b29f8f7dccd1072d62244d4095f5121c67ce 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound-api</artifactId>
index 2c348e9c3924ba30415e661c36f8442333bb50d8..6b4bb5daa5738a3e0c2e9547b13e6263b3c6dc21 100644 (file)
@@ -5,7 +5,6 @@ module alto-nbr-networkmap {
 
     prefix "alto-nbr-networkmap";
 
-    import config { prefix config; revision-date 2013-04-05; }
     import ietf-inet-types { prefix ietf-inet; revision-date 2013-07-15; }
     import alto-model-networkmap { prefix networkmap-model; revision-date 2015-10-21; }
 
index 4d14fa955cb9002b3ad1d84e0a94567e444faf5e..ca8457f4f945f1710ba1698e5f0f6297275a3262 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -23,11 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>alto-northbound-api</artifactId>
index 2a97313b3801566de6b9da9b117ce16deafe29f2..fc38f490f95e5389c7bfe4e9296b962563561a26 100644 (file)
@@ -13,9 +13,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>incremental-update-api</artifactId>
index 88439fc4da6c47148df106998f9098894e72fdff..f956368e13b467f6609527c6dc8adb2c76f5b31d 100644 (file)
@@ -13,9 +13,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>multicost-api</artifactId>
index 08dc49c7920b0b630e26dec0e397363ebe4eec24..c558ab1ec925e79745a4b3a2ae9e9b9f50967c8a 100644 (file)
@@ -13,9 +13,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>rsade-api</artifactId>
index bf48473525e88eee07927d45e0f7f3d4d27683fb..75d23b0dc96c5415a0803788264a10bdbf1187cb 100644 (file)
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -24,9 +24,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <properties>
     <openflow.plugin.version>0.5.0-SNAPSHOT</openflow.plugin.version>
-    <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -51,7 +62,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <!-- Testing Dependencies -->
diff --git a/alto-extensions/simple-pce/impl/src/main/config/default-config.xml b/alto-extensions/simple-pce/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index a233322..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Copyright (c) 2015 Tongji 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
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:spce:impl?module=alto-spce-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:spce:impl">prefix:alto-spce</type>
-          <name>alto-spce-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/alto-extensions/simple-pce/impl/src/main/config/maven-metadata-local.xml b/alto-extensions/simple-pce/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 25834ec..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.ext</groupId>
-  <artifactId>alto-spce-impl</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151107031204</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>1.0.0-SNAPSHOT</value>
-        <updated>20151107031204</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceProvider.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceProvider.java
deleted file mode 100644 (file)
index 527d263..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2015 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.spce.impl;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-/*import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.rev151106.AltoSpceService;*/
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.rev160718.AltoSpceService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.NetworkTrackerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AltoSpceProvider implements BindingAwareProvider, AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(AltoSpceProvider.class);
-    private RpcRegistration<AltoSpceService> altoSpceService;
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("AltoSpceProvider Session Initiated!");
-        SalFlowService salFlowService = session.getRpcService(SalFlowService.class);
-        SalMeterService salMeterServer = session.getRpcService(SalMeterService.class);
-        NetworkTrackerService networkTrackerService = session.getRpcService(NetworkTrackerService.class);
-        DataBroker dataBroker = session.getSALService(DataBroker.class);
-        altoSpceService = session.addRpcImplementation(AltoSpceService.class, new AltoSpceImpl(salMeterServer,networkTrackerService, dataBroker));
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("AltoSpceProvider Closed!");
-        if (altoSpceService != null) {
-            altoSpceService.close();
-        }
-    }
-}
diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModule.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModule.java
deleted file mode 100644 (file)
index 1b86346..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.rev141210;
-
-import org.opendaylight.alto.spce.impl.AltoSpceProvider;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-
-public class AltoSpceModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.rev141210.AbstractAltoSpceModule {
-    public AltoSpceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public AltoSpceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.rev141210.AltoSpceModule 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() {
-        AltoSpceProvider provider = new AltoSpceProvider();
-        BindingAwareBroker broker = getBrokerDependency();
-        broker.registerProvider(provider);
-        return provider;
-    }
-
-}
diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModuleFactory.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/rev141210/AltoSpceModuleFactory.java
deleted file mode 100644 (file)
index 39420b3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: alto-spce-impl yang module local name: alto-spce
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Sat Nov 07 17:59:08 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.rev141210;
-public class AltoSpceModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.rev141210.AbstractAltoSpceModuleFactory {
-
-}
diff --git a/alto-extensions/simple-pce/impl/src/main/resources/org/opendaylight/blueprint/simple-pce-impl.xml b/alto-extensions/simple-pce/impl/src/main/resources/org/opendaylight/blueprint/simple-pce-impl.xml
new file mode 100644 (file)
index 0000000..a3ca201
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+    odl:use-default-for-reference-types="true">
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+
+  <odl:rpc-service id="salMeterService"
+      interface="org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918.SalMeterService"/>
+
+  <odl:rpc-service id="networkTrackerService"
+      interface="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.NetworkTrackerService"/>
+
+  <bean id="altoSpceImpl" class="org.opendaylight.alto.spce.impl.AltoSpceImpl">
+    <argument ref="salMeterService"/>
+    <argument ref="networkTrackerService"/>
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:rpc-implementation ref="altoSpceImpl"/>
+</blueprint>
diff --git a/alto-extensions/simple-pce/impl/src/main/yang/alto-spce-impl.yang b/alto-extensions/simple-pce/impl/src/main/yang/alto-spce-impl.yang
deleted file mode 100644 (file)
index db25acb..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-module alto-spce-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:spce:impl";
-    prefix "alto-spce-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 alto-spce project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity alto-spce {
-        base config:module-type;
-        config:java-name-prefix AltoSpce;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case alto-spce {
-            when "/config:modules/config:module/config:type = 'alto-spce'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}
index 313e7f130c6401ac72df44fba2dd7b98f94593e7..91e440794910048f51609a6fa04e0a237583a5fd 100644 (file)
@@ -2,13 +2,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
-
   <groupId>org.opendaylight.alto.spce.network</groupId>
   <artifactId>network-tracker-config</artifactId>
   <version>0.5.0-SNAPSHOT</version>
index 424a1c38e6b4cb8cc1921463600d6536b43b1932..b0364e6febbbb7b590ddcf76386c7ff3e2c325f0 100644 (file)
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -25,6 +25,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <version>0.5.0-SNAPSHOT</version>
   <name>ODL :: alto :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -48,28 +61,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-inventory</artifactId>
-      <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.l2switch.addresstracker</groupId>
       <artifactId>addresstracker-model</artifactId>
       <version>${l2switch.version}</version>
-      <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.l2switch.hosttracker</groupId>
       <artifactId>hosttracker-model</artifactId>
       <version>${l2switch.version}</version>
-      <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>org.opendaylight.l2switch.loopremover</groupId>
       <artifactId>loopremover-impl</artifactId>
       <version>${l2switch.version}</version>
-      <type>jar</type>
     </dependency>
   </dependencies>
 
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/config/default-config.xml b/alto-extensions/simple-pce/network-tracker/impl/src/main/config/default-config.xml
deleted file mode 100644 (file)
index f303a61..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-Copyright © 2015 Tongji 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
--->
-<snapshot>
-  <required-capabilities>
-      <capability>urn:opendaylight:alto:spce:impl:network-tracker:impl?module=network-tracker-impl&amp;revision=2014-12-10</capability>
-      <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
-  </required-capabilities>
-  <configuration>
-
-    <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-      <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-        <module>
-          <type xmlns:prefix="urn:opendaylight:alto:spce:impl:network-tracker:impl">prefix:network-tracker</type>
-          <name>network-tracker-default</name>
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
-            <name>binding-osgi-broker</name>
-          </broker>
-        </module>
-      </modules>
-    </data>
-  </configuration>
-</snapshot>
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/config/maven-metadata-local.xml b/alto-extensions/simple-pce/network-tracker/impl/src/main/config/maven-metadata-local.xml
deleted file mode 100644 (file)
index 8f50e19..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata modelVersion="1.1.0">
-  <groupId>org.opendaylight.alto.spce.network</groupId>
-  <artifactId>network-tracker-impl</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <versioning>
-    <snapshot>
-      <localCopy>true</localCopy>
-    </snapshot>
-    <lastUpdated>20151107084951</lastUpdated>
-    <snapshotVersions>
-      <snapshotVersion>
-        <classifier>config</classifier>
-        <extension>xml</extension>
-        <value>1.0.0-SNAPSHOT</value>
-        <updated>20151107084951</updated>
-      </snapshotVersion>
-    </snapshotVersions>
-  </versioning>
-</metadata>
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/alto/spce/network/impl/NetworkTrackerProvider.java b/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/alto/spce/network/impl/NetworkTrackerProvider.java
deleted file mode 100644 (file)
index 438ef8e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2015 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.spce.network.impl;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.NetworkTrackerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NetworkTrackerProvider implements BindingAwareProvider, AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NetworkTrackerProvider.class);
-    private DataBroker dataBroker;
-    private NetworkTrackerRpcHandler networkTrackerRpcHandler;
-    private RpcRegistration<NetworkTrackerService> networkTrackerService;
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.info("NetworkTrackerProvider Session Initiated");
-        dataBroker = session.getSALService(DataBroker.class);
-        networkTrackerRpcHandler = new NetworkTrackerRpcHandler(dataBroker);
-        networkTrackerService = session.addRpcImplementation(NetworkTrackerService.class, networkTrackerRpcHandler);
-    }
-
-    @Override
-    public void close() throws Exception {
-        LOG.info("NetworkTrackerProvider Closed");
-    }
-
-}
index e5eb50cb2cb4f287f5254124d482e9f9fc5335a3..9e56749abe8f02b490c0867cdb14a59158476475 100644 (file)
@@ -7,10 +7,11 @@
  */
 package org.opendaylight.alto.spce.network.impl;
 
+import java.math.BigInteger;
+import java.util.concurrent.Future;
 import org.opendaylight.alto.spce.network.api.AddressConvertService;
 import org.opendaylight.alto.spce.network.api.NetworkPortStatisticsService;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.AltoSpceGetIpByMacInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.AltoSpceGetIpByMacOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.AltoSpceGetIpByMacOutputBuilder;
@@ -27,24 +28,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.AltoSpceGetTxSpeedOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.AltoSpceGetTxSpeedOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.tracker.rev151107.NetworkTrackerService;
-
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-import java.util.concurrent.Future;
-
 public class NetworkTrackerRpcHandler implements NetworkTrackerService {
 
     private static final Logger logger = LoggerFactory
             .getLogger(NetworkTrackerRpcHandler.class);
     private DataBroker dataBroker = null;
-    private NetworkPortStatisticsService networkPortStatisticsService;
-    private AddressConvertService addressConvertService;
+    private final NetworkPortStatisticsService networkPortStatisticsService;
+    private final AddressConvertService addressConvertService;
 
-    NetworkTrackerRpcHandler(DataBroker dataBroker) {
+    public NetworkTrackerRpcHandler(DataBroker dataBroker) {
         this.dataBroker = dataBroker;
         this.networkPortStatisticsService = new NetworkPortStatisticsServiceImpl(this.dataBroker);
         this.addressConvertService = new AddressConvertServiceImpl(this.dataBroker);
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModule.java b/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModule.java
deleted file mode 100644 (file)
index 54594e5..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.network.tracker.impl.rev141210;
-
-import org.opendaylight.alto.spce.network.impl.NetworkTrackerProvider;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-
-public class NetworkTrackerModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.network.tracker.impl.rev141210.AbstractNetworkTrackerModule {
-    public NetworkTrackerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
-
-    public NetworkTrackerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.network.tracker.impl.rev141210.NetworkTrackerModule 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() {
-        // TODO:implement
-        // throw new java.lang.UnsupportedOperationException();
-        BindingAwareBroker broker = getBrokerDependency();
-        NetworkTrackerProvider provider = new NetworkTrackerProvider();
-        broker.registerProvider(provider);
-        return provider;
-    }
-
-}
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModuleFactory.java b/alto-extensions/simple-pce/network-tracker/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/spce/impl/network/tracker/impl/rev141210/NetworkTrackerModuleFactory.java
deleted file mode 100644 (file)
index 6fcb19a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-* Generated file
-*
-* Generated from: yang module name: network-tracker-impl yang module local name: network-tracker
-* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
-* Generated at: Sat Nov 07 21:31:25 CST 2015
-*
-* Do not modify this file unless it is present under src/main directory
-*/
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.network.tracker.impl.rev141210;
-public class NetworkTrackerModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.impl.network.tracker.impl.rev141210.AbstractNetworkTrackerModuleFactory {
-
-}
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/resources/org/opendaylight/blueprint/network-tracker-impl.xml b/alto-extensions/simple-pce/network-tracker/impl/src/main/resources/org/opendaylight/blueprint/network-tracker-impl.xml
new file mode 100644 (file)
index 0000000..de0f2eb
--- /dev/null
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+    odl:use-default-for-reference-types="true">
+
+  <reference id="dataBroker" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"/>
+
+  <bean id="networkTrackerRpcHandler" class="org.opendaylight.alto.spce.network.impl.NetworkTrackerRpcHandler">
+    <argument ref="dataBroker"/>
+  </bean>
+
+  <odl:rpc-implementation ref="networkTrackerRpcHandler"/>
+</blueprint>
diff --git a/alto-extensions/simple-pce/network-tracker/impl/src/main/yang/network-tracker-impl.yang b/alto-extensions/simple-pce/network-tracker/impl/src/main/yang/network-tracker-impl.yang
deleted file mode 100644 (file)
index 27a2bb5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-module network-tracker-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:alto:spce:impl:network-tracker:impl";
-    prefix "network-tracker-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 network-tracker project";
-
-    revision "2014-12-10" {
-        description
-            "Initial revision";
-    }
-
-    identity network-tracker {
-        base config:module-type;
-        config:java-name-prefix NetworkTracker;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case network-tracker {
-            when "/config:modules/config:module/config:type = 'network-tracker'";
-            container broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity md-sal-binding:binding-broker-osgi-registry;
-                    }
-                }
-            }
-        }
-    }
-}
index 15314fcee01efa59674021280b4a2f37898029c0..0858bce7ccfc447107f26869272fe2d08dd43beb 100644 (file)
@@ -42,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
   <!-- DO NOT install or deploy the karaf artifact -->
index 78d67167747125f5559790fc674e24f6021389c3..5330311d1e1aefb850687685a4b57cbb6bc2434d 100644 (file)
@@ -29,7 +29,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.groupId>org.opendaylight.controller</mdsal.groupId>
     <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 
   <dependencies>
@@ -79,12 +78,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>alto-manual-maps-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.basic</groupId>
-      <artifactId>alto-manual-maps-impl</artifactId>
-      <version>${project.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
   </dependencies>
 </project>
index 4d175a16048cd551324a3d942e15a14cb75dc82c..67cda5c91cae88095f1a5333956af9c133f4b0fe 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="odl-alto-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
   <feature name="odl-alto-manual-maps" version="${project.version}">
-    <configfile finalname="${configfile.directory}/alto-manual-maps.xml"> mvn:org.opendaylight.alto.basic/alto-manual-maps-impl/${project.version}/xml/config </configfile>
   </feature>
 </features>
index 9d5170091be9018e0db8e6b0a8dce44ca9558b24..2594ad6991cf98b3f49661975cf1d7cf4b550a46 100644 (file)
@@ -55,12 +55,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>alto-simple-ecs-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.basic</groupId>
-      <artifactId>alto-simple-ecs-impl</artifactId>
-      <version>${project.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
   </dependencies>
 </project>
index 93a73a836a95e5fbbf87c591d9be752fe469cd09..11927ab19a9deac61c15b0a81a48e409c795c829 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="odl-alto-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
   <feature name="odl-alto-simpleecs" version="${project.version}">
-    <configfile finalname="${configfile.directory}/alto-simpleecs.xml"> mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config </configfile>
   </feature>
 </features>
index ddc59ebdd903b271bfa358e55c52fc05bafc08f7..02f86cf93983606695c476832cabaaed3ec81c93 100644 (file)
@@ -31,7 +31,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <openflow.plugin.groupId>org.opendaylight.openflowplugin</openflow.plugin.groupId>
     <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-    <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <l2switch.version>0.6.0-SNAPSHOT</l2switch.version>
     <openflow.plugin.version>0.5.0-SNAPSHOT</openflow.plugin.version>
   </properties>
@@ -96,13 +95,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>network-tracker-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.spce.network</groupId>
-      <artifactId>network-tracker-impl</artifactId>
-      <version>${project.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.alto.ext</groupId>
       <artifactId>alto-spce-api</artifactId>
@@ -113,13 +105,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>alto-spce-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.alto.ext</groupId>
-      <artifactId>alto-spce-impl</artifactId>
-      <version>${project.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <!-- FIXME: Replace with odl-alto-spce from alto-spce-features feature repository. -->
   </dependencies>
 </project>
index 1c7429e8274609dbb1a641eeed106af90404c028..f353c2efa4009563e01628c2d0f9ab7791820b51 100644 (file)
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="odl-alto-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
   <feature name="odl-alto-spce" version="${project.version}">
-    <configfile finalname="${configfile.directory}/network-tracker.xml"> mvn:org.opendaylight.alto.spce.network/network-tracker-impl/${project.version}/xml/config </configfile>
-    <configfile finalname="${configfile.directory}/alto-spce.xml"> mvn:org.opendaylight.alto.ext/alto-spce-impl/${project.version}/xml/config </configfile>
   </feature>
 </features>