[SDNC-5] Rebase sdnc-northbound

Port to OpenDaylight Boron and sync updates since 16.10

Change-Id: I036c5d0bb600b305300e653023caffc83a262604
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/.scanignore b/.scanignore
new file mode 100644 (file)
index 0000000..eeb990c
--- /dev/null
+++ b/.scanignore
@@ -0,0 +1,6 @@
+vnfapi/model/src/main/yang/VNF-API.yang:            leaf aic-clli { 
+vnfapi/model/src/main/yang/VNF-API.yang:            leaf aic-cloud-region { 
+vnfapi/model/src/main/yang/VNF-API.yang:                description "The AIC cloud region which maps to contrail versions";
+vnfapi/model/src/main/yang/VNF-API.yang:            leaf aic-clli { 
+vnfapi/model/src/main/yang/VNF-API.yang:            leaf aic-cloud-region { 
+vnfapi/model/src/main/yang/VNF-API.yang:                description "The AIC cloud region which maps to contrail versions";

diff --git a/asdcApi/features/src/main/resources/features.xml b/asdcApi/features/src/main/resources/features.xml
index 54b2c80..2e9961a 100644 (file)
--- a/asdcApi/features/src/main/resources/features.xml
+++ b/asdcApi/features/src/main/resources/features.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/asdcApi/installer/src/assembly/assemble_installer_zip.xml b/asdcApi/installer/src/assembly/assemble_installer_zip.xml
index 0ce9b1a..728afca 100644 (file)
--- a/asdcApi/installer/src/assembly/assemble_installer_zip.xml
+++ b/asdcApi/installer/src/assembly/assemble_installer_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
index c64ca69..b4d2d61 100644 (file)
--- a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/asdcApi/installer/src/main/resources/scripts/install-feature.sh b/asdcApi/installer/src/main/resources/scripts/install-feature.sh
index 33e9b03..93236c5 100644 (file)
--- a/asdcApi/installer/src/main/resources/scripts/install-feature.sh
+++ b/asdcApi/installer/src/main/resources/scripts/install-feature.sh
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/asdcApi/model/pom.xml b/asdcApi/model/pom.xml
index ab1dd77..9d6c35a 100755 (executable)
--- a/asdcApi/model/pom.xml
+++ b/asdcApi/model/pom.xml
@@ -32,7 +32,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                </dependencies>
@@ -60,7 +60,7 @@
                <dependency>
                        <groupId>org.opendaylight.mdsal</groupId>
                        <artifactId>yang-binding</artifactId>
-                       <version>${odl.yangtools.version}</version>
+                       <version>${odl.mdsal.yang.binding.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>

diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml
index 590eae8..a5033e8 100755 (executable)
--- a/asdcApi/provider/pom.xml
+++ b/asdcApi/provider/pom.xml
@@ -54,7 +54,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                        <dependency>

diff --git a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
index a20c510..3caa24c 100644 (file)
--- a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
+++ b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
index f59edcc..02f4bc3 100644 (file)
--- a/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
+++ b/asdcApi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/asdcapi/provider/impl/rev140523/AsdcApiProviderModuleFactory.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java
index 43344cd..51ea9ac 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiProvider.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -197,7 +197,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
     }
 
 
-    private boolean artifactVersionExists(String aName, String aVersion) {
+    protected boolean artifactVersionExists(String aName, String aVersion) {
         InstanceIdentifier artifactInstanceId =
                 InstanceIdentifier.<Artifacts>builder(Artifacts.class)
                 .child(Artifact.class, new ArtifactKey(aName, aVersion)).toInstance();
@@ -218,7 +218,7 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
         }
     }
 
-    private void addArtifactVersion(String aName, String aVersion) {
+    protected void addArtifactVersion(String aName, String aVersion) {
 
 
         try {

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java
index 98d79d5..999cd45 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java
+++ b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiSliClient.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java
index 02ce4e1..d46aa3b 100644 (file)
--- a/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java
+++ b/asdcApi/provider/src/main/java/org/openecomp/sdnc/asdcapi/AsdcApiUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml b/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml
index 1e33f0d..9c6b8e5 100644 (file)
--- a/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml
+++ b/asdcApi/provider/src/main/resources/initial/asdcApi-provider.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/dataChange/features/src/main/resources/features.xml b/dataChange/features/src/main/resources/features.xml
index 98ed8d5..29a1508 100644 (file)
--- a/dataChange/features/src/main/resources/features.xml
+++ b/dataChange/features/src/main/resources/features.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/dataChange/installer/src/assembly/assemble_installer_zip.xml b/dataChange/installer/src/assembly/assemble_installer_zip.xml
index 0ce9b1a..728afca 100644 (file)
--- a/dataChange/installer/src/assembly/assemble_installer_zip.xml
+++ b/dataChange/installer/src/assembly/assemble_installer_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
index c64ca69..b4d2d61 100644 (file)
--- a/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/dataChange/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/dataChange/installer/src/main/resources/scripts/install-feature.sh b/dataChange/installer/src/main/resources/scripts/install-feature.sh
index 33e9b03..93236c5 100644 (file)
--- a/dataChange/installer/src/main/resources/scripts/install-feature.sh
+++ b/dataChange/installer/src/main/resources/scripts/install-feature.sh
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/dataChange/model/pom.xml b/dataChange/model/pom.xml
index d0f25a6..ef13cb6 100755 (executable)
--- a/dataChange/model/pom.xml
+++ b/dataChange/model/pom.xml
@@ -32,7 +32,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                </dependencies>
@@ -61,7 +61,7 @@
                <dependency>
                        <groupId>org.opendaylight.mdsal</groupId>
                        <artifactId>yang-binding</artifactId>
-                       <version>${odl.yangtools.version}</version>
+                       <version>${odl.mdsal.yang.binding.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>

diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 96ce511..2553303 100755 (executable)
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -56,7 +56,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                        <dependency>

diff --git a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java
index 43a3710..700c5c6 100644 (file)
--- a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java
+++ b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
index 157a9e3..62a2edd 100644 (file)
--- a/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
+++ b/dataChange/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/datachange/provider/impl/rev140523/DataChangeProviderModuleFactory.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java b/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java
index ff6c484..623b2e5 100644 (file)
--- a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java
+++ b/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeClient.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java b/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java
index 092dac2..865f3fa 100644 (file)
--- a/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java
+++ b/dataChange/provider/src/main/java/org/openecomp/sdnc/datachange/DataChangeProvider.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dataChange/provider/src/main/resources/initial/dataChange-provider.xml b/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
index 80a0ad3..36f2751 100644 (file)
--- a/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
+++ b/dataChange/provider/src/main/resources/initial/dataChange-provider.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
index ece7873..f010f3e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.openecomp.sdnc.core</groupId>
                <artifactId>root</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.1-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml
index 6d0bab2..2758a48 100644 (file)
--- a/vnfapi/features/src/main/resources/features.xml
+++ b/vnfapi/features/src/main/resources/features.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnfapi/installer/src/assembly/assemble_installer_zip.xml b/vnfapi/installer/src/assembly/assemble_installer_zip.xml
index 37357aa..4dc572a 100644 (file)
--- a/vnfapi/installer/src/assembly/assemble_installer_zip.xml
+++ b/vnfapi/installer/src/assembly/assemble_installer_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
index 777da02..6e2e420 100644 (file)
--- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnfapi/installer/src/main/resources/scripts/install-feature.sh b/vnfapi/installer/src/main/resources/scripts/install-feature.sh
index 33e9b03..93236c5 100644 (file)
--- a/vnfapi/installer/src/main/resources/scripts/install-feature.sh
+++ b/vnfapi/installer/src/main/resources/scripts/install-feature.sh
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml
index 6ac17fe..43bef39 100644 (file)
--- a/vnfapi/model/pom.xml
+++ b/vnfapi/model/pom.xml
@@ -30,7 +30,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                </dependencies>
@@ -103,7 +103,7 @@
                <dependency>
                        <groupId>org.opendaylight.mdsal</groupId>
                        <artifactId>yang-binding</artifactId>
-                       <version>${odl.yangtools.version}</version>
+                       <version>${odl.mdsal.yang.binding.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>

diff --git a/vnfapi/model/src/main/yang/VNF-API.yang b/vnfapi/model/src/main/yang/VNF-API.yang
index a786757..f61b3e7 100755 (executable)
--- a/vnfapi/model/src/main/yang/VNF-API.yang
+++ b/vnfapi/model/src/main/yang/VNF-API.yang
@@ -411,7 +411,11 @@ module VNF-API {
             ordered-by user;\r
             leaf interface-route-prefix {\r
                 type ietf:ip-address;\r
-                description "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";\r
+                description "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";\r
+            }\r
+            leaf interface-route-prefix-cidr {\r
+                type string;\r
+                description "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes";\r
             }\r
         }\r
     }\r

diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml
index 2d0b3f9..c20b279 100644 (file)
--- a/vnfapi/provider/pom.xml
+++ b/vnfapi/provider/pom.xml
@@ -53,7 +53,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.mdsal</groupId>
                                                <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.yangtools.version}</version>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
                                                <type>jar</type>
                                        </dependency>
                                        <dependency>

diff --git a/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModule.java b/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModule.java
index 88d3e2e..56a1b18 100644 (file)
--- a/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModule.java
+++ b/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModule.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModuleFactory.java b/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModuleFactory.java
index c696a4e..2df2bfa 100644 (file)
--- a/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModuleFactory.java
+++ b/vnfapi/provider/src/main/java/org/opendaylight/yang/gen/v1/org/openecomp/sdnc/vnfapi/provider/impl/rev140523/VnfapiProviderModuleFactory.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VNFSDNSvcLogicServiceClient.java b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VNFSDNSvcLogicServiceClient.java
index 56bac4e..e15a986 100644 (file)
--- a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VNFSDNSvcLogicServiceClient.java
+++ b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VNFSDNSvcLogicServiceClient.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VnfSdnUtil.java b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VnfSdnUtil.java
index 8c7fc7a..7435963 100644 (file)
--- a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VnfSdnUtil.java
+++ b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/VnfSdnUtil.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,37 +36,38 @@ public class VnfSdnUtil extends MdsalHelper {
     private static final Logger LOG = LoggerFactory.getLogger(VnfSdnUtil.class);
 
     public static File ODLHOME = null;
+
     private static Properties properties;
 
 
     public static void loadProperties() {
 
-        if (ODLHOME == null) {
-            ODLHOME = new File("/opt/opendaylight/current");
-
-            if (!ODLHOME.isDirectory()) {
-                ODLHOME = new File("/opt/bvc/controller");
-            }
+               if (ODLHOME == null) {
+                       ODLHOME = new File("/opt/opendaylight/current");
 
-        }
+                       if (!ODLHOME.isDirectory()) {
+                               ODLHOME = new File("/opt/bvc/controller");
+                       }
+               }
 
-        File file = new File(ODLHOME.getAbsoluteFile()+"/configuration/vnfapi.properties");
+               File propFile = new File(ODLHOME.getAbsolutePath() + "/configuration/vnfapi.properties");
+        String propFileName = propFile.getAbsolutePath();
         properties = new Properties();
         InputStream input = null;
-        if (file.isFile() && file.canRead()) {
+        if (propFile.isFile() && propFile.canRead()) {
             try    {
-                input = new FileInputStream(file);
+                input = new FileInputStream(propFile);
                 properties.load(input);
-                LOG.info("Loaded properties from " + PROPERTIES_FILE );
+                LOG.info("Loaded properties from " + propFileName );
                 setProperties(properties);
             } catch (Exception e) {
-                LOG.error("Failed to load properties " + PROPERTIES_FILE +"\n",e);
+                LOG.error("Failed to load properties " + propFileName +"\n",e);
             } finally {
                 if (input != null) {
                     try {
                         input.close();
                     } catch (IOException e) {
-                        LOG.error("Failed to close properties file " + PROPERTIES_FILE +"\n",e);
+                        LOG.error("Failed to close properties file " + propFileName +"\n",e);
                     }
                 }
             }

diff --git a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/vnfapiProvider.java b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/vnfapiProvider.java
index 31aeed2..0d31c07 100644 (file)
--- a/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/vnfapiProvider.java
+++ b/vnfapi/provider/src/main/java/org/openecomp/sdnc/vnfapi/vnfapiProvider.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/main/resources/initial/vnfapi-provider.xml b/vnfapi/provider/src/main/resources/initial/vnfapi-provider.xml
index 4db0219..eebba0c 100644 (file)
--- a/vnfapi/provider/src/main/resources/initial/vnfapi-provider.xml
+++ b/vnfapi/provider/src/main/resources/initial/vnfapi-provider.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/test/java/org/openecomp/sdnc/vnfapi/TestPropertyList.java b/vnfapi/provider/src/test/java/org/openecomp/sdnc/vnfapi/TestPropertyList.java
index e8836d7..b131f83 100644 (file)
--- a/vnfapi/provider/src/test/java/org/openecomp/sdnc/vnfapi/TestPropertyList.java
+++ b/vnfapi/provider/src/test/java/org/openecomp/sdnc/vnfapi/TestPropertyList.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/test/resources/proplist.properties b/vnfapi/provider/src/test/resources/proplist.properties
index ac8c13a..203d565 100644 (file)
--- a/vnfapi/provider/src/test/resources/proplist.properties
+++ b/vnfapi/provider/src/test/resources/proplist.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/vnfapi/provider/src/test/resources/simplelogger.properties b/vnfapi/provider/src/test/resources/simplelogger.properties
index 68ced84..9b10afd 100644 (file)
--- a/vnfapi/provider/src/test/resources/simplelogger.properties
+++ b/vnfapi/provider/src/test/resources/simplelogger.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/vnftools/features/src/main/resources/features.xml b/vnftools/features/src/main/resources/features.xml
index 8cd1ca2..0be5bea 100644 (file)
--- a/vnftools/features/src/main/resources/features.xml
+++ b/vnftools/features/src/main/resources/features.xml
@@ -4,7 +4,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnftools/installer/src/assembly/assemble_installer_zip.xml b/vnftools/installer/src/assembly/assemble_installer_zip.xml
index 0ce9b1a..728afca 100644 (file)
--- a/vnftools/installer/src/assembly/assemble_installer_zip.xml
+++ b/vnftools/installer/src/assembly/assemble_installer_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
index ba21dda..c14f8ae 100644 (file)
--- a/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnftools/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -3,7 +3,7 @@
   openECOMP : SDN-C
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights
-              reserved.
+                                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/vnftools/installer/src/main/resources/scripts/install-feature.sh b/vnftools/installer/src/main/resources/scripts/install-feature.sh
index 33e9b03..93236c5 100644 (file)
--- a/vnftools/installer/src/main/resources/scripts/install-feature.sh
+++ b/vnftools/installer/src/main/resources/scripts/install-feature.sh
@@ -5,7 +5,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java b/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java
index 5286496..505cde3 100644 (file)
--- a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java
+++ b/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfTools.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java b/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java
index 7e8e615..29abc73 100644 (file)
--- a/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java
+++ b/vnftools/provider/src/main/java/org/openecomp/sdnc/vnftools/VnfToolsActivator.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ *                                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/vnftools/provider/src/main/resources/l3ucpetools.properties b/vnftools/provider/src/main/resources/l3ucpetools.properties
index 1abb05a..1648955 100644 (file)
--- a/vnftools/provider/src/main/resources/l3ucpetools.properties
+++ b/vnftools/provider/src/main/resources/l3ucpetools.properties
@@ -3,7 +3,7 @@
 # openECOMP : SDN-C
 # ================================================================================
 # Copyright (C) 2017 AT&T Intellectual Property. All rights
-#             reserved.
+#                                              reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.