From bc0d823b9350d7ffe01c632583c4eaf8d31f5118 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 31 Mar 2017 16:00:20 -0400 Subject: [SDNC-5] Rebase sdnc-northbound Port to OpenDaylight Boron and sync updates since 16.10 Change-Id: I036c5d0bb600b305300e653023caffc83a262604 Signed-off-by: Dan Timoney --- vnfapi/features/src/main/resources/features.xml | 2 +- .../src/assembly/assemble_installer_zip.xml | 2 +- .../src/assembly/assemble_mvnrepo_zip.xml | 2 +- .../src/main/resources/scripts/install-feature.sh | 2 +- vnfapi/model/pom.xml | 4 +-- vnfapi/model/src/main/yang/VNF-API.yang | 6 ++++- vnfapi/provider/pom.xml | 2 +- .../impl/rev140523/VnfapiProviderModule.java | 2 +- .../rev140523/VnfapiProviderModuleFactory.java | 2 +- .../sdnc/vnfapi/VNFSDNSvcLogicServiceClient.java | 2 +- .../java/org/openecomp/sdnc/vnfapi/VnfSdnUtil.java | 29 +++++++++++----------- .../org/openecomp/sdnc/vnfapi/vnfapiProvider.java | 2 +- .../src/main/resources/initial/vnfapi-provider.xml | 2 +- .../openecomp/sdnc/vnfapi/TestPropertyList.java | 2 +- .../src/test/resources/proplist.properties | 2 +- .../src/test/resources/simplelogger.properties | 2 +- 16 files changed, 35 insertions(+), 30 deletions(-) (limited to 'vnfapi') diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml index 6d0bab2d..2758a482 100644 --- 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 37357aa8..4dc572ae 100644 --- 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 777da028..6e2e4204 100644 --- 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 33e9b036..93236c5b 100644 --- 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 6ac17fe3..43bef39d 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -30,7 +30,7 @@ org.opendaylight.mdsal maven-sal-api-gen-plugin - ${odl.yangtools.version} + ${odl.sal.api.gen.plugin.version} jar @@ -103,7 +103,7 @@ org.opendaylight.mdsal yang-binding - ${odl.yangtools.version} + ${odl.mdsal.yang.binding.version} org.opendaylight.yangtools diff --git a/vnfapi/model/src/main/yang/VNF-API.yang b/vnfapi/model/src/main/yang/VNF-API.yang index a786757f..f61b3e78 100755 --- 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; leaf interface-route-prefix { type ietf:ip-address; - description "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"; + description "OBSOLETE, route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes"; + } + leaf interface-route-prefix-cidr { + type string; + description "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes"; } } } diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 2d0b3f99..c20b279d 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -53,7 +53,7 @@ org.opendaylight.mdsal maven-sal-api-gen-plugin - ${odl.yangtools.version} + ${odl.sal.api.gen.plugin.version} jar 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 88d3e2ea..56a1b186 100644 --- 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 c696a4e6..2df2bfa9 100644 --- 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 56bac4e6..e15a9864 100644 --- 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 8c7fc7ab..74359630 100644 --- 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 31aeed26..0d31c071 100644 --- 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 4db02193..eebba0c4 100644 --- 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 e8836d7a..b131f834 100644 --- 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 ac8c13a3..203d5654 100644 --- 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 68ced844..9b10afdb 100644 --- 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. -- cgit 1.2.3-korg