Upgrade ietf-{inet,yang}-types to 2013-07-15

Change-Id: I8f06030e57f6d17f2fee70977ed44b53c5e00aa6
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java
index 51b47c372597ac44591d8decc184b71e68314c86..44f9f024f4414359ba26fa0e2176672250177d4e 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowEntryMatcher.java
@@ -8,9 +8,9 @@
 package org.opendaylight.alto.basic.endpointcostservice.flow;
 
 import org.opendaylight.alto.basic.endpointcostservice.helper.IPPrefixHelper;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java
index a49b8f1f7ce27116c281ce6a8b6c9f67a9ab1d35..843992c5964508accd58a045f15f791895c8dd9f 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/FlowTableMatcher.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.alto.basic.endpointcostservice.flow;
 
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.group.action._case.GroupAction;
@@ -293,4 +293,4 @@ public class FlowTableMatcher {
             }
         });
     }
-}
\ No newline at end of file
+}

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java
index e2ca9e6a3f1d109030eeacf96c6ff4f94d7c7ba8..9c0c1e474f21aa2e7bfd0963d99f715dea3eb554 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/flow/MatchFields.java
@@ -8,7 +8,7 @@
 package org.opendaylight.alto.basic.endpointcostservice.flow;
 
 import org.opendaylight.alto.basic.endpointcostservice.util.RouteServiceConstants;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv4AddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv6AddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java
index 22d7b261d87a021c40ee5addb976e9f364cada6b..02df58aef1404908af930d07f39111c70f3d79f8 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/helper/IPPrefixHelper.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.alto.basic.endpointcostservice.helper;
 
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv4AddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv6AddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;
@@ -179,4 +179,4 @@ public class IPPrefixHelper {
     public String getIpPrefix() {
         return this.prefix;
     }
-}
\ No newline at end of file
+}

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
index 1be8147836dec81e70e74ea7d5ce4ca88050b0f8..6868a4d3d145e7cfe520e5d1db828c3b1a1c8f99 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/impl/BasicECSImplementation.java
@@ -18,7 +18,7 @@ import org.opendaylight.alto.basic.endpointcostservice.flow.MatchFields;
 import org.opendaylight.alto.basic.endpointcostservice.util.LinkNode;
 import org.opendaylight.alto.basic.endpointcostservice.helper.UtilHelper;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostMetric;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.core.types.rev150921.CostTypeData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.TypedAddressData;

diff --git a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java
index 0724bf5ed9fbb22bccd11e2d6806dbe51229f60b..54418bb326bf7803a57a78e2a8f8e7b1df933643 100644 (file)
--- a/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java
+++ b/alto-basic/simple-ecs/impl/src/main/java/org/opendaylight/alto/basic/endpointcostservice/suportservice/impl/NetworkHostNodeImpl.java
@@ -8,9 +8,9 @@
 package org.opendaylight.alto.basic.endpointcostservice.suportservice.impl;
 
 import org.opendaylight.alto.basic.endpointcostservice.suportservice.service.NetworkHostNodeService;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.address.tracker.rev140617.address.node.connector.Addresses;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv4AddressData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.model.endpointcost.rfc7285.rev151021.Ipv6AddressData;

diff --git a/alto-extensions/simple-pce/api/pom.xml b/alto-extensions/simple-pce/api/pom.xml
index 377baa1b77276108b153bc6e64d14d98bee290c9..400cdfb36619032b2caa0d2b1a6ebd5bb766e7d9 100644 (file)
--- a/alto-extensions/simple-pce/api/pom.xml
+++ b/alto-extensions/simple-pce/api/pom.xml
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceImpl.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceImpl.java
index 43578951bc3ad47a00915ff005e96ca054549417..f203091a8d463da483893275722015319b3fe4ee 100644 (file)
--- a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceImpl.java
+++ b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/AltoSpceImpl.java
@@ -15,9 +15,9 @@ import org.opendaylight.alto.spce.impl.util.InventoryReader;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.rev151106.AltoSpceMetric;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.rev151106.AltoSpceRemoveInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.spce.rev151106.AltoSpceRemoveOutput;

diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/FlowManager.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/FlowManager.java
index bb13c5ad0da1f7e40644dd9aed0092393a15baa7..905f849eb057cd397deef20facf7c99f15db2925 100644 (file)
--- a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/FlowManager.java
+++ b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/FlowManager.java
@@ -9,10 +9,10 @@
 package org.opendaylight.alto.spce.impl.util;
 
 import com.google.common.collect.ImmutableList;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;

diff --git a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/InventoryReader.java b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/InventoryReader.java
index 5e7f8f09d13070d56bbd6a6e34232cf32df57380..53f61a32e6305c1e5ce428e27fe2aa6ab68d56c9 100644 (file)
--- a/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/InventoryReader.java
+++ b/alto-extensions/simple-pce/impl/src/main/java/org/opendaylight/alto/spce/impl/util/InventoryReader.java
@@ -12,7 +12,7 @@ import com.google.common.base.Optional;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.host.tracker.rev140624.HostNode;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;