Improve the simple-ecs 67/36967/1
authorjensenzhang <jingxuan.n.zhang@gmail.com>
Sun, 13 Mar 2016 18:03:22 +0000 (02:03 +0800)
committerKai GAO <gaok12@mails.tsinghua.edu.cn>
Thu, 31 Mar 2016 10:33:23 +0000 (18:33 +0800)
 - Rename the endpointcostservice to simple-ecs for clarity

 - Modify the released feature to support specialized l2switch
   configuration using <contidion> tag

Change-Id: Ic4cfc9293faad6471cf0883aead3b684faa375b7
Signed-off-by: jensenzhang <jingxuan.n.zhang@gmail.com>
53 files changed:
alto-basic/pom.xml
alto-basic/simple-ecs/api/pom.xml [moved from alto-basic/endpointcostservice/api/pom.xml with 94% similarity]
alto-basic/simple-ecs/api/src/main/yang/endpointcostservice.yang [moved from alto-basic/endpointcostservice/api/src/main/yang/endpointcostservice.yang with 100% similarity]
alto-basic/simple-ecs/artifacts/pom.xml [moved from alto-basic/endpointcostservice/artifacts/pom.xml with 86% similarity]
alto-basic/simple-ecs/features/pom.xml [moved from alto-basic/endpointcostservice/features/pom.xml with 96% similarity]
alto-basic/simple-ecs/features/src/main/features/features.xml [moved from alto-basic/endpointcostservice/features/src/main/features/features.xml with 72% similarity]
alto-basic/simple-ecs/hostnodetracker/pom.xml [moved from alto-basic/endpointcostservice/hostnodetracker/pom.xml with 96% similarity]
alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java [moved from alto-basic/endpointcostservice/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/api/HostNodeTrackerService.java with 100% similarity]
alto-basic/simple-ecs/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java [moved from alto-basic/endpointcostservice/hostnodetracker/src/main/java/org/opendaylight/alto/basic/hostnode/tracker/topology/impl/HostNodeTrackerImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/pom.xml [moved from alto-basic/endpointcostservice/impl/pom.xml with 96% similarity]
alto-basic/simple-ecs/impl/src/main/config/default-config.xml [moved from alto-basic/endpointcostservice/impl/src/main/config/default-config.xml with 100% similarity]
alto-basic/simple-ecs/impl/src/main/config/maven-metadata-local.xml [moved from alto-basic/endpointcostservice/impl/src/main/config/maven-metadata-local.xml with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/DataStoreHelper.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/DataStoreHelper.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/ServiceHelper.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/ServiceHelper.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/UtilHelper.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/UtilHelper.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/EndpointcostserviceProvider.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/base/BaseECSImplementation.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/exception/ReadDataFailedException.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/exception/ReadDataFailedException.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/HostNodeTrackerImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/HostNodeTrackerImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/LinkServiceImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/LinkServiceImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkElementImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkElementImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkFlowCapableNodeImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkFlowCapableNodeImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkPortStatisticsServiceImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkPortStatisticsServiceImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/RoutingServiceImpl.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/RoutingServiceImpl.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/HostNodeTrackerService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/HostNodeTrackerService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/LinkService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/LinkService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkElementService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkElementService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkFlowCapableNodeService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkFlowCapableNodeService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkHostNodeService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkHostNodeService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkPortStatisticsService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/NetworkPortStatisticsService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/RoutingService.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/service/RoutingService.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/InstanceIdentifierUtils.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/InstanceIdentifierUtils.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/LinkNode.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/LinkNode.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/NameConverter.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/NameConverter.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/NetworkServiceConstants.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/NetworkServiceConstants.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/RouteServiceConstants.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/util/RouteServiceConstants.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModule.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModule.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactory.java [moved from alto-basic/endpointcostservice/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactory.java with 100% similarity]
alto-basic/simple-ecs/impl/src/main/yang/endpointcostservice-impl.yang [moved from alto-basic/endpointcostservice/impl/src/main/yang/endpointcostservice-impl.yang with 100% similarity]
alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactoryTest.java [moved from alto-basic/endpointcostservice/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleFactoryTest.java with 100% similarity]
alto-basic/simple-ecs/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleTest.java [moved from alto-basic/endpointcostservice/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/endpointcostservice/impl/rev141210/EndpointcostserviceModuleTest.java with 100% similarity]
alto-basic/simple-ecs/it/pom.xml [moved from alto-basic/endpointcostservice/it/pom.xml with 87% similarity]
alto-basic/simple-ecs/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java [moved from alto-basic/endpointcostservice/it/src/test/java/org/opendaylight/alto/basic/endpointcostservice/it/EndpointcostserviceIT.java with 100% similarity]
alto-basic/simple-ecs/karaf/pom.xml [moved from alto-basic/endpointcostservice/karaf/pom.xml with 89% similarity]
alto-basic/simple-ecs/pom.xml [moved from alto-basic/endpointcostservice/pom.xml with 82% similarity]
alto-release-features/pom.xml
alto-release-features/src/main/features/features.xml

index 1682a7a8a2c9e6ff215ea960bfd5e84b5a157d71..3b5f49c7390eb569be9999cec7156f167d52dcdb 100644 (file)
@@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modules>
     <module>simple-ird</module>
     <module>manual-maps</module>
-    <module>endpointcostservice</module>
+    <module>simple-ecs</module>
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>
similarity index 94%
rename from alto-basic/endpointcostservice/api/pom.xml
rename to alto-basic/simple-ecs/api/pom.xml
index 51943ab5174060d3c8359143aacfa5152bcbc76a..254273751556c27dbb46c9815d594c1cbd0a56b9 100644 (file)
@@ -16,8 +16,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-api</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-api</artifactId>
   <packaging>bundle</packaging>
 
 </project>
similarity index 86%
rename from alto-basic/endpointcostservice/artifacts/pom.xml
rename to alto-basic/simple-ecs/artifacts/pom.xml
index b72738219945476ce9e90962e700d50870ea910a..6b1f3de054ad3afd7bee15c0f831452b212d7022 100644 (file)
@@ -19,25 +19,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </parent>
 
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-artifacts</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-artifacts</artifactId>
   <packaging>pom</packaging>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>endpointcostservice-api</artifactId>
+        <artifactId>alto-simple-ecs-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>endpointcostservice-impl</artifactId>
+        <artifactId>alto-simple-ecs-impl</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>endpointcostservice-features</artifactId>
+        <artifactId>alto-simple-ecs-features</artifactId>
         <version>${project.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
similarity index 96%
rename from alto-basic/endpointcostservice/features/pom.xml
rename to alto-basic/simple-ecs/features/pom.xml
index bcdefd6ff17135dc762a5b6791b39fac709d7453..4be4d9f4f0a13414af5a5b84253dfca86c5dacb2 100644 (file)
@@ -14,8 +14,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-features</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-features</artifactId>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
   <prerequisites>
@@ -145,19 +145,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-impl</artifactId>
+      <artifactId>alto-simple-ecs-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-impl</artifactId>
+      <artifactId>alto-simple-ecs-impl</artifactId>
       <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-api</artifactId>
+      <artifactId>alto-simple-ecs-api</artifactId>
       <version>${project.version}</version>
     </dependency>
 
similarity index 72%
rename from alto-basic/endpointcostservice/features/src/main/features/features.xml
rename to alto-basic/simple-ecs/features/src/main/features/features.xml
index f4253ac1a021a6dc6af1f274e0ebd3905aaa1066..0871a6f70bd7d4ece3e867ef688db200b515119d 100644 (file)
@@ -7,7 +7,7 @@ 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
 -->
-<features name="odl-endpointcostservice-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-alto-simple-ecs-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
@@ -22,17 +22,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.l2switch/features-l2switch/${l2switch.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
 
-  <feature name='odl-endpointcostservice-api' version='${project.version}' description='OpenDaylight :: endpointcostservice :: api'>
+  <feature name='odl-alto-simple-ecs-api' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: api'>
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <feature version='${project.version}'>odl-alto-resourcepool-api</feature>
     <bundle>mvn:org.opendaylight.alto.core/alto-service-model-base-api/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.alto.core/alto-service-model-networkmap-api/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.alto.core/alto-service-model-endpointcost-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.basic/endpointcostservice-api/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-api/${project.version}</bundle>
   </feature>
-  <feature name='odl-endpointcostservice' version='${project.version}' description='OpenDaylight :: endpointcostservice'>
+  <feature name='odl-alto-simple-ecs' version='${project.version}' description='OpenDaylight :: alto-simple-ecs'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-endpointcostservice-api</feature>
+    <feature version='${project.version}'>odl-alto-simple-ecs-api</feature>
     <feature version='${project.version}'>odl-alto-northbound</feature>
     <feature version='${project.version}'>odl-alto-resourcepool</feature>
     <feature version='${project.version}'>odl-alto-service-model-networkmap</feature>
@@ -40,15 +40,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${l2switch.version}'>odl-l2switch-hosttracker</feature>
     <feature version='${l2switch.version}'>odl-l2switch-addresstracker</feature>
     <feature version='${openflow.plugin.version}'>odl-openflowplugin-flow-services</feature>
-    <bundle>mvn:org.opendaylight.alto.basic/endpointcostservice-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/endpointcostservice.xml">mvn:org.opendaylight.alto.basic/endpointcostservice-impl/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}</bundle>
+    <configfile finalname="${configfile.directory}/alto-simple-ecs.xml">mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config</configfile>
   </feature>
-  <feature name='odl-endpointcostservice-rest' version='${project.version}' description='OpenDaylight :: endpointcostservice :: REST'>
-    <feature version="${project.version}">odl-endpointcostservice</feature>
+  <feature name='odl-alto-simple-ecs-rest' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: REST'>
+    <feature version="${project.version}">odl-alto-simple-ecs</feature>
     <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
-  <feature name='odl-endpointcostservice-ui' version='${project.version}' description='OpenDaylight :: endpointcostservice :: UI'>
-    <feature version="${project.version}">odl-endpointcostservice-rest</feature>
+  <feature name='odl-alto-simple-ecs-ui' version='${project.version}' description='OpenDaylight :: alto-simple-ecs :: UI'>
+    <feature version="${project.version}">odl-alto-simple-ecs-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
     <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
     <feature version="${dlux.version}">odl-dlux-yangui</feature>
similarity index 96%
rename from alto-basic/endpointcostservice/hostnodetracker/pom.xml
rename to alto-basic/simple-ecs/hostnodetracker/pom.xml
index 72403f38e3564cb21607f7a03977ed2f180be5fd..b523a3a28f50c2b717add8f6c0f1f4e628259337 100644 (file)
@@ -11,7 +11,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opendaylight.alto.basic.endpointcostservice</groupId>
+    <groupId>org.opendaylight.alto.basic</groupId>
     <artifactId>hostnodetracker</artifactId>
     <version>0.3.0-SNAPSHOT</version>
     <build>
@@ -59,4 +59,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
similarity index 96%
rename from alto-basic/endpointcostservice/impl/pom.xml
rename to alto-basic/simple-ecs/impl/pom.xml
index 6aa5180364931c0c37547aac6643dab4a4f14570..651d94f4c7ce22ac143c663665910998b1df0532 100644 (file)
@@ -18,13 +18,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-impl</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-impl</artifactId>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-api</artifactId>
+      <artifactId>alto-simple-ecs-api</artifactId>
       <version>${project.version}</version>
     </dependency>
 
similarity index 87%
rename from alto-basic/endpointcostservice/it/pom.xml
rename to alto-basic/simple-ecs/it/pom.xml
index 603d2dbb965337ebacf99840be23f8a470014895..6d9c486aa49b48c395004415552247a5468af4fb 100644 (file)
@@ -18,22 +18,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-it</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-it</artifactId>
   <packaging>bundle</packaging>
 
   <properties>
     <skipITs>false</skipITs>
     <karaf.distro.groupId>org.opendaylight.alto.basic</karaf.distro.groupId>
-    <karaf.distro.artifactId>endpointcostservice-karaf</karaf.distro.artifactId>
     <karaf.distro.version>0.3.0-SNAPSHOT</karaf.distro.version>
+    <karaf.distro.artifactId>alto-simple-ecs-karaf</karaf.distro.artifactId>
     <karaf.distro.type>zip</karaf.distro.type>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-features</artifactId>
+      <artifactId>alto-simple-ecs-features</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
similarity index 89%
rename from alto-basic/endpointcostservice/karaf/pom.xml
rename to alto-basic/simple-ecs/karaf/pom.xml
index be67027dee301e7b48fefa3ad55fda41edc0b692..189aeddc273ffa7b2820e733126b1d5a0e80fb90 100644 (file)
@@ -14,20 +14,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.alto.basic</groupId>
-  <artifactId>endpointcostservice-karaf</artifactId>
   <version>0.3.0-SNAPSHOT</version>
+  <artifactId>alto-simple-ecs-karaf</artifactId>
   <name>${project.artifactId}</name>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <karaf.localFeature>odl-endpointcostservice-ui</karaf.localFeature>
+    <karaf.localFeature>odl-alto-simple-ecs-ui</karaf.localFeature>
   </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>endpointcostservice-artifacts</artifactId>
+        <artifactId>alto-simple-ecs-artifacts</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
@@ -45,7 +45,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>endpointcostservice-features</artifactId>
+      <artifactId>alto-simple-ecs-features</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
similarity index 82%
rename from alto-basic/endpointcostservice/pom.xml
rename to alto-basic/simple-ecs/pom.xml
index d764f39ff9e0981a607ff7f2a6ddfd884cb4d124..5d0e5d3e1d7c8af1f48f6a8b7bb4e496972c6db1 100644 (file)
@@ -14,10 +14,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <relativePath/>
   </parent>
 
-  <groupId>org.opendaylight.alto.basic.endpointcostservice</groupId>
-  <artifactId>endpointcostservice-aggregator</artifactId>
   <version>0.3.0-SNAPSHOT</version>
-  <name>endpointcostservice</name>
+  <groupId>org.opendaylight.alto.basic</groupId>
+  <artifactId>alto-simple-ecs-aggregator</artifactId>
+  <name>alto-simple-ecs</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
   <prerequisites>
@@ -77,10 +77,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     </plugins>
   </build>
 
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/endpointcostservice.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/endpointcostservice.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/endpointcostservice:Main</url>
-  </scm>
 </project>
index 6b6fc29b5130a2702ec6f7d4b7b6b6b3d55f3088..58ea2c9b3cd9144870549c104ea17fad5ea3c134 100644 (file)
@@ -450,19 +450,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}.basic</groupId>
-      <artifactId>endpointcostservice-impl</artifactId>
+      <artifactId>alto-simple-ecs-impl</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}.basic</groupId>
-      <artifactId>endpointcostservice-impl</artifactId>
+      <artifactId>alto-simple-ecs-impl</artifactId>
       <version>${project.version}</version>
       <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}.basic</groupId>
-      <artifactId>endpointcostservice-api</artifactId>
+      <artifactId>alto-simple-ecs-api</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
index c2c17d18c4213a4915a3949416787cf52d8d95bd..94ada338129c2367b319b05a7a37254a50b67e9a 100644 (file)
@@ -219,20 +219,28 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <feature name='odl-alto-hosttracker' version='${project.version}'
             description='OpenDaylight :: alto :: hosttracker'>
-    <!-- TODO -->
-    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${l2switch.version}'>odl-l2switch-hosttracker</feature>
-    <feature version='${l2switch.version}'>odl-l2switch-addresstracker</feature>
-    <feature version='${openflow.plugin.version}'>odl-openflowplugin-flow-services</feature>
-
-    <feature version='${project.version}'>odl-alto-core</feature>
-
-    <bundle>mvn:org.opendaylight.alto.basic/endpointcostservice-api/${project.version}</bundle>
-    <bundle>mvn:org.opendaylight.alto.basic/endpointcostservice-impl/${project.version}</bundle>
-    <configfile finalname="${configfile.directory}/alto-hosttracker.xml">
-        mvn:org.opendaylight.alto.basic/endpointcostservice-impl/${project.version}/xml/config
-    </configfile>
+    <conditional>
+      <condition>odl-l2switch-hosttracker</condition>
+      <feature version='${l2switch.version}'>odl-l2switch-addresstracker</feature>
+      <feature version='${project.version}'>odl-alto-core</feature>
+
+      <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-api/${project.version}</bundle>
+      <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}</bundle>
+      <configfile finalname="${configfile.directory}/alto-hosttracker.xml">
+        mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config
+      </configfile>
+    </conditional>
+
+    <conditional>
+      <condition>odl-alto-spce</condition>
+      <feature version='${project.version}'>odl-alto-core</feature>
+
+      <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-api/${project.version}</bundle>
+      <bundle>mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}</bundle>
+      <configfile finalname="${configfile.directory}/alto-hosttracker.xml">
+        mvn:org.opendaylight.alto.basic/alto-simple-ecs-impl/${project.version}/xml/config
+      </configfile>
+    </conditional>
   </feature>
 
   <feature name='odl-alto-nonstandard-types' version='${project.version}'