fix costmap dependent tag in hosttracker

Change-Id: Ie03c48534fed384f746dd6045ce29838a5f30cf3
Signed-off-by: root <dongs2011@gmail.com>

diff --git a/alto-hosttracker/implementation/src/main/java/org/opendaylight/alto/altohosttracker/plugin/internal/AltoHostTrackerImpl.java b/alto-hosttracker/implementation/src/main/java/org/opendaylight/alto/altohosttracker/plugin/internal/AltoHostTrackerImpl.java
index 0df4b1a14c7aab7026d1d9f438a095fc6f865e96..2dc8ba89e86a2e3d25a60081c2e28ec1075f6201 100644 (file)
--- a/alto-hosttracker/implementation/src/main/java/org/opendaylight/alto/altohosttracker/plugin/internal/AltoHostTrackerImpl.java
+++ b/alto-hosttracker/implementation/src/main/java/org/opendaylight/alto/altohosttracker/plugin/internal/AltoHostTrackerImpl.java
@@ -114,6 +114,7 @@ public class AltoHostTrackerImpl implements DataChangeListener {
     private final DataBroker dataService;
     private final String topologyId;
 
+    private String networkTag=null;
     // public static final InstanceIdentifier<Resources> ALTO_IID =
     // InstanceIdentifier.builder(Resources.class).toInstance();
 
@@ -168,8 +169,9 @@ public class AltoHostTrackerImpl implements DataChangeListener {
         ValidIdString vis1 = new ValidIdString("pid1");
         PidName pid1 = new PidName(vis1);
 
+        TagString dtag = new TagString(this.networkTag);
         DependentVtags dv = new DependentVtagsBuilder().setResourceId(rid)
-                .setTag(tag).build();
+                .setTag(dtag).build();
         List<DependentVtags> dvList = new ArrayList<DependentVtags>();
         dvList.add(dv);
         CostType ct = new CostTypeBuilder().setCostMode(CostMode.Numerical)
@@ -295,7 +297,8 @@ public class AltoHostTrackerImpl implements DataChangeListener {
     private List<NetworkMap> loadNetworkMapList() {
         List<NetworkMap> networkMapList = new ArrayList<NetworkMap>();
         ResourceId rid = new ResourceId(new ValidIdString(NMRESOURCEID));
-        TagString tag = new TagString(TagGenerator.getTag(32));
+        this.networkTag = TagGenerator.getTag(32);
+        TagString tag = new TagString(this.networkTag);
         ValidIdString vis = new ValidIdString("pid0");
         PidName pid = new PidName(vis);
         IpPrefix ep = new IpPrefix(new Ipv4Prefix("0.0.0.0/0"));

diff --git a/alto-model/src/main/yang/alto-service.yang b/alto-model/src/main/yang/alto-service.yang
index 8073f7658159dc1927586817f7c1192da2c7cbd8..c2d5bb4e98f67d3e034a0cfbac9c2f54e75c8b21 100755 (executable)
--- a/alto-model/src/main/yang/alto-service.yang
+++ b/alto-model/src/main/yang/alto-service.yang
@@ -68,7 +68,7 @@ module alto-service {
           type alto:pid-name;
         }
         key "dst";
-        uses alto:alto-cost;
+        //uses alto:alto-cost;
       }
     }
   }
@@ -193,7 +193,7 @@ module alto-service {
               type alto:typed-endpoint-address;
             }
             key "dst";
-            uses alto:alto-cost;
+            //uses alto:alto-cost;
           }
         }
       }

diff --git a/features/pom.xml b/features/pom.xml
index 91d13167b77680ef04eb392538f42330750e47e6..f4c2048580ee6e97bd0c4b8aa751b207e9c2a133 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -113,6 +113,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}.alto-hosttracker</groupId>
+      <artifactId>alto-hosttracker-impl</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}.alto-hosttracker</groupId>
+      <artifactId>alto-hosttracker-model</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}.alto-hosttracker</groupId>
+      <artifactId>alto-hosttracker-config</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient-osgi</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 90db26ba0161206c69e456c0181a8cafc504a4f3..d02c42ead40bdd04f608440498b81b89f4742baa 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -47,6 +47,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.alto/alto-provider/${project.version}</bundle>
   </feature>
 
+  <feature name='odl-alto-hosttracker' version='${project.version}' description='OpenDaylight :: alto :: Hosttracker'>
+    <feature version='${project.version}'>odl-alto-model</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>
+    <configfile finalname="etc/opendaylight/karaf/59-altohosttracker.xml">mvn:org.opendaylight.alto.alto-hosttracker/alto-hosttracker-config/${project.version}/xml/config</configfile>
+    <bundle>mvn:org.opendaylight.alto.alto-hosttracker/alto-hosttracker-impl/${project.version}</bundle>
+    <bundle>mvn:org.opendaylight.alto.alto-hosttracker/alto-hosttracker-model/${project.version}</bundle>
+  </feature>
+
   <feature name='odl-alto-extension' version='${project.version}' description='Opendaylight :: alto :: extension'>
     <feature version='${project.version}'>odl-alto-commons</feature>
     <bundle>mvn:org.opendaylight.alto/services.ext.fs-map/${project.version}</bundle>