diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-02-06 16:11:42 -0500 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-02-07 19:53:26 +0000 |
| commit | 8eb9f5d4a673cb1ab18423b7e84ec8bc6c96c5b6 (patch) | |
| tree | 27b79f4690ed142e87be494b89d6f6589f351b36 | |
| parent | b9be91a588d08ec506783473a8af9689fb4fa9b6 (diff) | |
Removing old name references
Removing references to bvc, att
Change-Id: I794861fe40b96c922f6e5c011b2fe5d2c4bc515b
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-292
73 files changed, 232 insertions, 506 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefapi/ApiMethod.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefapi/ApiMethod.java index b65037203..8edee5709 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefapi/ApiMethod.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefapi/ApiMethod.java @@ -56,7 +56,7 @@ public class ApiMethod { final String KEY_STORE_PASSWORD = "adminadmin"; static { - System.setProperty("javax.net.ssl.trustStore", "/opt/app/bvc/chef/chefServerSSL.jks"); + System.setProperty("javax.net.ssl.trustStore", "/opt/onap/appc/chef/chefServerSSL.jks"); System.setProperty("javax.net.ssl.trustStorePassword", "adminadmin"); } diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java index f1f9f258a..90691d108 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java @@ -417,7 +417,7 @@ public class ChefAdapterImpl implements ChefAdapter { if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress) && StringUtils.isNotBlank(organizations)) { chefserver = "https://" + serverAddress + "/organizations/" + organizations; - clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem"; + clientPrivatekey = "/opt/onap/appc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem"; logger.info(" clientPrivatekey " + clientPrivatekey); } else { doFailure(ctx, 401, "Missing mandatory param(s) such as username, serverAddress, organizations"); diff --git a/appc-client/client-kit/src/test/resources/data/client-simulator.properties b/appc-client/client-kit/src/test/resources/data/client-simulator.properties index ec3358070..cde7f7d8f 100644 --- a/appc-client/client-kit/src/test/resources/data/client-simulator.properties +++ b/appc-client/client-kit/src/test/resources/data/client-simulator.properties @@ -26,14 +26,14 @@ # Default Properties - Configured for client simulator # #-------------------------------------------------------------------------------------------- -ctx.model.package=com.att.appc.client.lcm.model +ctx.model.package=org.onap.appc.client.lcm.model client.pool.size=10 client.rpc.exceptions.map.file=/root/exceptions.txt #client.response.timeout=TIMEOUT #------------------ -# UEB configuration +# DMaaP configuration #------------------ topic.read=async_amrita2 topic.read.timeout=30000 @@ -46,6 +46,5 @@ client.name.id=0 client.force.shutdown=false client.graceful.shutdown.timeout=60000 -#poolMembers=uebsb92sfdc.it.att.com:3904 -poolMembers=10.147.101.7:3904 +poolMembers=10.0.0.7:3904 diff --git a/appc-client/client-simulator/src/main/resources/client-simulator.properties b/appc-client/client-simulator/src/main/resources/client-simulator.properties index fec61a2f2..daffd1cf4 100644 --- a/appc-client/client-simulator/src/main/resources/client-simulator.properties +++ b/appc-client/client-simulator/src/main/resources/client-simulator.properties @@ -37,7 +37,6 @@ client.rpc.exceptions.map.file=C:\\test\\test1\\exceptions.txt #topic.read=client.test.2 #topic.read.timeout=10 #topic.write=client.test.1 -#poolMembers=uebsb91sfdc.it.att.com:3904 #client.key=1 #client.secret=1 #client.name=ClientTest1 @@ -50,9 +49,8 @@ client.graceful.shutdown.timeout=60000 #topic.read=Topic102-Write #topic.read.timeout=60000 #topic.write=Topic102-Read -#poolMembers=10.147.100.36:3904 topic.read=Topic106-Write topic.read.timeout=20000 topic.write=Topic106-Read -poolMembers=10.147.29.67:3904 +poolMembers=10.0.0.67:3904 diff --git a/appc-client/client-simulator/src/test/resources/data/client-simulator.properties b/appc-client/client-simulator/src/test/resources/data/client-simulator.properties index ec3358070..074193849 100644 --- a/appc-client/client-simulator/src/test/resources/data/client-simulator.properties +++ b/appc-client/client-simulator/src/test/resources/data/client-simulator.properties @@ -26,7 +26,7 @@ # Default Properties - Configured for client simulator # #-------------------------------------------------------------------------------------------- -ctx.model.package=com.att.appc.client.lcm.model +ctx.model.package=org.onap.appc.client.lcm.model client.pool.size=10 client.rpc.exceptions.map.file=/root/exceptions.txt @@ -46,6 +46,5 @@ client.name.id=0 client.force.shutdown=false client.graceful.shutdown.timeout=60000 -#poolMembers=uebsb92sfdc.it.att.com:3904 -poolMembers=10.147.101.7:3904 +poolMembers=10.0.0.7:3904 diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index 11583124a..651dcf89a 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -70,22 +70,6 @@ <scope>test</scope> </dependency> - <!-- - this comes from brocade parent (app-cntrl) , not sure about opendaylight (onap) - value was <slf4j.version>1.7.2</slf4j.version> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> - </dependency> - --> - <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> @@ -140,43 +124,6 @@ <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> </configuration> </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml b/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml index a5d0237ae..6ac9242aa 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml +++ b/appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml @@ -18,8 +18,8 @@ ============LICENSE_END========================================================= --> -<NetworkAudit xmlns="http://lpp.att.com/configuration/configure/schema/v1" - xmlns:q2="http://lpp.att.com/configuration/configure/schema/v1"> +<NetworkAudit xmlns="http://onap.org/appc/lpp/configuration/configure/schema/v1" + xmlns:q2="http://onap.org/appc/lpp/configuration/configure/schema/v1"> <q2:Requester>APP-C</q2:Requester> <q2:RequesterPrefix>APP</q2:RequesterPrefix> <q2:RequestId>${request-id}</q2:RequestId> diff --git a/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml b/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml index d77d039b5..e0b8f2708 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml +++ b/appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml @@ -19,7 +19,7 @@ --> <NetworkConfiguration - xmlns="http://lpp.att.com/configuration/configure/schema/v1" xmlns:q2="http://lpp.att.com/configuration/configure/schema/v1"> + xmlns="http://onap.org/appc/lpp/configuration/configure/schema/v1" xmlns:q2="http://onap.org/appc/lpp/configuration/configure/schema/v1"> <q2:Requester>APP-C</q2:Requester> <q2:RequesterPrefix>APP</q2:RequesterPrefix> <q2:RequestId>${request-id}</q2:RequestId> diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 2329f99b7..caac1a3a5 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -106,41 +106,5 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 8d9f562cc..910ac6d85 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -121,41 +121,5 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java index 4698c8134..322e1a6c5 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java @@ -31,6 +31,6 @@ public class Constants { public static final String DEVICE_AUTHENTICATION = "DEVICE_AUTHENTICATION"; public static final String SCHEMA_SDNCTL = "SDNCTL"; - public static final String APPC_CONFIG_DIR = "/opt/app/bvc/properties"; + public static final String APPC_CONFIG_DIR = "/opt/onap/appc/data/properties"; } diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java index 94b346c1a..a39f0d2e4 100644 --- a/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java +++ b/appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java @@ -62,7 +62,7 @@ public class DbServiceUtil { public static DBResourceManager initDbLibService() throws Exception { props = new Properties(); - File file = new File("/opt/app/bvc/properties/dblib.properties"); + File file = new File("/opt/onap/appc/data/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index 85064d009..801ab7d6b 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -140,41 +140,5 @@ </configuration> </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java index d1be5e6c0..87d1c97c0 100644 --- a/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java +++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java @@ -63,7 +63,7 @@ public class DbServiceUtil public static DBResourceManager initDbLibService() throws Exception { props = new Properties(); - File file = new File("/opt/app/bvc/properties/dblib.properties"); + File file = new File("/opt/onap/appc/data/properties/dblib.properties"); URL propURL = file.toURI().toURL(); props.load(propURL.openStream()); jdbcDataSource = new DBResourceManager(props); diff --git a/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties b/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties index ba3e9b820..2c12c32e1 100644 --- a/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties +++ b/appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties @@ -18,16 +18,16 @@ # ============LICENSE_END========================================================= ### -com.att.sdnctl.sli.dbtype= -com.att.sdnctl.sli.jdbc.hosts= -com.att.sdnctl.sli.jdbc.url= -com.att.sdnctl.sli.jdbc.database= -com.att.sdnctl.sli.jdbc.user= -com.att.sdnctl.sli.jdbc.password= -com.att.sdnctl.sli.jdbc.connection.name= +org.onap.ccsdk.sli.dbtype= +org.onap.ccsdk.sli.jdbc.hosts= +org.onap.ccsdk.sli.jdbc.url= +org.onap.ccsdk.sli.jdbc.database= +org.onap.ccsdk.sli.jdbc.user= +org.onap.ccsdk.sli.jdbc.password= +org.onap.ccsdk.sli.jdbc.connection.name= -com.att.sdnctl.sli.jdbc.connection.timeout= -com.att.sdnctl.sli.jdbc.request.timeout= -com.att.sdnctl.sli.jdbc.limit.init= -com.att.sdnctl.sli.jdbc.limit.min= -com.att.sdnctl.sli.jdbc.limit.max= +org.onap.ccsdk.sli.jdbc.connection.timeout= +org.onap.ccsdk.sli.jdbc.request.timeout= +org.onap.ccsdk.sli.jdbc.limit.init= +org.onap.ccsdk.sli.jdbc.limit.min= +org.onap.ccsdk.sli.jdbc.limit.max= diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 5912d36f0..807b52b5b 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -143,41 +143,5 @@ </configuration> </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml index 3b6c67448..57f905ad3 100644 --- a/appc-directed-graph/appc-dgraph/provider/pom.xml +++ b/appc-directed-graph/appc-dgraph/provider/pom.xml @@ -126,38 +126,6 @@ </plugins> <pluginManagement> <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> <plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json index f691af86d..cddf5012b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json @@ -51,7 +51,7 @@ "id": "96807105.79369",
"type": "execute",
"name": "execute : Download Configuration",
- "xml": "<execute plugin=\"com.att.appc.device.interfaces.node.NetconfDeviceNode\" method=\"editConfig\">\n<parameter name=\"editConfigData\" value=\"`$device-config`\"/>\n<parameter name=\"ipAddress\" value=\"`$host-ip-address`\" />\n<parameter name=\"userName\" value=\"`$device-login`\" />\n<parameter name=\"password\" value=\"`$device-password`\" />\n<parameter name=\"port\" value=\"`$port-number`\" />\n<parameter name=\"configTarget\" value=\"candidate\" />\n<parameter name=\"editDefaultOperation\" value=\"replace\" />\n<parameter name=\"editCommit\" value=\"true\" />\n<parameter name=\"editLock\" value=\"false\" />\n\n\n",
+ "xml": "<execute plugin=\"org.onap.appc.device.interfaces.node.NetconfDeviceNode\" method=\"editConfig\">\n<parameter name=\"editConfigData\" value=\"`$device-config`\"/>\n<parameter name=\"ipAddress\" value=\"`$host-ip-address`\" />\n<parameter name=\"userName\" value=\"`$device-login`\" />\n<parameter name=\"password\" value=\"`$device-password`\" />\n<parameter name=\"port\" value=\"`$port-number`\" />\n<parameter name=\"configTarget\" value=\"candidate\" />\n<parameter name=\"editDefaultOperation\" value=\"replace\" />\n<parameter name=\"editCommit\" value=\"true\" />\n<parameter name=\"editLock\" value=\"false\" />\n\n\n",
"comments": "",
"outputs": 1,
"x": 533,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json index ee5977320..19769807a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json @@ -51,7 +51,7 @@ "id": "b7e24e35.0af5c",
"type": "execute",
"name": "execute : Download Configuration",
- "xml": "<execute plugin='com.att.sdnctl.restconf.RestConfCallNode' method='downloadDeviceConfiguration' >\n<parameter name=\"hostIpAddress\" value=\"`$host-ip-address`\"/>\n<parameter name=\"configData\" value=\"`$device-config`\"/>\n<parameter name=\"protocol\" value=\"`$protocol`\"/>\n<parameter name=\"unescapeXML\" value=\"N\"/>\n<parameter name=\"validateXML\" value=\"Y\"/>\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.sdnc.restconf.RestConfCallNode' method='downloadDeviceConfiguration' >\n<parameter name=\"hostIpAddress\" value=\"`$host-ip-address`\"/>\n<parameter name=\"configData\" value=\"`$device-config`\"/>\n<parameter name=\"protocol\" value=\"`$protocol`\"/>\n<parameter name=\"unescapeXML\" value=\"N\"/>\n<parameter name=\"validateXML\" value=\"Y\"/>\n\n\n\n\n",
"comments": "",
"outputs": 1,
"x": 523,
@@ -162,7 +162,7 @@ "id": "3fd1791d.d55476",
"type": "execute",
"name": "execute : Mount Device",
- "xml": "<execute plugin='com.att.sdnctl.restconf.RestConfCallNode' method='mountDevice' >\n<parameter name=\"templateFileName\" value=\"device_mount.xml\" />\n<parameter name=\"hostIpAddress\" value=\"`$host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-login`\"/>\n<parameter name=\"password\" value=\"`$device-password`\"/>\n<parameter name=\"portNumber\" value=\"`$port-number`\"/>\n<parameter name=\"waitSec\" value=\"60\"/>\n<parameter name=\"noOfRetriggers\" value=\"10\"/>\n\n\n",
+ "xml": "<execute plugin='org.onap.sdnc.restconf.RestConfCallNode' method='mountDevice' >\n<parameter name=\"templateFileName\" value=\"device_mount.xml\" />\n<parameter name=\"hostIpAddress\" value=\"`$host-ip-address`\"/>\n<parameter name=\"loginId\" value=\"`$device-login`\"/>\n<parameter name=\"password\" value=\"`$device-password`\"/>\n<parameter name=\"portNumber\" value=\"`$port-number`\"/>\n<parameter name=\"waitSec\" value=\"60\"/>\n<parameter name=\"noOfRetriggers\" value=\"10\"/>\n\n\n",
"comments": "",
"outputs": 1,
"x": 459,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json index 5242a5d87..918e7c8cc 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json @@ -62,7 +62,7 @@ "id": "f83cb7cd.e4dd78",
"type": "execute",
"name": "execute: Get Rest Configuration",
- "xml": "<execute plugin=\"com.att.sdnctl.restconf.RestConfCallNode\" method=\"getConfiguration\">\n<parameter name=\"hostIpAddress\" value=\"`$hostIpAddress`\" />\n<parameter name=\"protocol\" value=\"`$protocol`\" />\n<parameter name=\"responsePrefix\" value=\"restconf\" />\n",
+ "xml": "<execute plugin=\"org.onap.sdnc.restconf.RestConfCallNode\" method=\"getConfiguration\">\n<parameter name=\"hostIpAddress\" value=\"`$hostIpAddress`\" />\n<parameter name=\"protocol\" value=\"`$protocol`\" />\n<parameter name=\"responsePrefix\" value=\"restconf\" />\n",
"comments": "",
"outputs": 1,
"x": 704.75,
@@ -460,8 +460,8 @@ {
"id": "fde847ff.94d008",
"type": "comment",
- "name": "User Story ID: US731106",
- "info": "Developed by Brinda Santh <bs2796@att.com>",
+ "name": "comment1",
+ "info": "comment1",
"comments": "",
"x": 887.7499694824219,
"y": 28.75,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json index 50b215ab7..3a6cb1769 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json @@ -414,7 +414,7 @@ "id": "7f1ad793.7b648",
"type": "execute",
"name": "execute read PD file",
- "xml": "<execute plugin=\"org.onap.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/app/bvc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />",
+ "xml": "<execute plugin=\"org.onap.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/onap/appc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />",
"comments": "",
"outputs": 1,
"x": 1466.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json index ac9bde9fa..08bfe32cd 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json @@ -293,7 +293,7 @@ "id": "949cd4f7.5ed8f",
"type": "set",
"name": "set fileName",
- "xml": "<set>\n<parameter name='tmp.fileName' value=\"`'/opt/app/bvc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001' + '.json'`\"/>\n",
+ "xml": "<set>\n<parameter name='tmp.fileName' value=\"`'/opt/onap/appc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001' + '.json'`\"/>\n",
"comments": "",
"x": 457,
"y": 164,
@@ -392,7 +392,7 @@ "id": "38f8974.498d2e8",
"type": "set",
"name": "set dcae-error-message",
- "xml": "<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/app/bvc/cvaas\" />\n",
+ "xml": "<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/onap/appc/cvaas\" />\n",
"comments": "",
"x": 1596,
"y": 376,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json index 181b5bc32..c3bfc542a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json @@ -210,7 +210,7 @@ "id": "235a2caa.dc26a4",
"type": "configure",
"name": "SDN_GP Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
"comments": "",
"outputs": 1,
"x": 783.4718627929688,
@@ -276,7 +276,7 @@ "id": "f43f3748.859d08",
"type": "execute",
"name": "execute: EIPAM_UnassignIPAddress",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",
"outputs": 1,
"x": 2643.284980773926,
"y": 4735.545325279236,
@@ -309,7 +309,7 @@ "id": "86c2f124.a637c",
"type": "configure",
"name": "MSO Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n <parameter name=\"dummyparam\" value=\"test\"/>\n",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.mso.MSOAdaptor\" key=\"MSO\">\n <parameter name=\"dummyparam\" value=\"test\"/>\n",
"outputs": 1,
"x": 2613.2713928222656,
"y": 4886.871339797974,
@@ -448,7 +448,7 @@ "id": "a7de75f9.c2b138",
"type": "configure",
"name": "SDN-GP Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
"comments": "",
"outputs": 1,
"x": 852,
@@ -512,7 +512,7 @@ "id": "583ef652.3fb778",
"type": "execute",
"name": "execute: setTime(modify-timestamp)",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
"comments": "",
"outputs": 1,
"x": 1187,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json index d94222831..68917335c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json @@ -494,7 +494,7 @@ "id": "66448305.03e3cc",
"type": "execute",
"name": "execute getTimeDifference",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>",
"comments": "",
"outputs": 1,
"x": 1085,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json index 8e7d80212..53042ac6f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json @@ -190,7 +190,7 @@ "id": "d5e2186e.f0d268",
"type": "execute",
"name": "execute: setTime(modify-timestamp)",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
"comments": "",
"outputs": 1,
"x": 821.7498779296875,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json index d3b38b439..093ecd7bf 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json @@ -379,7 +379,7 @@ "id": "ed61d3df.d15ae",
"type": "execute",
"name": "execute: setTime(modify-timestamp)",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
"comments": "",
"outputs": 1,
"x": 368.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json index 65d24eec0..ceb4caa92 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json @@ -240,7 +240,7 @@ "id": "b94ddf6d.56216",
"type": "configure",
"name": "SDN_GP Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",
"comments": "",
"outputs": 1,
"x": 672.9213256835938,
@@ -306,7 +306,7 @@ "id": "7b44beed.e0798",
"type": "execute",
"name": "execute: EIPAM_UnassignIPAddress",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",
"outputs": 1,
"x": 2874.284980773926,
"y": 5149.545325279236,
@@ -339,7 +339,7 @@ "id": "d6d749b0.cfeac8",
"type": "configure",
"name": "MSO Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n <parameter name=\"dummyparam\" value=\"test\"/>\n",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.mso.MSOAdaptor\" key=\"MSO\">\n <parameter name=\"dummyparam\" value=\"test\"/>\n",
"outputs": 1,
"x": 2844.2713928222656,
"y": 5300.871339797974,
@@ -395,7 +395,7 @@ "id": "bbe81125.eaf2d",
"type": "configure",
"name": "SDN_GP Asynch Notification",
- "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>",
+ "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>",
"comments": "",
"outputs": 1,
"x": 827.0951843261719,
@@ -747,7 +747,7 @@ "id": "3fdf2b46.361354",
"type": "execute",
"name": "execute: setTime(modify-timestamp)",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
"comments": "",
"outputs": 1,
"x": 1104.4494934082031,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json index a426f3cc1..aa76741a1 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json @@ -310,7 +310,7 @@ "id": "db7678e6.fdbd48",
"type": "execute",
"name": "execute getTimeDifference",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"getTimeDifference\">\n\t<parameter name=\"inDate\" value=\"`$service-data.oper-status.modify-timestamp`\"/>\n\t<parameter name=\"ctxTempVariable\" value=\"tmp.inprogress-time\"/>",
"comments": "",
"outputs": 1,
"x": 950.8333435058594,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json index 1328fce3c..623918e1c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json @@ -265,7 +265,7 @@ "id": "a87cb168.0c421",
"type": "execute",
"name": "execute: setTime(modify-timestamp)",
- "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
+ "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",
"comments": "",
"outputs": 1,
"x": 914.7498779296875,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json index 7754ee777..9885d251f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json @@ -51,7 +51,7 @@ "id": "906908fc.43cf18",
"type": "execute",
"name": "execute",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='checkIfActive' >\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='checkIfActive' >\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n\n",
"comments": "",
"outputs": 1,
"x": 920.306266784668,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json index 3169f3b04..8815913d6 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json @@ -133,7 +133,7 @@ "id": "3f7d06de.4adc9a",
"type": "execute",
"name": "executeTest",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
"comments": "",
"outputs": 1,
"x": 741.8060150146484,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json index b7b919e3a..d8ab02567 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json @@ -717,7 +717,7 @@ "id": "e7b3ea7a.c2c148",
"type": "execute",
"name": "executePreRestart",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n",
"comments": "",
"outputs": 1,
"x": 700.8542175292969,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json index 102ae397b..22585cf25 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json @@ -51,7 +51,7 @@ "id": "5fb00be2.55cd14",
"type": "execute",
"name": "Start Application ",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='startNode'>\n<parameter name=\"node-name\" value=\"`$node-name`\" />\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='startNode'>\n<parameter name=\"node-name\" value=\"`$node-name`\" />\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
"comments": "",
"outputs": 1,
"x": 575.470588684082,
@@ -359,7 +359,7 @@ "id": "6c8ebab7.6be074",
"type": "execute",
"name": "Get Node Name",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='getNodeName'>\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='getNodeName'>\n<parameter name=\"vm-url\" value=\"`$start-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n",
"comments": "",
"outputs": 1,
"x": 595.888916015625,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json index eb94a37c8..07406edff 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json @@ -168,7 +168,7 @@ "id": "cba91b7e.1a9828",
"type": "execute",
"name": "Execute stop node",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='stopNode'>\n<parameter name=\"node-name\" value=\"`$healthcheck.vm[0].nodeName`\" />\n<parameter name=\"node-status\" value=\"`$healthcheck.vm[0].status`\" />\n<parameter name=\"vm-url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='stopNode'>\n<parameter name=\"node-name\" value=\"`$healthcheck.vm[0].nodeName`\" />\n<parameter name=\"node-status\" value=\"`$healthcheck.vm[0].status`\" />\n<parameter name=\"vm-url\" value=\"`$stop-vm-url`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
"comments": "",
"outputs": 1,
"x": 907.5,
@@ -255,7 +255,7 @@ "id": "bb87dbed.34a348",
"type": "execute",
"name": "Healthcheck to get Node Name",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='healthCheckVMs'>\n<parameter name=\"org.onap.appc.identity.url\" value=\"`$AICIdentity`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"org.onap.appc.provider.name\" value=\"OpenStack\"/>\n<parameter name=\"retry-healthcheck\" value=\"`$retry-healthcheck`\"/>",
"comments": "",
"outputs": 1,
"x": 447.5,
@@ -367,7 +367,7 @@ "id": "d6d1b7f.22dce48",
"type": "execute",
"name": "Select vnf-host-ip via connection test",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='selectActiveConnectionDetails'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"vnf-host-ip2-address\" value=\"`$vnf-host-ip2-address`\" />\n\n",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='selectActiveConnectionDetails'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"vnf-host-ip-address\" value=\"`$vnf-host-ip-address`\" />\n<parameter name=\"vnf-host-ip2-address\" value=\"`$vnf-host-ip2-address`\" />\n\n",
"comments": "",
"outputs": 1,
"x": 464.5,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json index 2aedf4b8f..04df73d93 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json @@ -1280,7 +1280,7 @@ "id": "93ba279d.5bcbb8", "type": "execute", "name": "execute CvaasDataIntoContext", - "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc001\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />", + "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/onap/appc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc001\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />", "comments": "", "outputs": 1, "x": 1769.583999633789, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json index ef781c1e9..ca9574796 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json @@ -1043,7 +1043,7 @@ "id": "7e300025.5253a",
"type": "execute",
"name": "execute CvaasDataIntoContext",
- "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/app/bvc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc01\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
+ "xml": "<execute plugin='org.onap.appc.dg.common.JsonDgUtil' method='cvaasFileNameAndFileContentToContext' >\n<parameter name=\"cvaas-directory-path\" value=\"/opt/onap/appc/cvaas\" />\n<parameter name=\"appc-instance-id\" value=\"appc01\" />\n<parameter name=\"vnf-id\" value=\"`$input.action-identifiers.vnf-id`\" />",
"comments": "",
"outputs": 1,
"x": 1943.9172744750977,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json index 19046f502..830b56159 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json @@ -209,7 +209,7 @@ "id": "bcfe699a.fbac68",
"type": "execute",
"name": "executeTest",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeTest'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeTest'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",
"comments": "",
"outputs": 1,
"x": 940.7498474121094,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json index 35ec375f0..adb0bdc6d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json @@ -138,7 +138,7 @@ "id": "6711af89.05acc",
"type": "execute",
"name": "execute: liveUpgrade",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='liveUpgrade' >\n<parameter name=\"upgrade-version\" value=\"`$upgrade-version`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"Skip-execution-installer-bin-file\" value=\"`$Skip-execution-installer-bin-file`\" />\n<parameter name=\"Skip-deploy\" value=\"`$Skip-deploy`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />\n\n\n",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='liveUpgrade' >\n<parameter name=\"upgrade-version\" value=\"`$upgrade-version`\" />\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"Skip-execution-installer-bin-file\" value=\"`$Skip-execution-installer-bin-file`\" />\n<parameter name=\"Skip-deploy\" value=\"`$Skip-deploy`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />\n\n\n",
"comments": "",
"outputs": 1,
"x": 919.5277938842773,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json index fe978a047..7f6b3f7c5 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json @@ -170,7 +170,7 @@ "id": "6a8d06b2.533f18",
"type": "execute",
"name": "executeUpload",
- "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeUpload'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"source-file-url\" value=\"`$source-file-url`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />",
+ "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeUpload'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />\n<parameter name=\"source-file-url\" value=\"`$source-file-url`\" />\n<parameter name=\"timeout\" value=\"`$timeout`\" />",
"comments": "",
"outputs": 1,
"x": 1714.7499732971191,
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json index 2fb4fc8cc..3120a1fe2 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json @@ -127,7 +127,7 @@ "id": "85331eac.44b8c", "type": "execute", "name": "Execute: PreUpgradeHealthCheck", - "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executePreUpgradeHealthCheck'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />", + "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executePreUpgradeHealthCheck'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />", "comments": "", "outputs": 1, "x": 311.9999694824219, diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java index 994fbc7b2..6aba42b1a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* TODO: move the dgtest to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java index 3c939cbe3..1e7835c85 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import org.onap.sdnc.config.generator.convert.ConvertNode; import org.onap.sdnc.config.generator.merge.MergeNode; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java index 9f6d676b7..29d7b0f4c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java @@ -30,9 +30,9 @@ import java.util.Map; import org.junit.Test; /* move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java index 6022ac834..894ddd7c2 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java index 2f6f7459a..3cf70fe44 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java @@ -32,10 +32,10 @@ import org.junit.Test; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGMockUtils; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGMockUtils; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java index 231dd6b0a..87d3f4561 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java @@ -32,9 +32,9 @@ import org.junit.Test; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java index af0423b0d..36c549ad0 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; import org.apache.sling.testing.mock.osgi.MockOsgi; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; @@ -73,7 +73,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map<String, Object> serviceReferences = new HashMap<String, Object>(); serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); - //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); + //serviceReferences.put("org.onap.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); @@ -110,7 +110,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map<String, Object> serviceReferences = new HashMap<String, Object>(); serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); - //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); + //serviceReferences.put("org.onap.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java index 3223cb9e7..95fcf3e9a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java @@ -37,9 +37,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java index f7307acb2..9587a96c7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java @@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java index 52e20415e..074aa6ff9 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java index b84b0516e..d08bd4f16 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java @@ -32,9 +32,9 @@ import org.junit.Test; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java index 6bc9d10e3..d9b9ad4a6 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java @@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java index 56b0bab3b..0b5cf7e5d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java @@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java index f2399729e..bf7d5e2a9 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; import org.apache.sling.testing.mock.osgi.MockOsgi; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java index 943edf2c1..6cc05179a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java @@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java index 9eed43e8b..a0a20243d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java @@ -46,9 +46,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java index 6d23d13ff..6f3847e97 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java @@ -109,7 +109,7 @@ public class MockAaiResource implements SvcLogicResource { assertEquals(parms.get("is-closed-loop"), "false"); assertEquals(parms.get("vnfc-function-code"), "funccode"); assertEquals(parms.get("vnfc-type"), "vnfctype"); - assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.1.1.1"); + assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.1.1.1"); assertEquals(parms.get("group-notation"), "groupnotation"); assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver"); assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id"); @@ -140,7 +140,7 @@ public class MockAaiResource implements SvcLogicResource { assertEquals(parms.get("is-closed-loop"), "false"); assertEquals(parms.get("vnfc-function-code"), "funccode1"); assertEquals(parms.get("vnfc-type"), "vnfctype1"); - assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.2.2.2"); + assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.2.2.2"); assertEquals(parms.get("group-notation"), "groupnotation1"); assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver"); assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id"); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java index 7c2247a26..073c3d725 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java @@ -37,7 +37,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{ if ( "get".equals(key)) { - if ("135.1.1.1".equals(parameters.get("host") )) { + if ("10.1.1.1".equals(parameters.get("host") )) { String fullPathFileName = parameters.get("fullPathFileName"); if (("SuccessFile").equals(fullPathFileName ) ) return ConfigStatus.FAILURE; @@ -46,7 +46,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{ if (("FailureLogFile").equals(fullPathFileName ) ) return ConfigStatus.SUCCESS; } - else if ("135.2.2.2".equals(parameters.get("host")) ) { + else if ("10.2.2.2".equals(parameters.get("host")) ) { String fullPathFileName = parameters.get("fullPathFileName"); if (("SuccessFile").equals(fullPathFileName ) ) return ConfigStatus.FAILURE; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties index 0168b477f..04f6e803b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties @@ -34,6 +34,6 @@ org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.paylo assertEquals.output.payload.upload-config-id[0]=12434 -assertEquals.tmp.fileName=/opt/app/bvc/cvaas/ibcx0001v_567890_appc001.json +assertEquals.tmp.fileName=/opt/onap/appc/cvaas/ibcx0001v_567890_appc001.json diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties index 4d6b0aa8f..940ea0e29 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties @@ -44,7 +44,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploa APPC.GetDeviceRunningConfig.outCome=success APPC.PublishConfiguration.outCome=success -com.att.sdnctl.prop.PropertiesNode.readProperties=success +org.onap.ccsdk.sli.plugins.prop.PropertiesNode.readProperties=success assertNull.dcae-error-message diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties index 6e6659c29..e4b86e75e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties @@ -31,25 +31,25 @@ input.input.action=Configure input.input.payload=tcfile://payload_json_config.json -# Property for com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success +# Property for org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success # DG APPC.DownloadIsbcConfig properties diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml index 5cf518101..ec9fba843 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml @@ -25,8 +25,8 @@ parameters: required: false
source: null
class-type: null
- default-value: "fd00:f4d5:ea06:1:0:110:136:254"
- assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"
+ default-value: "10.0.0.147"
+ assigned-value: "10.0.0.147"
path: null
request-keys: null
response-keys: null
@@ -61,8 +61,8 @@ parameters: required: false
source: null
class-type: null
- default-value: "fd00:f4d5:ea06:1:0:110:136:254"
- assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"
+ default-value: "10.0.0.147"
+ assigned-value: "10.0.0.147"
path: null
request-keys: null
response-keys: null
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json index 9bd143c48..f0230751e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json @@ -1,9 +1,9 @@ { "request-parameters": { "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", + "vnf-host-ip-address": "10.0.0.39", "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", + "site-location": "Somewhere", "vnf-name": "ibcx0001v", "vm": [ { @@ -13,7 +13,7 @@ "vnfc-name": "ibcx0001vm001ssc001", "vnfc-function-code": "ssc", "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", + "ipaddress-v4-oam-vip": "10.1.1.1", "group-notation": "ibcx0001vm001ssc001pair" } ] @@ -32,47 +32,47 @@ ] }, "configuration": { - "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n" + "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 10.0.12.12\r\n" }, "configuration-parameters": { "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147", "LOCAL_BILLING_IP_ADDR": "192.168.30.1", "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147", "REMOTE_BILLING_IP_ADDR": "192.168.30.1", "CORE_NETWORK_PLEN": "32", "CORE_NETWORK_ALT_PLEN": "126", "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "ACCESS_NETWORK_PLEN": "32", "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", + "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "VIRT_CORE_IP_ADDR": "10.0.0.147", + "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147", + "VIRT_BILLING_IP_ADDR": "10.0.0.147", + "DNS_SERVERS": "10.0.0.147", + "SNMP_CLIENT_1": "10.0.0.147", + "SNMP_CLIENT_2": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147", + "BILLING_SERVER_1": "10.0.0.147", + "BILLING_SERVER_2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147", + "OAM_VIP_HOSTNAME": "10.0.0.147", + "DG_APP_SERVER1": "10.0.0.147", + "DG_APP_SERVER2": "10.0.0.147", + "CTS_IP_RANGE": "10.0.0.147", "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LICENSE_KEY": "abcd1234", "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json index d6b2ebbe7..794c8d86c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json @@ -1,7 +1,7 @@ { "request-parameters": { "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", + "vnf-host-ip-address": "10.0.0.39", "service-instance-id": "ibcx0001vm001", "site-location": "Middletown", "vnf-name": "ibcx0001v", @@ -13,7 +13,7 @@ "vnfc-name": "ibcx0001vm001ssc001", "vnfc-function-code": "ssc", "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", + "ipaddress-v4-oam-vip": "10.1.1.1", "group-notation": "ibcx0001vm001ssc001pair" } ] @@ -42,43 +42,43 @@ }, "configuration-parameters": { "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147", "LOCAL_BILLING_IP_ADDR": "192.168.30.1", "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147", "REMOTE_BILLING_IP_ADDR": "192.168.30.1", "CORE_NETWORK_PLEN": "32", "CORE_NETWORK_ALT_PLEN": "126", "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "ACCESS_NETWORK_PLEN": "32", "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", + "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "VIRT_CORE_IP_ADDR": "10.0.0.147", + "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147", + "VIRT_BILLING_IP_ADDR": "10.0.0.147", + "DNS_SERVERS": "10.0.0.147", + "SNMP_CLIENT_1": "10.0.0.147", + "SNMP_CLIENT_2": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147", + "BILLING_SERVER_1": "10.0.0.147", + "BILLING_SERVER_2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147", + "OAM_VIP_HOSTNAME": "10.0.0.147", + "DG_APP_SERVER1": "10.0.0.147", + "DG_APP_SERVER2": "10.0.0.147", + "CTS_IP_RANGE": "10.0.0.147", "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LICENSE_KEY": "abcd1234", "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml index 3eb302eb3..f065c3058 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml @@ -21,7 +21,7 @@ vnf-parameter-list: required: false
source: "INSTAR"
rule-type: null
- default: "fd00:f4d5:ea06:1:0:110:136:254"
+ default: "10.0.0.147"
request-keys:
- key-name: "address_fqdn"
key-value: "m001dbj001p1n004v006"
@@ -52,7 +52,7 @@ vnf-parameter-list: required: false
source: null
rule-type: null
- default: "fd00:f4d5:ea06:1:0:110:136:254"
+ default: "10.0.0.147"
request-keys: null
response-keys: null
- name: "REMOTE_BILLING_IP_ADDR"
diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml index cb9e332f5..3abb4fefb 100644 --- a/appc-directed-graph/dg-loader/provider/pom.xml +++ b/appc-directed-graph/dg-loader/provider/pom.xml @@ -164,41 +164,5 @@ </plugin> </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - com.brocade.developer - </groupId> - <artifactId> - providermodule-plugin - </artifactId> - <versionRange> - [1.2.0.100-SNAPSHOT,) - </versionRange> - <goals> - <goal>process</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> </project> diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java index d88958239..424a2d6cd 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java @@ -168,11 +168,6 @@ public class DGXMLLoadNActivate { "Sufficient inputs for DGXMLLoadNActivate are missing <xmlpath> <activatefile> <dbPropertyfile>"); } - // propertyPath = - // "/Users/bs2796/0Source/ecomp/bvc-3.2.2/others/properties/dblib.properties"; - // xmlPath = DGXMLLoadNActivate.class.getClassLoader().getResource(".").getPath() - // +"/xml" ; - DGXMLLoadNActivate dgXMLLoadDB = new DGXMLLoadNActivate(propertyPath); dgXMLLoadDB.loadDGXMLDir(xmlPath); dgXMLLoadDB.activateDg(activateFile); diff --git a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh index d12654282..b499b081d 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh +++ b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh @@ -25,30 +25,38 @@ ### -export BVC_DIR=/opt/app/bvc -export DG_DIR=${BVC_DIR}/dg +### +### Convert XML DGs to JSON DGs using dg-loader, then load/activate them in the MySQL DB. ### +### + +export APPC_HOME=${APPC_HOME:-/opt/onap/appc} + +# SVCLOGIC_DIR env variable points to /opt/onap/appc/svclogic +export SVCLOGIC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" -if (( "$#" != 1 )) +#Path to the dg-loader jar file +export DG_LOADER=${APPC_HOME}/data/dg-loader-provider-jar-with-dependencies.jar + +# Check if the JSON Directory exists under the env. variable defined +export DG_JSON_DIR=${SVCLOGIC_DIR}/graphs/appc/json/dg-loader-dgs +echo "Processing DG JSON directory : ${DG_JSON_DIR}" +if [ ! -d "$DG_JSON_DIR" ] then - echo "DG JSON Directory is Missing" + echo "DG-Loader JSON Directory is Missing" exit 1 fi -export DG_JSON_DIR=$1 -echo "Processing DG JSON directory : ${DG_JSON_DIR}" cd ${DG_JSON_DIR} +mkdir -p ${DG_JSON_DIR}/converted-xml -###################################################################### -rm -rf ${DG_JSON_DIR}/xml - -################## To Genetare XML from JSON ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/xml +# Generate XML DGs from JSON DGs +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/converted-xml -################## To Load DG XML ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/xml ${BVC_DIR}/properties/dblib.properties +# Load converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/converted-xml ${APPC_HOME}/data/properties/dblib.properties -################## To Activate ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${BVC_DIR}/properties/dblib.properties +# Activate converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${APPC_HOME}/data/properties/dblib.properties exit 0 diff --git a/appc-inbound/appc-interfaces-service/model/src/main/yang/appc-interfaces-service.yang b/appc-inbound/appc-interfaces-service/model/src/main/yang/appc-interfaces-service.yang index b6e0438a8..e671bbeed 100644 --- a/appc-inbound/appc-interfaces-service/model/src/main/yang/appc-interfaces-service.yang +++ b/appc-inbound/appc-interfaces-service/model/src/main/yang/appc-interfaces-service.yang @@ -23,7 +23,7 @@ */ /* - * Yang model for the Application Controller (APP-C) component of ECOMP + * Yang model for the Application Controller (APP-C) component of ONAP * * *The main purpose of this model to provide an interface bewteen APPC Runtime and other interface @@ -31,7 +31,6 @@ * * * - * Author: Anand Chaturvedi (ac204h@att.com) */ module interfaces-service { @@ -39,9 +38,6 @@ module interfaces-service { yang-version 1; namespace "org:onap:appc:interfaces:service"; prefix interfaces.service; - organization "AT&T. Copyright (C) 2015. All rights reserved."; - contact - "Anand Chaturvedi <ac204h@att.com>"; description "Defines the services provided by Application Controller to external interfaces."; diff --git a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties index 1913038e3..c4cb34c44 100644 --- a/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties +++ b/appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties @@ -75,7 +75,7 @@ appc.OAM.AppcBundlesToStop=.*appc.*\ ,transaction-recorder appc.OAM.OtherBundlesToStop=.*app-cntrl.*\ -,com.att.sdnctl.sli.adaptor.asyncresponse +,org.onap.ccsdk.sli.adaptors.asyncresponse appc.OAM.AppcBundlesToNotStop=.*appc.oam.*\ ,appc-common\ diff --git a/appc-outbound/appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/pom.xml index f12ecbd0e..b8273386e 100755 --- a/appc-outbound/appc-aai-client/pom.xml +++ b/appc-outbound/appc-aai-client/pom.xml @@ -33,7 +33,6 @@ <artifactId>appc-aai-client</artifactId> <name>APPC AAI Client for Node</name> - <url>http://wiki.sdn.labs.att.com</url> <description>Common Utilities for DG</description> <dependencyManagement> diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang index a5947c4a4..7c6df09f2 100644 --- a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang +++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang @@ -45,9 +45,6 @@ module appc-provider-lcm { yang-version 1; namespace "org:onap:appc:lcm"; prefix appc-provider-lcm; - organization "Copyright 2017 AT&T Intellectual Property."; - contact - "Dewayne Hafenstein <dh868g@att.us.com>"; description "Defines the services and request/response requirements for the ECOMP APP-C component."; diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcConfigTest.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcConfigTest.java index f799db5e1..5d88fe7ea 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcConfigTest.java +++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcConfigTest.java @@ -38,7 +38,7 @@ public class SdcConfigTest { Properties properties = new Properties(); properties.setProperty("appc.sdc.provider.url", "http://localhost:8181/restconf/operations/SdcMessage:configuration-document-request"); - properties.setProperty("appc.ClosedLoop.poolMembers","uebsb91bodc.it.att.com:3905,uebsb92bodc.it.att.com:3905,uebsb93bodc.it.att.com:3905"); + properties.setProperty("appc.ClosedLoop.poolMembers","localhost:3905"); SdcConfig sdc = new SdcConfig(properties); List<String> uebAddresses = sdc.getMsgBusProperties(); assertNotNull(uebAddresses); |