sxp-mapper fixed dependencies

    - bumped all to master

Change-Id: Icb0ce73baaf07ab062692bbcacdf5cc5bc80c18f
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/sxp-mapper/pom.xml b/sxp-mapper/pom.xml
index 35da14309b32ab7c5a47e2831eab5a312fa5b57b..99ad1f366098520b30207297106bfdb0b13b8557 100755 (executable)
--- a/sxp-mapper/pom.xml
+++ b/sxp-mapper/pom.xml
@@ -9,18 +9,18 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.groupbasedpolicy</groupId>
     <artifactId>sxp-mapper</artifactId>
-    <version>0.3.2-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>groupbasedpolicy-sxp-mapper</name>
 
     <properties>
-        <sxp.version>1.2.2-SNAPSHOT</sxp.version>
+        <sxp.version>1.3.0-SNAPSHOT</sxp.version>
     </properties>
 
     <dependencyManagement>

diff --git a/sxp-mapper/src/main/yang/sxp-mapper-model.yang b/sxp-mapper/src/main/yang/sxp-mapper-model.yang
index 3ac6c0d3c2aa7d514fef1482a620b2c17ed190d2..6a3a5c893451020624e9ce5f87a9218c76985007 100644 (file)
--- a/sxp-mapper/src/main/yang/sxp-mapper-model.yang
+++ b/sxp-mapper/src/main/yang/sxp-mapper-model.yang
@@ -11,7 +11,7 @@ module sxp-mapper-model {
     namespace "urn:opendaylight:params:xml:ns:yang:controller:config:groupbasedpolicy:sxp-mapper:model";
     prefix "sxpm-model";
 
-    import sxp-database { prefix sxp-database; revision-date 2014-10-02; }
+    import sxp-database { prefix sxp-database; revision-date 2016-03-08; }
     import gbp-common { prefix gbp-common; revision-date 2014-04-21; }
     import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
 
@@ -42,7 +42,7 @@ module sxp-mapper-model {
             }
             leaf-list endpoint-groups {
                type gbp-common:endpoint-group-id;
-               mandatory true;
+               min-elements 1;
                description
                     "The groups associated with this endpoint";
             }
@@ -66,7 +66,7 @@ module sxp-mapper-model {
                type gbp-common:l3-context-id;
                mandatory true;
                description
-                    "The context for the endpoint’s layer 3 address";
+                    "The context for the endpoint's layer 3 address";
             }
         }
     }