Fix for YANG revisions not being explicit in import.

Change-Id: Ib1b6045ad74685ba37095c67aec424b67067545b
Signed-off-by: Keith Burns (alagalah) <[email protected]>

diff --git a/sfc-model/src/main/yang/ietf-access-control-list.yang b/sfc-model/src/main/yang/ietf-access-control-list.yang
index 33733341767b6ff98ee923124aff45c1a9bba1e4..86ba1d101b57f2569866ac61eb3de4da0cdc8a59 100644 (file)
--- a/sfc-model/src/main/yang/ietf-access-control-list.yang
+++ b/sfc-model/src/main/yang/ietf-access-control-list.yang
@@ -4,9 +4,11 @@ module ietf-access-control-list {
   prefix acl;
   import ietf-yang-types {
     prefix yang;
+    revision-date 2010-09-24;
   }
   import ietf-packet-fields {
     prefix packet-fields;
+    revision-date 2015-06-11;
   }
   organization "IETF NETMOD (NETCONF Data Modeling Language)
            Working Group";

diff --git a/sfc-model/src/main/yang/ietf-packet-fields.yang b/sfc-model/src/main/yang/ietf-packet-fields.yang
index f7486453fe15aaa7978668732354c06a2b6c888b..8cd43801ec5cf078db677e32a8404c5192c76486 100644 (file)
--- a/sfc-model/src/main/yang/ietf-packet-fields.yang
+++ b/sfc-model/src/main/yang/ietf-packet-fields.yang
@@ -4,9 +4,11 @@ module ietf-packet-fields {
   prefix packet-fields;
   import ietf-inet-types {
     prefix inet;
+    revision-date 2010-09-24;
   }
   import ietf-yang-types {
     prefix yang;
+    revision-date 2010-09-24;
   }
   organization "IETF NETMOD (NETCONF Data Modeling Language) Working
                 Group";

diff --git a/sfc-model/src/main/yang/rendered-service-path.yang b/sfc-model/src/main/yang/rendered-service-path.yang
index be7cd3d1807e767fc1c9a136f6c5c4ddb776b1a5..cfd403934fdeaea3df96909c4a7d8b275d7cbca9 100644 (file)
--- a/sfc-model/src/main/yang/rendered-service-path.yang
+++ b/sfc-model/src/main/yang/rendered-service-path.yang
@@ -4,13 +4,30 @@ module rendered-service-path {
 
   prefix sfc-rsp;
 
-  import service-function-type {prefix sfc-sft; }
-  import service-function-scheduler-type {prefix sfc-sfst;}
-  import service-function-path-metadata {prefix sfc-md; }
-  import service-locator {prefix sfc-sl;}
-  import service-statistics {prefix sfc-ss; }
-
-  import sfc-common {prefix sfc-common;}
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+      }
+  import service-function-scheduler-type {
+      prefix sfc-sfst;
+      revision-date 2015-03-12;
+      }
+  import service-function-path-metadata {
+      prefix sfc-md;
+      revision-date 2014-07-01;
+      }
+  import service-locator {
+      prefix sfc-sl;
+      revision-date 2014-07-01;
+      }
+  import service-statistics {
+      prefix sfc-ss;
+      revision-date 2014-07-01;
+      }
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-acl.yang b/sfc-model/src/main/yang/service-function-acl.yang
index 3c301f15c1d7239739099bb5847958452fd7c53e..c6c36b2a9757358264a82eef6a46c8652766b7a9 100644 (file)
--- a/sfc-model/src/main/yang/service-function-acl.yang
+++ b/sfc-model/src/main/yang/service-function-acl.yang
@@ -6,10 +6,12 @@ module service-function-acl {
   prefix sfc-acl;
 
   import ietf-access-control-list {
-    prefix "ietf-acl";
+    prefix ietf-acl;
+    revision-date 2015-03-17;
   }
   import ipfix-application-information {
-    prefix "ipfix-application-information";
+    prefix ipfix-application-information;
+    revision-date 2015-04-10;
   }
 
   organization "Cisco Systems, Inc.";

diff --git a/sfc-model/src/main/yang/service-function-chain.yang b/sfc-model/src/main/yang/service-function-chain.yang
index 85b1a8615383fa9b601f8778c385e4ef7ebd3d79..4d9716501744fd8b2a66a477d18687d13106fbf0 100644 (file)
--- a/sfc-model/src/main/yang/service-function-chain.yang
+++ b/sfc-model/src/main/yang/service-function-chain.yang
@@ -4,8 +4,14 @@ module service-function-chain {
 
   prefix sfc-sfc;
 
-  import service-function-type {prefix sfc-sft;}
-  import sfc-common {prefix sfc-common; }
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+}
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-description-monitor-report.yang b/sfc-model/src/main/yang/service-function-description-monitor-report.yang
index ae1c3753c01ed5dce671a58fa3dfe8dc05fb2ab0..ae0a869e6d1193d0bc9d52ef3541840591a4c662 100755 (executable)
--- a/sfc-model/src/main/yang/service-function-description-monitor-report.yang
+++ b/sfc-model/src/main/yang/service-function-description-monitor-report.yang
@@ -2,8 +2,14 @@ module service-function-description-monitor-report {
     namespace "urn.intel.params:xml:ns:sf-desc-mon-rpt";\r
     prefix sf-desc-mon-rpt;\r
 \r
-    import ietf-inet-types { prefix inet;}\r
-    import ietf-yang-types { prefix yang;}\r
+    import ietf-inet-types {\r
+        prefix inet;\r
+        revision-date 2010-09-24;\r
+        }\r
+    import ietf-yang-types {\r
+        prefix yang;\r
+        revision-date 2010-09-24;\r
+        }\r
 \r
     organization "Intel Inc.";\r
     contact "[email protected]";\r

diff --git a/sfc-model/src/main/yang/service-function-description-monitor.yang b/sfc-model/src/main/yang/service-function-description-monitor.yang
index ff3bb609ec0852091e0f5e5d55fe3e8cc8a8f94d..bfdb7c9015ffa80098e34929af467c15cecdfc9f 100644 (file)
--- a/sfc-model/src/main/yang/service-function-description-monitor.yang
+++ b/sfc-model/src/main/yang/service-function-description-monitor.yang
@@ -2,8 +2,15 @@ module service-function-description-monitor {
     namespace "urn.intel.params:xml:ns:sf-desc-mon";
     prefix sf-desc-mon;
 
-    import service-function { prefix sfc-sf;}
-    import service-function-description-monitor-report { prefix sf-desc-mon-rpt;}
+    import service-function {
+        prefix sfc-sf;
+        revision-date 2014-07-01;
+        }
+    import service-function-description-monitor-report {
+        prefix sf-desc-mon-rpt;
+        revision-date 2014-11-05;
+        }
+
     organization "Intel Inc.";
     contact "[email protected]";
     description

diff --git a/sfc-model/src/main/yang/service-function-forwarder-metadata-features.yang b/sfc-model/src/main/yang/service-function-forwarder-metadata-features.yang
index 1bf9da8aa4b46b95b0ccbdbba1e5608622dee3a6..8572346c56ac5c8ad49b978711f0a8754da775c5 100644 (file)
--- a/sfc-model/src/main/yang/service-function-forwarder-metadata-features.yang
+++ b/sfc-model/src/main/yang/service-function-forwarder-metadata-features.yang
@@ -4,13 +4,20 @@ module service-function-forwarder-metadata-features {
 
   prefix sfc-sff-md-features;
 
-  import ietf-inet-types        { prefix inet;}
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
 
-  import service-function-forwarder {
-    prefix "sfc-sff";
-  }
+  import yang-ext {
+      prefix ext;
+      revision-date 2013-07-09;
+      }
 
-  import yang-ext { prefix "ext"; }
+  import service-function-forwarder {
+      prefix "sfc-sff";
+      revision-date 2014-07-01;
+    }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-forwarder-ofs.yang b/sfc-model/src/main/yang/service-function-forwarder-ofs.yang
index de8fbb603a0dc0098f310f732fa7ee2abd20b0ce..173f21586629f66dbc839833bbcbd550cca4300d 100644 (file)
--- a/sfc-model/src/main/yang/service-function-forwarder-ofs.yang
+++ b/sfc-model/src/main/yang/service-function-forwarder-ofs.yang
@@ -5,10 +5,13 @@ module service-function-forwarder-ofs {
 
   prefix sfc-sff-ofs;
 
-  import service-function-forwarder { prefix "sfc-sff"; }
+  import service-function-forwarder {
+      prefix sfc-sff;
+      revision-date 2014-07-01;
+      }
   import ietf-yang-types {
     prefix "yang";
-    revision-date 2013-07-15;
+    revision-date 2010-09-24;
   }
 
   organization "Ericsson, Inc.";

diff --git a/sfc-model/src/main/yang/service-function-forwarder-ovs.yang b/sfc-model/src/main/yang/service-function-forwarder-ovs.yang
index 3db26fbaa0d156a71a5ef80ab28909dcf3da7528..2ee139121bbdb75a630129d6cc94d462a0db8c38 100644 (file)
--- a/sfc-model/src/main/yang/service-function-forwarder-ovs.yang
+++ b/sfc-model/src/main/yang/service-function-forwarder-ovs.yang
@@ -5,19 +5,28 @@ module service-function-forwarder-ovs {
 
   prefix sfc-sff-ovs;
 
-  import service-function-forwarder {prefix sfc-sff;}
-  import sfc-common {prefix sfc-common; }
-  import yang-ext { prefix "ext"; }
+  import service-function-forwarder {
+      prefix sfc-sff;
+      revision-date 2014-07-01;
+      }
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
+  import yang-ext {
+      prefix ext;
+      revision-date 2013-07-09;
+      }
   import ietf-yang-types {
-    prefix "yang";
+    prefix yang;
     revision-date 2013-07-15;
   }
   import ovsdb {
-    prefix "ovsdb";
+    prefix ovsdb;
     revision-date 2015-01-05;
   }
   import overlay {
-    prefix "ovsdb-overlay";
+    prefix ovsdb-overlay;
     revision-date 2015-01-05;
   }
 

diff --git a/sfc-model/src/main/yang/service-function-forwarder.yang b/sfc-model/src/main/yang/service-function-forwarder.yang
index 270ccba2b1bbc683b6756902fcb09f29982a34c0..aceb959ac305c2390d79c6d6d3c67437e62002ed 100644 (file)
--- a/sfc-model/src/main/yang/service-function-forwarder.yang
+++ b/sfc-model/src/main/yang/service-function-forwarder.yang
@@ -4,11 +4,26 @@ module service-function-forwarder {
 
   prefix sfc-sff;
 
-  import ietf-inet-types        {prefix inet;}
-  import service-locator        {prefix sfc-sl;  }
-  import service-function-type  {prefix sfc-sft; }
-  import service-statistics     {prefix sfc-ss;  }
-  import sfc-common {prefix sfc-common; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+  import service-locator {
+      prefix sfc-sl;
+      revision-date 2014-07-01;
+      }
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+      }
+  import service-statistics {
+      prefix sfc-ss;
+      revision-date 2014-07-01;
+      }
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-group.yang b/sfc-model/src/main/yang/service-function-group.yang
index 6b2e42a9aeac5c9769ed8ab550713f246cf234a7..8604c64092a2864f0dc178f6ab9e9d79a60a5de6 100644 (file)
--- a/sfc-model/src/main/yang/service-function-group.yang
+++ b/sfc-model/src/main/yang/service-function-group.yang
@@ -4,11 +4,26 @@ module service-function-group {
 
   prefix sfc-sfg;
 
-  import ietf-inet-types { prefix inet; }
-  import ietf-yang-types { prefix yang; }
-  import service-function {prefix sfc-sf; }
-  import service-function-type {prefix sfc-sft; }
-  import service-function-group-algorithm {prefix sfc-sfg-alg; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+  import ietf-yang-types {
+      prefix yang;
+      revision-date 2010-09-24;
+      }
+  import service-function {
+      prefix sfc-sf;
+      revision-date 2014-07-01;
+      }
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+      }
+  import service-function-group-algorithm {
+      prefix sfc-sfg-alg;
+      revision-date 2015-02-14;
+      }
 
   organization "Contextream, Inc.";
   contact "Kfir Yeshayahu <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-mapping.yang b/sfc-model/src/main/yang/service-function-mapping.yang
index 3b02c20bbf6a32cda17c5d0cd66e692234c4cff1..1ed4f2eb19f79f9e265270bade519914922483c6 100644 (file)
--- a/sfc-model/src/main/yang/service-function-mapping.yang
+++ b/sfc-model/src/main/yang/service-function-mapping.yang
@@ -4,8 +4,14 @@ module service-function-mapping {
 
   prefix sfc-sf-map;
 
-  import service-function-type {prefix sfc-sft;}
-  import service-locator {prefix sfc-sl;}
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+      }
+  import service-locator {
+      prefix sfc-sl;
+      revision-date 2014-07-01;
+      }
 
   organization "Ericsson Inc.";
   contact "Brady Johnson <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-path.yang b/sfc-model/src/main/yang/service-function-path.yang
index 58d45fe8d1a46e24d7e672742dc1685a6567819a..be60aaf45897879b8b683ba9cbf6f74f12892f0a 100644 (file)
--- a/sfc-model/src/main/yang/service-function-path.yang
+++ b/sfc-model/src/main/yang/service-function-path.yang
@@ -4,11 +4,19 @@ module service-function-path {
 
   prefix sfc-sfp;
 
-  import service-function-path-metadata {prefix sfc-md; }
-  import service-locator {prefix sfc-sl; }
-
-  import sfc-common {prefix sfc-common;}
+  import service-function-path-metadata {
+      prefix sfc-md;
+      revision-date 2014-07-01;
+      }
+  import service-locator {
+      prefix sfc-sl;
+      revision-date 2014-07-01;
+      }
 
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function-scheduler-type.yang b/sfc-model/src/main/yang/service-function-scheduler-type.yang
index 16dd90758908947bb05e19a7b57f0ac4dccc32a7..c55ce0f261b1c80d5fa27f46240265ec6975dc36 100644 (file)
--- a/sfc-model/src/main/yang/service-function-scheduler-type.yang
+++ b/sfc-model/src/main/yang/service-function-scheduler-type.yang
@@ -4,8 +4,10 @@ module service-function-scheduler-type {
 
   prefix sfc-sfst;
 
-  import ietf-yang-types { prefix yang; }
-
+  import ietf-yang-types {
+      prefix yang;
+      revision-date 2010-09-24;
+}
 
   organization "Intel, Inc.";
   contact "Johnson Li <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-function.yang b/sfc-model/src/main/yang/service-function.yang
index 243940692fd11a1c64607e30078838bd2a4ab129..bd2b098c9910fabc62254e26cd29326b1fe78a20 100644 (file)
--- a/sfc-model/src/main/yang/service-function.yang
+++ b/sfc-model/src/main/yang/service-function.yang
@@ -4,11 +4,26 @@ module service-function {
 
   prefix sfc-sf;
 
-  import ietf-inet-types {prefix inet; }
-  import service-function-type {prefix sfc-sft;}
-  import service-locator {prefix sfc-sl;}
-  import service-statistics {prefix sfc-ss; }
-  import sfc-common {prefix sfc-common; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+  import service-function-type {
+      prefix sfc-sft;
+      revision-date 2014-07-01;
+      }
+  import service-locator {
+      prefix sfc-sl;
+      revision-date 2014-07-01;
+      }
+  import service-statistics {
+      prefix sfc-ss;
+      revision-date 2014-07-01;
+      }
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-locator.yang b/sfc-model/src/main/yang/service-locator.yang
index a30b2f6cdba3c980d8b08bb3592a09aef4818056..238cccf9f79e9decec7109dfaed12d744728005e 100644 (file)
--- a/sfc-model/src/main/yang/service-locator.yang
+++ b/sfc-model/src/main/yang/service-locator.yang
@@ -4,8 +4,14 @@ module service-locator {
 
   prefix sfc-sl;
 
-  import ietf-inet-types { prefix inet; }
-  import ietf-yang-types { prefix yang; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+  import ietf-yang-types {
+      prefix yang;
+      revision-date 2010-09-24;
+      }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-model/src/main/yang/service-node.yang b/sfc-model/src/main/yang/service-node.yang
index e2c84651c0181ff869f6e2c79adb6351a2b40422..df94af8cef11abf1e2998e40e0d8f880d266e179 100644 (file)
--- a/sfc-model/src/main/yang/service-node.yang
+++ b/sfc-model/src/main/yang/service-node.yang
@@ -4,10 +4,19 @@ module service-node {
 
   prefix sfc-sn;
 
-  import ietf-inet-types { prefix inet; }
-  import ietf-yang-types {prefix yang; }
-
-  import sfc-common {prefix sfc-common; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+  import ietf-yang-types {
+      prefix yang;
+      revision-date 2010-09-24;
+      }
+
+  import sfc-common {
+      prefix sfc-common;
+      revision-date 2015-10-17;
+      }
 
 
   organization "Cisco Systems, Inc.";

diff --git a/sfc-model/src/main/yang/service-statistics.yang b/sfc-model/src/main/yang/service-statistics.yang
index 621fcd9f2cd11f3558ee4c01ddeffd49a68c5f4e..170f547236a684e9e21e144dde2defc1967f9a86 100644 (file)
--- a/sfc-model/src/main/yang/service-statistics.yang
+++ b/sfc-model/src/main/yang/service-statistics.yang
@@ -4,11 +4,15 @@ module service-statistics {
 
   prefix sfc-ss;
 
-  import ietf-inet-types { prefix inet; }
+  import ietf-inet-types {
+      prefix inet;
+      revision-date 2010-09-24;
+      }
+
   import ietf-yang-types {
-    prefix "yang";
-    revision-date 2013-07-15;
-  }
+    prefix yang;
+    revision-date 2010-09-24;
+    }
 
   organization "Cisco Systems, Inc.";
   contact "Reinaldo Penno <[email protected]>";

diff --git a/sfc-netconf/src/test/java/org/opendaylight/sfc/sfc_netconf/provider/api/SfcNetconfServiceFunctionAPITest.java b/sfc-netconf/src/test/java/org/opendaylight/sfc/sfc_netconf/provider/api/SfcNetconfServiceFunctionAPITest.java
index 5b8081b2236f99486ae1864e131164d5d12d550c..07acd179e974d75357237ae37566206366a09dcb 100755 (executable)
--- a/sfc-netconf/src/test/java/org/opendaylight/sfc/sfc_netconf/provider/api/SfcNetconfServiceFunctionAPITest.java
+++ b/sfc-netconf/src/test/java/org/opendaylight/sfc/sfc_netconf/provider/api/SfcNetconfServiceFunctionAPITest.java
@@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev14070
 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.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.ServiceFunctionState1;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.ServiceFunctionState1Builder;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.service.functions.state.service.function.state.SfcSfDescMon;

diff --git a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/AclExporterTest.java b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/AclExporterTest.java
index 47c2d916b1a1d075601b1d0620f23be54bd9ec45..11cbe1eb8f3a524b635546e103c006f4ebef40b7 100644 (file)
--- a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/AclExporterTest.java
+++ b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/AclExporterTest.java
@@ -44,11 +44,11 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6FlowLabel;
 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.rev100924.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev150611.acl.transport.header.fields.DestinationPortRange;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev150611.acl.transport.header.fields.DestinationPortRangeBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev150611.acl.transport.header.fields.SourcePortRange;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev150611.acl.transport.header.fields.SourcePortRangeBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -159,7 +159,7 @@ public class AclExporterTest {
         aclBuilder.setAclName(AclTestValues.ACL_NAME.getValue());
         aclBuilder.setAccessListEntries(this.buildAccessListEntries(accessListTestType));
 
-         //build access list
+        // build access list
         return aclBuilder.build();
     }
 
@@ -262,10 +262,10 @@ public class AclExporterTest {
         AceBuilder aceBuilder = new AceBuilder();
         aceBuilder.setRuleName(AclTestValues.RULE_NAME.getValue());
 
-        //build matches
+        // build matches
         aceBuilder.setMatches(this.buildMatches(accessListTestType));
 
-        //build actions
+        // build actions
         aceBuilder.setActions(this.buildActions());
 
         List<Ace> aceList = new ArrayList<>();

diff --git a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/ExporterUtilTest.java b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/ExporterUtilTest.java
index b7f0e436d39d7875d7d04f35f751bbfab839ad30..0966d5897a962438fc8a276996861f2ffcffa319 100644 (file)
--- a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/ExporterUtilTest.java
+++ b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/ExporterUtilTest.java
@@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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.rev100924.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/SfstateExporterTest.java b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/SfstateExporterTest.java
index 3da004b09b1a056baff457ac56089a7591594d13..23bb34691396b2c78b28531f0514b1f547f11e4a 100644 (file)
--- a/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/SfstateExporterTest.java
+++ b/sfc-sb-rest/src/test/java/org/opendaylight/sfc/sbrest/json/SfstateExporterTest.java
@@ -33,9 +33,9 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.ss.rev14070
 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.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Counter64;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.ZeroBasedCounter64;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.Counter64;
+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.rev100924.ZeroBasedCounter64;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.ServiceFunctionState1;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.ServiceFunctionState1Builder;
 import org.opendaylight.yang.gen.v1.urn.intel.params.xml.ns.sf.desc.mon.rev141201.service.functions.state.service.function.state.SfcSfDescMon;

diff --git a/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2BaseProviderUtils.java b/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2BaseProviderUtils.java
index 0a02cc9453fd0bd5d7ae4450dd1fd5e638b36633..a8203c4d1b8c0161e20f58e92d4c2183767f8d33 100644 (file)
--- a/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2BaseProviderUtils.java
+++ b/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2BaseProviderUtils.java
@@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev14070
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.ofs.rev150408.ServiceFunctionDictionary1;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.ofs.rev150408.SffDataPlaneLocator1;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.ofs.rev150408.port.details.OfsPort;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.OutputPortValues;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.slf4j.Logger;

diff --git a/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2RspProcessor.java b/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2RspProcessor.java
index f1c7797a74d542c2589bd4fe12569403c43ad411..d2111f5704b9901d5a8ad4c92293b982254eb4a9 100644 (file)
--- a/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2RspProcessor.java
+++ b/sfcofl2/src/main/java/org/opendaylight/sfc/l2renderer/SfcL2RspProcessor.java
@@ -41,7 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev14070
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev140701.data.plane.locator.locator.type.MacBuilder;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev140701.data.plane.locator.locator.type.Mpls;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sl.rev140701.data.plane.locator.locator.type.MplsBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.OutputPortValues;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.slf4j.Logger;

diff --git a/sfcofl2/src/test/java/org/opendaylight/sfc/l2renderer/RspBuilder.java b/sfcofl2/src/test/java/org/opendaylight/sfc/l2renderer/RspBuilder.java
index 22fe0e194247e991f968d138bde12cf5691066eb..5c632262ec3eead6257642bbd147782af2be68c9 100644 (file)
--- a/sfcofl2/src/test/java/org/opendaylight/sfc/l2renderer/RspBuilder.java
+++ b/sfcofl2/src/test/java/org/opendaylight/sfc/l2renderer/RspBuilder.java
@@ -69,7 +69,7 @@ import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.sff.ofs.
 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.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
 
 public class RspBuilder {