vLAN Tagging - Support Tosca Policies

Change-Id: I3086a3562dd4fa16f0a446884fbbd20041eb9691
Issue-ID: SDC-1056
Signed-off-by: Rokhvarg David <dr2032@att.com>

diff --git a/pom.xml b/pom.xml
index 0ae2ca8..363050b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
        <groupId>org.onap.sdc.jtosca</groupId>
        <artifactId>jtosca</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.3.1-SNAPSHOT</version>
         <name>sdc-jtosca</name>
        <properties>
 

diff --git a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java b/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
index f7ec967..437563e 100644 (file)
--- a/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/Policy.java
@@ -119,6 +119,12 @@ public class Policy extends EntityTemplate {
                                ", properties=" + properties +
                                '}';
        }
+       
+       public int compareTo(Policy other){
+               if(this.equals(other))
+                       return 0;
+               return this.getName().compareTo(other.getName()) == 0 ? this.getType().compareTo(other.getType()) : this.getName().compareTo(other.getName());
+       }
 }
 
 /*python

diff --git a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java b/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
index 3d94d6e..b06c045 100644 (file)
--- a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
+++ b/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java
@@ -836,6 +836,10 @@ public class ToscaTemplate extends Object {
                return nestedToscaTemplatesWithTopology;
        }
 
+       public ConcurrentHashMap<String, Object> getNestedTopologyTemplates() {
+               return nestedToscaTplsWithTopology;
+       }
+
        @Override
        public String toString() {
                return "ToscaTemplate{" +

diff --git a/version.properties b/version.properties
index 235314e..a61846b 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major=1
 minor=3
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}