From 96a9aafdff7813324bc8a8ba1e743683e251dde6 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 1 Dec 2020 11:33:35 -0800 Subject: Migrate files from sli-plugins Migrate sli-plugins repo into new directory "plugins". Signed-off-by: Jessica Wagantall --- properties-node/.gitignore | 34 -- properties-node/installer/pom.xml | 127 ----- .../src/assembly/assemble_installer_zip.xml | 59 -- .../src/assembly/assemble_mvnrepo_zip.xml | 49 -- .../src/main/resources/scripts/install-feature.sh | 39 -- properties-node/pom.xml | 24 - properties-node/provider/pom.xml | 60 -- .../onap/ccsdk/sli/plugins/prop/JsonParser.java | 94 ---- .../onap/ccsdk/sli/plugins/prop/Parameters.java | 31 -- .../ccsdk/sli/plugins/prop/PropertiesNode.java | 194 ------- .../org/onap/ccsdk/sli/plugins/prop/XmlParser.java | 176 ------ .../blueprint/properties-node-blueprint.xml | 16 - .../blueprint/properties-node-blueprint.xml | 16 - .../ccsdk/sli/plugins/prop/TestJsonParser.java | 73 --- .../ccsdk/sli/plugins/prop/TestPropertiesNode.java | 608 --------------------- .../onap/ccsdk/sli/plugins/prop/TestXmlParser.java | 121 ---- .../provider/src/test/resources/invalidlength.xml | 49 -- properties-node/provider/src/test/resources/test | 30 - .../provider/src/test/resources/test-invalid.json | 29 - .../provider/src/test/resources/test-invalid.xml | 170 ------ .../provider/src/test/resources/test.json | 30 - .../provider/src/test/resources/test.txt | 31 -- .../provider/src/test/resources/test.xml | 182 ------ .../provider/src/test/resources/test3.xml | 82 --- 24 files changed, 2324 deletions(-) delete mode 100755 properties-node/.gitignore delete mode 100755 properties-node/installer/pom.xml delete mode 100644 properties-node/installer/src/assembly/assemble_installer_zip.xml delete mode 100644 properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml delete mode 100644 properties-node/installer/src/main/resources/scripts/install-feature.sh delete mode 100755 properties-node/pom.xml delete mode 100755 properties-node/provider/pom.xml delete mode 100644 properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java delete mode 100644 properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java delete mode 100644 properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java delete mode 100644 properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java delete mode 100755 properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml delete mode 100755 properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml delete mode 100644 properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java delete mode 100644 properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java delete mode 100644 properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java delete mode 100644 properties-node/provider/src/test/resources/invalidlength.xml delete mode 100644 properties-node/provider/src/test/resources/test delete mode 100644 properties-node/provider/src/test/resources/test-invalid.json delete mode 100644 properties-node/provider/src/test/resources/test-invalid.xml delete mode 100644 properties-node/provider/src/test/resources/test.json delete mode 100644 properties-node/provider/src/test/resources/test.txt delete mode 100644 properties-node/provider/src/test/resources/test.xml delete mode 100644 properties-node/provider/src/test/resources/test3.xml (limited to 'properties-node') diff --git a/properties-node/.gitignore b/properties-node/.gitignore deleted file mode 100755 index b73caf31e..000000000 --- a/properties-node/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -#####standard .git ignore entries##### - -## IDE Specific Files ## -org.eclipse.core.resources.prefs -.classpath -.project -.settings -.idea -.externalToolBuilders -maven-eclipse.xml -workspace - -## Compilation Files ## -*.class -**/target -target -target-ide -MANIFEST.MF - -## Misc Ignores (OS specific etc) ## -bin/ -dist -*~ -*.ipr -*.iml -*.iws -classes -out/ -.DS_STORE -.metadata - -## Folders which contain auto generated source code ## -yang-gen-config -yang-gen-sal diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml deleted file mode 100755 index 4dc62faae..000000000 --- a/properties-node/installer/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - org.onap.ccsdk.sli.plugins - properties-node-installer - 1.1.1-SNAPSHOT - pom - - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - - - ccsdk-properties-node - ${application.name} - mvn:org.onap.ccsdk.sli.plugins/${features.boot}/${project.version}/xml/features - false - - - - - - org.onap.ccsdk.sli.plugins - properties-node-provider - ${project.version} - - - - - - - - maven-assembly-plugin - 2.6 - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.plugins - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - - - diff --git a/properties-node/installer/src/assembly/assemble_installer_zip.xml b/properties-node/installer/src/assembly/assemble_installer_zip.xml deleted file mode 100644 index b6fd65582..000000000 --- a/properties-node/installer/src/assembly/assemble_installer_zip.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - installer_zip - - zip - - - - false - - - - target/stage/ - ${application.name} - 755 - - *.sh - - - - target/stage/ - ${application.name} - 644 - - *.sh - - - - - - - diff --git a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml deleted file mode 100644 index 9cdc78879..000000000 --- a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - repo - - zip - - - - false - - - - target/assembly/ - . - - - - - - - - diff --git a/properties-node/installer/src/main/resources/scripts/install-feature.sh b/properties-node/installer/src/main/resources/scripts/install-feature.sh deleted file mode 100644 index 0eab001d5..000000000 --- a/properties-node/installer/src/main/resources/scripts/install-feature.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -### -# ============LICENSE_START======================================================= -# openECOMP : SDN-C -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} -ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -INSTALLERDIR=$(dirname $0) - -REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip - -if [ -f ${REPOZIP} ] -then - unzip -d ${ODL_HOME} ${REPOZIP} -else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 -fi - -${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} feature:install ${features.boot} diff --git a/properties-node/pom.xml b/properties-node/pom.xml deleted file mode 100755 index 71fffe4d3..000000000 --- a/properties-node/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - - - org.onap.ccsdk.sli.plugins - properties-node - 1.1.1-SNAPSHOT - pom - - ccsdk-sli-plugins :: properties-node - This is an implementation of DG Execute Node that reads property file and - puts the properties in the DG context - - - provider - installer - - diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml deleted file mode 100755 index fdfb4b3cb..000000000 --- a/properties-node/provider/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - binding-parent - 2.1.0 - - - org.onap.ccsdk.sli.plugins - properties-node-provider - 1.1.1-SNAPSHOT - bundle - - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - - - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - - - - junit - junit - test - - - com.github.stefanbirkner - system-rules - 1.19.0 - test - - - org.springframework - spring-test - test - - - org.onap.ccsdk.sli.core - sli-common - provided - - - org.slf4j - slf4j-api - - - org.codehaus.jettison - jettison - - - diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java deleted file mode 100644 index 89243a055..000000000 --- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/JsonParser.java +++ /dev/null @@ -1,94 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.plugins.prop; - -import org.codehaus.jettison.json.JSONArray; -import org.codehaus.jettison.json.JSONException; -import org.codehaus.jettison.json.JSONObject; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; - -public final class JsonParser { - - private static final Logger log = LoggerFactory.getLogger(JsonParser.class); - - private JsonParser() { - // Preventing instantiation of the same. - } - - @SuppressWarnings("unchecked") - public static Map convertToProperties(String s) - throws SvcLogicException { - - checkNotNull(s, "Input should not be null."); - - try { - JSONObject json = new JSONObject(s); - Map wm = new HashMap<>(); - Iterator ii = json.keys(); - while (ii.hasNext()) { - String key1 = ii.next(); - wm.put(key1, json.get(key1)); - } - - Map mm = new HashMap<>(); - - while (!wm.isEmpty()) - for (String key : new ArrayList<>(wm.keySet())) { - Object o = wm.get(key); - wm.remove(key); - - if (o instanceof Boolean || o instanceof Number || o instanceof String) { - mm.put(key, o.toString()); - - log.info("Added property: {} : {}", key, o.toString()); - } else if (o instanceof JSONObject) { - JSONObject jo = (JSONObject) o; - Iterator i = jo.keys(); - while (i.hasNext()) { - String key1 = i.next(); - wm.put(key + "." + key1, jo.get(key1)); - } - } else if (o instanceof JSONArray) { - JSONArray ja = (JSONArray) o; - mm.put(key + "_length", String.valueOf(ja.length())); - - log.info("Added property: {}_length: {}", key, String.valueOf(ja.length())); - - for (int i = 0; i < ja.length(); i++) - wm.put(key + '[' + i + ']', ja.get(i)); - } - } - return mm; - } catch (JSONException e) { - throw new SvcLogicException("Unable to convert JSON to properties " + e.getLocalizedMessage(), e); - } - } -} diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java deleted file mode 100644 index 99e4647d7..000000000 --- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/Parameters.java +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.plugins.prop; - -import java.util.Set; - -public class Parameters { - public String fileName; - public String contextPrefix; - public Set listNameList; - public boolean fileBasedParsing; -} diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java deleted file mode 100644 index b4bc84747..000000000 --- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java +++ /dev/null @@ -1,194 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.plugins.prop; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class PropertiesNode implements SvcLogicJavaPlugin { - - private static final Logger log = LoggerFactory.getLogger(PropertiesNode.class); - - public void readProperties(Map paramMap, SvcLogicContext ctx) throws SvcLogicException { - Parameters param = getParameters(paramMap); - Properties prop = new Properties(); - try { - File file = new File(param.fileName); - try (InputStream in = new FileInputStream(file)) { - Map mm = null; - String pfx = param.contextPrefix != null ? param.contextPrefix + '.' : ""; - if (param.fileBasedParsing) { - byte[] data = new byte[(int) file.length()]; - if ("json".equalsIgnoreCase(getFileExtension(param.fileName))) { - in.read(data); - String str = new String(data, "UTF-8"); - mm = JsonParser.convertToProperties(str); - } else if ("xml".equalsIgnoreCase(getFileExtension(param.fileName))) { - in.read(data); - String str = new String(data, "UTF-8"); - mm = XmlParser.convertToProperties(str, param.listNameList); - } else { - prop.load(in); - for (Object key : prop.keySet()) { - String name = (String) key; - String value = prop.getProperty(name); - if (value != null && value.trim().length() > 0) { - ctx.setAttribute(pfx + name, getObfuscatedVal(value.trim())); - log.info("+++ " + pfx + name + ": [" + maskPassword(pfx + name, value) + "]"); - } - } - } - if (mm != null) { - for (Map.Entry entry : mm.entrySet()) { - ctx.setAttribute(pfx + entry.getKey(), getObfuscatedVal(entry.getValue())); - log.info("+++ " + pfx + entry.getKey() + ": [" - + maskPassword(pfx + entry.getKey(), entry.getValue()) + "]"); - } - } - } else { - prop.load(in); - for (Object key : prop.keySet()) { - String name = (String) key; - String value = prop.getProperty(name); - if (value != null && value.trim().length() > 0) { - ctx.setAttribute(pfx + name, getObfuscatedVal(value.trim())); - log.info("+++ " + pfx + name + ": [" + maskPassword(pfx + name, value) + "]"); - } - } - } - } - } catch (IOException e) { - throw new SvcLogicException("Cannot read property file: " + param.fileName + ": " + e.getMessage(), e); - } - } - - /* Unobfuscate param value */ - private static String getObfuscatedVal(String paramValue) { - String resValue = paramValue; - if (paramValue != null && paramValue.startsWith("${") && paramValue.endsWith("}")) - { - String paramStr = paramValue.substring(2, paramValue.length()-1); - if (paramStr != null && paramStr.length() > 0) - { - String val = System.getenv(paramStr); - if (val != null && val.length() > 0) - { - resValue=val; - log.info("Obfuscated value RESET for param value:" + paramValue); - } - } - } - return resValue; - } - - /* - * Getting extension has to do the following "" --> "" "name" --> "" "name.txt" --> "txt" - * ".htpasswd" --> "" "name.with.many.dots.myext" --> "myext" - */ - private static String getFileExtension(String fileName) { - if (fileName.lastIndexOf(".") != -1 && fileName.lastIndexOf(".") != 0) { - return fileName.substring(fileName.lastIndexOf(".") + 1); - } else { - return ""; - } - } - - protected Parameters getParameters(Map paramMap) throws SvcLogicException { - Parameters p = new Parameters(); - p.fileName = parseParam(paramMap, "fileName", true, null); - p.contextPrefix = parseParam(paramMap, "contextPrefix", false, null); - p.listNameList = getListNameList(paramMap); - String fileBasedParsingStr = paramMap.get("fileBasedParsing"); - p.fileBasedParsing = "true".equalsIgnoreCase(fileBasedParsingStr); - return p; - } - - protected Set getListNameList(Map paramMap) { - Set ll = new HashSet<>(); - for (Map.Entry entry : paramMap.entrySet()) { - if (entry.getKey().startsWith("listName")) { - ll.add(entry.getValue()); - } - } - return ll; - } - - private String parseParam(Map paramMap, String name, boolean required, String def) - throws SvcLogicException { - String s = paramMap.get(name); - - if (s == null || s.trim().length() == 0) { - if (!required) { - return def; - } - throw new SvcLogicException("Parameter " + name + " is required in PropertiesNode"); - } - - s = s.trim(); - String value = ""; - int i = 0; - int i1 = s.indexOf('%'); - while (i1 >= 0) { - int i2 = s.indexOf('%', i1 + 1); - if (i2 < 0) { - throw new SvcLogicException("Cannot parse parameter " + name + ": " + s + ": no matching %"); - } - - String varName = s.substring(i1 + 1, i2); - String varValue = System.getenv(varName); - if (varValue == null) { - varValue = ""; - } - - value += s.substring(i, i1); - value += varValue; - - i = i2 + 1; - i1 = s.indexOf('%', i); - } - value += s.substring(i); - - log.info("Parameter " + name + ": " + maskPassword(name, value)); - return value; - } - - private static Object maskPassword(String name, Object value) { - String[] pwdNames = {"pwd", "passwd", "password", "Pwd", "Passwd", "Password"}; - for (String pwdName : pwdNames) { - if (name.contains(pwdName)) { - return "**********"; - } - } - return value; - } -} diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java deleted file mode 100644 index f48a21e9d..000000000 --- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/XmlParser.java +++ /dev/null @@ -1,176 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * - * Modifications Copyright © 2018 IBM. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.plugins.prop; - -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xml.sax.Attributes; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -import javax.xml.XMLConstants; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import static com.google.common.base.Preconditions.checkNotNull; - -public final class XmlParser { - - private static final Logger log = LoggerFactory.getLogger(XmlParser.class); - - private XmlParser() { - // Preventing instantiation of the same. - } - - public static Map convertToProperties(String s, Set listNameList) - throws SvcLogicException { - - checkNotNull(s, "Input should not be null."); - - Handler handler = new Handler(listNameList); - try { - SAXParserFactory factory = SAXParserFactory.newInstance(); - - factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); - factory.setFeature("http://xml.org/sax/features/external-general-entities", false); - factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); - SAXParser saxParser = factory.newSAXParser(); - InputStream in = new ByteArrayInputStream(s.getBytes()); - saxParser.parse(in, handler); - } catch (ParserConfigurationException | IOException | SAXException | NumberFormatException e) { - throw new SvcLogicException("Unable to convert XML to properties" + e.getLocalizedMessage(), e); - } - return handler.getProperties(); - } - - private static class Handler extends DefaultHandler { - - private Set listNameList; - - private Map properties = new HashMap<>(); - - StringBuilder currentName = new StringBuilder(); - StringBuilder currentValue = new StringBuilder(); - - public Handler(Set listNameList) { - super(); - this.listNameList = listNameList; - if (this.listNameList == null) - this.listNameList = new HashSet<>(); - } - - public Map getProperties() { - return properties; - } - - @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) - throws SAXException { - super.startElement(uri, localName, qName, attributes); - - String name = localName; - if (name == null || name.trim().length() == 0) - name = qName; - int i2 = name.indexOf(':'); - if (i2 >= 0) - name = name.substring(i2 + 1); - - if (currentName.length() > 0) - currentName.append(Character.toString('.')); - currentName.append(name); - - String listName = removeIndexes(currentName.toString()); - - if (listNameList.contains(listName)) { - String n = currentName.toString() + "_length"; - int len = getInt(properties, n); - properties.put(n, String.valueOf(len + 1)); - currentName.append("[").append(len).append("]"); - } - } - - @Override - public void endElement(String uri, String localName, String qName) throws SAXException { - super.endElement(uri, localName, qName); - - String name = localName; - if (name == null || name.trim().length() == 0) - name = qName; - int i2 = name.indexOf(':'); - if (i2 >= 0) - name = name.substring(i2 + 1); - - String s = currentValue.toString().trim(); - if (s.length() > 0) { - properties.put(currentName.toString(), s); - - log.info("Added property: {} : {}", currentName, s); - currentValue = new StringBuilder(); - } - - int i1 = currentName.lastIndexOf("." + name); - if (i1 <= 0) - currentName = new StringBuilder(); - else - currentName = new StringBuilder(currentName.substring(0, i1)); - } - - @Override - public void characters(char[] ch, int start, int length) throws SAXException { - super.characters(ch, start, length); - - String value = new String(ch, start, length); - currentValue.append(value); - } - - private static int getInt(Map mm, String name) { - String s = mm.get(name); - if (s == null) - return 0; - return Integer.parseInt(s); - } - - private String removeIndexes(String currentName) { - StringBuilder b = new StringBuilder(); - boolean add = true; - for (int i = 0; i < currentName.length(); i++) { - char c = currentName.charAt(i); - if (c == '[') - add = false; - else if (c == ']') - add = true; - else if (add) - b.append(Character.toString(c)); - } - return b.toString(); - } - } -} diff --git a/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml deleted file mode 100755 index 6e1d48efd..000000000 --- a/properties-node/provider/src/main/resources/OSGI-INF/blueprint/properties-node-blueprint.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - org.onap.ccsdk.sli.plugins.prop.PropertiesNode - - - - \ No newline at end of file diff --git a/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml b/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml deleted file mode 100755 index 6e1d48efd..000000000 --- a/properties-node/provider/src/main/resources/org/opendaylight/blueprint/properties-node-blueprint.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - org.onap.ccsdk.sli.plugins.prop.PropertiesNode - - - - \ No newline at end of file diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java deleted file mode 100644 index 0681124d9..000000000 --- a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestJsonParser.java +++ /dev/null @@ -1,73 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package jtest.org.onap.ccsdk.sli.plugins.prop; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.junit.Test; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.plugins.prop.JsonParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestJsonParser { - - private static final Logger log = LoggerFactory.getLogger(TestJsonParser.class); - - @Test - public void test() throws SvcLogicException, IOException { - BufferedReader in = new BufferedReader( - new InputStreamReader(ClassLoader.getSystemResourceAsStream("test.json")) - ); - StringBuilder b = new StringBuilder(); - String line; - while ((line = in.readLine()) != null) - b.append(line).append('\n'); - - Map mm = JsonParser.convertToProperties(b.toString()); - - logProperties(mm); - - in.close(); - } - - @Test(expected = NullPointerException.class) - public void testNullString() throws SvcLogicException { - JsonParser.convertToProperties(null); - } - - private void logProperties(Map mm) { - List ll = new ArrayList<>(); - for (Object o : mm.keySet()) - ll.add((String) o); - Collections.sort(ll); - log.info("Properties:"); - for (String name : ll) - log.info("--- {}: {}", name, mm.get(name)); - } -} diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java deleted file mode 100644 index a858c49b3..000000000 --- a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestPropertiesNode.java +++ /dev/null @@ -1,608 +0,0 @@ -package jtest.org.onap.ccsdk.sli.plugins.prop; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.EnvironmentVariables; -import static org.junit.Assert.assertEquals; -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.plugins.prop.PropertiesNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestPropertiesNode { - - private static final Logger log = LoggerFactory.getLogger(TestPropertiesNode.class); - @Rule - public EnvironmentVariables environmentVariables = new EnvironmentVariables(); - - @Test - public void testJSONFileParsing() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("contextPrefix", "test-json"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-json.message"),"The provisioned access " + - "bandwidth is at or exceeds 50% of the total server capacity."); - } - - @Test - public void testJSONFileArrayParsing() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("contextPrefix", "test-json"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-json.equipment-data[0].max-server-speed"),"1600000"); - assertEquals(ctx.getAttribute("test-json.resource-state.used"),"1605000"); - assertEquals(ctx.getAttribute("test-json.resource-rule.service-model"),"DUMMY"); - assertEquals(ctx.getAttribute("test-json.resource-rule.endpoint-position"),"VCE-Cust"); - } - - @Test - public void testJSONFileParsingPrefixCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("contextPrefix", ""); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("equipment-data[0].max-server-speed"),"1600000"); - assertEquals(ctx.getAttribute("resource-state.used"),"1605000"); - assertEquals(ctx.getAttribute("resource-rule.service-model"),"DUMMY"); - assertEquals(ctx.getAttribute("resource-rule.endpoint-position"),"VCE-Cust"); - assertEquals(ctx.getAttribute("resource-rule.hard-limit-expression"),"max-server-" + - "speed * number-primary-servers"); - } - - @Test - public void testJSONFileParsingNoPrefix() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("equipment-data[0].max-server-speed"),"1600000"); - assertEquals(ctx.getAttribute("resource-state.used"),"1605000"); - assertEquals(ctx.getAttribute("resource-rule.service-model"),"DUMMY"); - assertEquals(ctx.getAttribute("resource-rule.endpoint-position"),"VCE-Cust"); - assertEquals(ctx.getAttribute("resource-rule.hard-limit-expression"),"max-server-" + - "speed * number-primary-servers"); - } - - @Test - public void testJSONFileParsingCtxCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("equipment-data[0].max-server-speed"),"1600000"); - assertEquals(ctx.getAttribute("resource-state.used"),"1605000"); - assertEquals(ctx.getAttribute("resource-rule.service-model"),"DUMMY"); - assertEquals(ctx.getAttribute("resource-rule.endpoint-position"),"VCE-Cust"); - assertEquals(ctx.getAttribute("resource-rule.hard-limit-expression"),"max-server-" + - "speed * number-primary-servers"); - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test(expected = SvcLogicException.class) - public void testToPropertiesInvalidJson() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test-invalid.json"); - p.put("contextPrefix", "invalid"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test - public void testTXTFileParsing() throws SvcLogicException { - - environmentVariables.set("deployer_pass", "sdncp-123"); - assertEquals("sdncp-123", System.getenv("deployer_pass")); - - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("contextPrefix", "test-txt"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-txt.service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("test-txt.service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("test-txt.operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("test-txt.service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("test-txt.service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - assertEquals(ctx.getAttribute("test-txt.obfuscated-var"), "sdncp-123"); - } - - @Test - public void testTXTFileParsingPrefixCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("contextPrefix", ""); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testTXTFileParsingNoPrefix() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testTXTFileParsingCtxCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test(expected = SvcLogicException.class) - public void testToPropertiesInvalidParam() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test(expected = SvcLogicException.class) - public void testToPropertiesNoParam() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test(expected = SvcLogicException.class) - public void testToPropertiesFilePathError() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/tests/resources/test.txt"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test - public void testXMLFileParsing() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", "test-xml"); - p.put("listName", "project.build"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-xml.project.modelVersion"),"4.0.0"); - } - - @Test - public void testXMLFileInnerParsing() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", "test-xml"); - p.put("listName", "project.modelVersion"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-xml.project.properties.project.build.sourceEncoding"),"UTF-8"); - assertEquals(ctx.getAttribute("test-xml.project.dependencies.dependency.scope"),"provided"); - assertEquals(ctx.getAttribute("test-xml.project.build.pluginManagement.plugins.plugin.configuration" + - ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); - assertEquals(ctx.getAttribute("test-xml.project.build.plugins.plugin.configuration." + - "instructions.Import-Package"),"*"); - } - - @Test - public void testXMLFileParsingPrefixCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", ""); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("project.properties.project.build.sourceEncoding"),"UTF-8"); - assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); - assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + - ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); - assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + - "instructions.Import-Package"),"*"); - } - - @Test - public void testXMLFileParsingNoPrefix() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("project.properties.project.build.sourceEncoding"),"UTF-8"); - assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); - assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + - ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); - assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + - "instructions.Import-Package"),"*"); - } - - @Test - public void testXMLFileParsingCtxCheck() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("project.properties.project.build.sourceEncoding"),"UTF-8"); - assertEquals(ctx.getAttribute("project.dependencies.dependency.scope"),"provided"); - assertEquals(ctx.getAttribute("project.build.pluginManagement.plugins.plugin.configuration" + - ".lifecycleMappingMetadata.pluginExecutions.pluginExecution." + - "pluginExecutionFilter.versionRange"),"[1.2.0.100,)"); - assertEquals(ctx.getAttribute("project.build.plugins.plugin.configuration." + - "instructions.Import-Package"),"*"); - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test(expected = SvcLogicException.class) - public void testToPropertiesInvalidXML() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test-invalid.xml"); - p.put("contextPrefix", "invalid"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test - public void testXMLFileParsingListName() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", "test-xml-listName"); - p.put("fileBasedParsing","true"); - p.put("listName", "project.build.pluginManagement"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-xml-listName.project.build." + - "pluginManagement.plugins.plugin.version"),null); - assertEquals(ctx.getAttribute("test-xml-listName.project.build." + - "plugins.plugin.groupId"),"org.apache.felix"); - } - - @Test - public void testXMLFileParsingListNameAnother() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", "test-xml-listName"); - p.put("fileBasedParsing","true"); - p.put("listName", "project.modelVersion"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-xml-listName.project.modelVersion"),null); - assertEquals(ctx.getAttribute("test-xml-listName.project.build." + - "plugins.plugin.groupId"),"org.apache.felix"); - } - - @Test - public void testTXTFileParsingNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("contextPrefix", "test-txt"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("test-txt.service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("test-txt.service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("test-txt.operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("test-txt.service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("test-txt.service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testTXTFileParsingPrefixCheckNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - p.put("contextPrefix", ""); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testTXTFileParsingNoPrefixNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testTXTFileParsingCtxCheckNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.txt"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - assertEquals(ctx.getAttribute("tmp.sdn-circuit-req-row_length"),"1"); - } - - @Test - public void testJSONFileArrayParsingNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.json"); - p.put("contextPrefix", "NotFileBased"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("NotFileBased.\"limit-value\""),"\"1920000\""); - assertEquals(ctx.getAttribute("NotFileBased.\"hard-limit-expression\""),"\"max-server-speed * number-primary-servers\","); - assertEquals(ctx.getAttribute("NotFileBased.\"test-inner-node\""),"\"Test-Value\""); - } - - @Test - public void testXMLFileInnerParsingNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test.xml"); - p.put("contextPrefix", "NotFileBased"); - p.put("listName", "project.modelVersion"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("NotFileBased.RESTAPI"),"Call Node - Provider"); - assertEquals(ctx.getAttribute("NotFileBased."); - assertEquals(ctx.getAttribute("NotFileBased.openECOMP"),"SDN-C"); - assertEquals(ctx.getAttribute("NotFileBased."); - } - - @Test - public void testNoFileTypeNoPrefixNotFileBased() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test(expected = SvcLogicException.class) - public void testNoFileTypeParseReqError() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("file Name", "src/test/resources/test"); - p.put("fileBasedParsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } - - @Test - public void testNoFileTypeParseError() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map p = new HashMap(); - p.put("fileName", "src/test/resources/test"); - p.put("file Based % Parsing","true"); - - PropertiesNode rcn = new PropertiesNode(); - rcn.readProperties(p, ctx); - - assertEquals(ctx.getAttribute("service-data.service-information.service-type"),"AVPN"); - assertEquals(ctx.getAttribute("service-configuration-notification-input.response-code"),"0"); - assertEquals(ctx.getAttribute("operational-data.avpn-ip-port-information.port-" + - "level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing"),"WRED"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.l1-customer-handoff"),"_1000BASELX"); - assertEquals(ctx.getAttribute("service-data.avpn-ip-port-information.avpn-" + - "access-information.vlan-tag-control"),"_1Q"); - } -} diff --git a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java b/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java deleted file mode 100644 index 7cd072ed8..000000000 --- a/properties-node/provider/src/test/java/jtest/org/onap/ccsdk/sli/plugins/prop/TestXmlParser.java +++ /dev/null @@ -1,121 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package jtest.org.onap.ccsdk.sli.plugins.prop; - -import org.junit.Test; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.plugins.prop.XmlParser; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; - -public class TestXmlParser { - - private static final Logger log = LoggerFactory.getLogger(TestXmlParser.class); - - @Test - public void test() throws Exception { - BufferedReader in = new BufferedReader( - new InputStreamReader(ClassLoader.getSystemResourceAsStream("test3.xml")) - ); - StringBuilder b = new StringBuilder(); - String line; - while ((line = in.readLine()) != null) - b.append(line).append('\n'); - - Set listNameList = new HashSet(); - listNameList.add("project.dependencies.dependency"); - listNameList.add("project.build.plugins.plugin"); - listNameList.add("project.build.plugins.plugin.executions.execution"); - listNameList.add("project.build.pluginManagement.plugins.plugin"); - listNameList.add("project.build.pluginManagement." + - "plugins.plugin.configuration.lifecycleMappingMetadata.pluginExecutions.pluginExecution"); - - Map mm = XmlParser.convertToProperties(b.toString(), listNameList); - logProperties(mm); - in.close(); - } - - @Test - public void testValidLength() throws Exception { - BufferedReader in = new BufferedReader( - new InputStreamReader(ClassLoader.getSystemResourceAsStream("test3.xml")) - ); - StringBuilder b = new StringBuilder(); - String line; - while ((line = in.readLine()) != null) - b.append(line).append('\n'); - - Set listNameList = new HashSet(); - listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport"); - listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport"); - - Map mm = XmlParser.convertToProperties(b.toString(), listNameList); - - assertThat(mm.get("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport[5]"), is("SET_RESET_LP")); - assertThat(mm.get("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport[0]"), is("SET_BVOIP_IN")); - - logProperties(mm); - in.close(); - } - - @Test(expected = SvcLogicException.class) - public void testInvalidLength() throws Exception { - BufferedReader in = new BufferedReader( - new InputStreamReader(ClassLoader.getSystemResourceAsStream("invalidlength.xml")) - ); - StringBuilder b = new StringBuilder(); - String line; - while ((line = in.readLine()) != null) - b.append(line).append('\n'); - - Set listNameList = new HashSet(); - listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfImport"); - listNameList.add("ApplyGroupResponse.ApplyGroupResponseData.VrfDetails.VrfExport"); - - Map mm = XmlParser.convertToProperties(b.toString(), listNameList); - logProperties(mm); - in.close(); - } - - private void logProperties(Map mm) { - List ll = new ArrayList<>(); - for (Object o : mm.keySet()) - ll.add((String) o); - Collections.sort(ll); - - log.info("Properties:"); - for (String name : ll) - log.info("--- " + name + ": " + mm.get(name)); - } -} diff --git a/properties-node/provider/src/test/resources/invalidlength.xml b/properties-node/provider/src/test/resources/invalidlength.xml deleted file mode 100644 index c086d564e..000000000 --- a/properties-node/provider/src/test/resources/invalidlength.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - ICOREPVC-81114561 - - VPNL811182 - 811182 - 21302:811182 - SET_BVOIP_IN - SET6_BVOIP_IN - a - SET6_DSU - SET_DSU - SET6_MANAGED - SET_MANAGED - SET_LOVRF_COMMUNITY - SET_RESET_LP - - AG_MAX_MCASTROUTES - - - - 200 - Success - Y - - diff --git a/properties-node/provider/src/test/resources/test b/properties-node/provider/src/test/resources/test deleted file mode 100644 index 79e8acff4..000000000 --- a/properties-node/provider/src/test/resources/test +++ /dev/null @@ -1,30 +0,0 @@ -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-egress-class-queueing-policing-codes.cos2v-queueing-code = P -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-egress-class-queueing-policing-codes.cos3-queueing-code = W -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos2-queueing = WRED -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos2v-queueing = QueueLimit -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing = WRED -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos2-shaping = Disable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos2v-shaping = Enable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos3-shaping = Disable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-codes.cos2-shaping-code = W -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-codes.cos2v-shaping-code = P -service-configuration-notification-input.ack-final-indicator = Y -service-configuration-notification-input.response-code = 0 -service-configuration-notification-input.response-message = Plc Activation Failed: Device gblond2005me6 Sync-from Failed. Please check device IP address and NCS setup. -service-configuration-notification-input.service-information.service-instance-id = TEST7 -service-configuration-notification-input.service-information.service-type = AVPN -service-configuration-notification-input.svc-request-id = TEST7 -service-data.avpn-ip-port-information.avpn-access-information.access-circuit-id = DHEC.54831.170.ATI -service-data.avpn-ip-port-information.avpn-access-information.access-interface = _1G -service-data.avpn-ip-port-information.avpn-access-information.access-speed = 10000 -service-data.avpn-ip-port-information.avpn-access-information.access-speed-units = Kbps -service-data.avpn-ip-port-information.avpn-access-information.l1-customer-handoff = _1000BASELX -service-data.avpn-ip-port-information.avpn-access-information.managed-ce = N -service-data.avpn-ip-port-information.avpn-access-information.vlan-tag-control = _1Q -service-data.avpn-ip-port-information.clli = LONDENEH -service-data.avpn-ip-port-information.contracted-port-speed = 10000 -service-data.avpn-ip-port-information.contracted-port-speed-units = Kbps -service-data.avpn-ip-port-information.endpoint-information.bundle-id = 33 -service-data.avpn-ip-port-information.endpoint-information.interface-string = ae0 -service-data.service-information.service-instance-id = ICORESITE-2751508 -service-data.service-information.service-type = AVPN \ No newline at end of file diff --git a/properties-node/provider/src/test/resources/test-invalid.json b/properties-node/provider/src/test/resources/test-invalid.json deleted file mode 100644 index 21af3ac1d..000000000 --- a/properties-node/provider/src/test/resources/test-invalid.json +++ /dev/null @@ -1,29 +0,0 @@ - "equipment-data": [ - { - "server-count": "4", - "max-server-speed": "1600000", - "number-primary-servers": "2", - "equipment-id": "Server1", - "server-model": "Unknown", - "server-id": "Server1", - "test-node" : { - "test-inner-node" : "Test-Value" - } - } - ], - "resource-state": { - "threshold-value": "1600000", - "last-added": "1605000", - "used": "1605000", - "limit-value": "1920000" - }, - "resource-rule": { - "endpoint-position": "VCE-Cust", - "soft-limit-expression": "0.6 * max-server-speed * number-primary-servers", - "resource-name": "Bandwidth", - "service-model": "DUMMY", - "hard-limit-expression": "max-server-speed * number-primary-servers", - "equipment-level": "Server" - }, - "message": "The provisioned access bandwidth is at or exceeds 50% of the total server capacity." -} diff --git a/properties-node/provider/src/test/resources/test-invalid.xml b/properties-node/provider/src/test/resources/test-invalid.xml deleted file mode 100644 index 50bd0fff2..000000000 --- a/properties-node/provider/src/test/resources/test-invalid.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - 4.0.0 - - org.onap.ccsdk.sli.plugins - restapi-call-node - 6.0.0-SNAPSHOT - - restapi-call-node-provider - bundle - RESTAPI Call Node - Provider - http://maven.apache.org - - UTF-8 - - - - junit - junit - test - - - org.springframework - spring-test - 3.1.4.RELEASE - test - - - org.onap.ccsdk.sli - sli-common - compile - - - org.onap.ccsdk.sli - sli-provider - compile - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.springframework - spring-beans - 3.1.4.RELEASE - - - org.springframework - spring-context - 3.1.4.RELEASE - - - xerces - xerces - 2.4.0 - provided - - - com.sun.jersey - jersey-client - 1.17 - - - com.s - - - - - - com.brocade.developer - providermodule-plugin - - org.onap.ccsdk.sli.plugins - restapi-call-node - - - - process-sources - - process - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.sli.plugins.restapicall - org.onap.ccsdk.sli.plugins.restapicall - * - - - ${project.basedir}/src/main/resources/META-INF - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.brocade.developer - - - providermodule-plugin - - - [1.2.0.100-SNAPSHOT,) - - - process - - - - - - - - - - - - - - diff --git a/properties-node/provider/src/test/resources/test.json b/properties-node/provider/src/test/resources/test.json deleted file mode 100644 index 75155393c..000000000 --- a/properties-node/provider/src/test/resources/test.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "equipment-data": [ - { - "server-count": "4", - "max-server-speed": "1600000", - "number-primary-servers": "2", - "equipment-id": "Server1", - "server-model": "Unknown", - "server-id": "Server1", - "test-node" : { - "test-inner-node" : "Test-Value" - } - } - ], - "resource-state": { - "threshold-value": "1600000", - "last-added": "1605000", - "used": "1605000", - "limit-value": "1920000" - }, - "resource-rule": { - "endpoint-position": "VCE-Cust", - "soft-limit-expression": "0.6 * max-server-speed * number-primary-servers", - "resource-name": "Bandwidth", - "service-model": "DUMMY", - "hard-limit-expression": "max-server-speed * number-primary-servers", - "equipment-level": "Server" - }, - "message": "The provisioned access bandwidth is at or exceeds 50% of the total server capacity." -} diff --git a/properties-node/provider/src/test/resources/test.txt b/properties-node/provider/src/test/resources/test.txt deleted file mode 100644 index 68b916cbb..000000000 --- a/properties-node/provider/src/test/resources/test.txt +++ /dev/null @@ -1,31 +0,0 @@ -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-egress-class-queueing-policing-codes.cos2v-queueing-code = P -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-egress-class-queueing-policing-codes.cos3-queueing-code = W -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos2-queueing = WRED -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos2v-queueing = QueueLimit -operational-data.avpn-ip-port-information.port-level-cos.queueing.pe-per-class-queueing-behaviors.cos3-queueing = WRED -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos2-shaping = Disable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos2v-shaping = Enable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-behaviors.cos3-shaping = Disable -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-codes.cos2-shaping-code = W -operational-data.avpn-ip-port-information.port-level-cos.shaping.pe-egress-per-class-shaping-codes.cos2v-shaping-code = P -service-configuration-notification-input.ack-final-indicator = Y -service-configuration-notification-input.response-code = 0 -service-configuration-notification-input.response-message = Plc Activation Failed: Device gblond2005me6 Sync-from Failed. Please check device IP address and NCS setup. -service-configuration-notification-input.service-information.service-instance-id = TEST7 -service-configuration-notification-input.service-information.service-type = AVPN -service-configuration-notification-input.svc-request-id = TEST7 -service-data.avpn-ip-port-information.avpn-access-information.access-circuit-id = DHEC.54831.170.ATI -service-data.avpn-ip-port-information.avpn-access-information.access-interface = _1G -service-data.avpn-ip-port-information.avpn-access-information.access-speed = 10000 -service-data.avpn-ip-port-information.avpn-access-information.access-speed-units = Kbps -service-data.avpn-ip-port-information.avpn-access-information.l1-customer-handoff = _1000BASELX -service-data.avpn-ip-port-information.avpn-access-information.managed-ce = N -service-data.avpn-ip-port-information.avpn-access-information.vlan-tag-control = _1Q -service-data.avpn-ip-port-information.clli = LONDENEH -service-data.avpn-ip-port-information.contracted-port-speed = 10000 -service-data.avpn-ip-port-information.contracted-port-speed-units = Kbps -service-data.avpn-ip-port-information.endpoint-information.bundle-id = 33 -service-data.avpn-ip-port-information.endpoint-information.interface-string = ae0 -service-data.service-information.service-instance-id = ICORESITE-2751508 -service-data.service-information.service-type = AVPN -obfuscated-var=${deployer_pass} diff --git a/properties-node/provider/src/test/resources/test.xml b/properties-node/provider/src/test/resources/test.xml deleted file mode 100644 index 19e3b7139..000000000 --- a/properties-node/provider/src/test/resources/test.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - 4.0.0 - - org.onap.ccsdk.sli.plugins - restapi-call-node - 6.0.0-SNAPSHOT - - restapi-call-node-provider - bundle - RESTAPI Call Node - Provider - http://maven.apache.org - - UTF-8 - - - - junit - junit - test - - - org.springframework - spring-test - 3.1.4.RELEASE - test - - - org.onap.ccsdk.sli - sli-common - compile - - - org.onap.ccsdk.sli - sli-provider - compile - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.springframework - spring-beans - 3.1.4.RELEASE - - - org.springframework - spring-context - 3.1.4.RELEASE - - - xerces - xerces - 2.4.0 - provided - - - com.sun.jersey - jersey-client - 1.17 - - - com.sun.jersey.contribs.jersey-oauth - oauth-signature - 1.17 - - - com.sun.jersey.contribs.jersey-oauth - oauth-client - 1.17 - - - commons-codec - commons-codec - - - - - - - com.brocade.developer - providermodule-plugin - - org.onap.ccsdk.sli.plugins - restapi-call-node - - - - process-sources - - process - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.ccsdk.sli.plugins.restapicall - org.onap.ccsdk.sli.plugins.restapicall - * - - - ${project.basedir}/src/main/resources/META-INF - - - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.brocade.developer - - - providermodule-plugin - - - [1.2.0.100,) - - - process - - - - - - - - - - - - - - diff --git a/properties-node/provider/src/test/resources/test3.xml b/properties-node/provider/src/test/resources/test3.xml deleted file mode 100644 index ade412681..000000000 --- a/properties-node/provider/src/test/resources/test3.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - ICOREPVC-81114561 - - VPNL811182 - 811182 - 21302:811182 - SET_BVOIP_IN - SET6_BVOIP_IN - SET6_DSU - SET_DSU - SET6_MANAGED - SET_MANAGED - SET_LOVRF_COMMUNITY - SET_RESET_LP - - AG_MAX_MCASTROUTES - - - - BGP4_PROTOCOL - v4 - gp_21302:811182 - - AG_L3VPN_EBGP - - - AG_MAX_PREFIX - - - AG_BGP_UNMANAGED - - - AG_BFD_BGP_3000 - - - - BGP4_PROTOCOL - v6 - gp6_21302:811182 - - AG6_L3VPN_EBGP - - - AG6_MAX_PREFIX - - - AG6_BGP_UNMANAGED - - - AG6_BFD_BGP_3000 - - - - 200 - Success - Y - - -- cgit 1.2.3-korg