Removing old name references 37/30537/5
authorPatrick Brady <pb071s@att.com>
Tue, 6 Feb 2018 21:11:42 +0000 (16:11 -0500)
committerPatrick Brady <pb071s@att.com>
Wed, 7 Feb 2018 19:53:26 +0000 (19:53 +0000)
Removing references to bvc, att

Change-Id: I794861fe40b96c922f6e5c011b2fe5d2c4bc515b
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-292

73 files changed:
appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/chefapi/ApiMethod.java
appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
appc-client/client-kit/src/test/resources/data/client-simulator.properties
appc-client/client-simulator/src/main/resources/client-simulator.properties
appc-client/client-simulator/src/test/resources/data/client-simulator.properties
appc-config/appc-config-adaptor/provider/pom.xml
appc-config/appc-config-adaptor/provider/src/main/resources/audit-request.xml
appc-config/appc-config-adaptor/provider/src/main/resources/config-request.xml
appc-config/appc-config-audit/provider/pom.xml
appc-config/appc-config-generator/provider/pom.xml
appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/Constants.java
appc-config/appc-config-generator/provider/src/main/java/org/onap/sdnc/config/generator/tool/DbServiceUtil.java
appc-config/appc-data-services/provider/pom.xml
appc-config/appc-encryption-tool/provider/src/main/java/org/onap/appc/encryptiontool/wrapper/DbServiceUtil.java
appc-config/appc-encryption-tool/provider/src/test/resources/svclogic.properties
appc-config/appc-flow-controller/provider/pom.xml
appc-directed-graph/appc-dgraph/provider/pom.xml
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml
appc-directed-graph/dg-loader/provider/pom.xml
appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java
appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh
appc-inbound/appc-interfaces-service/model/src/main/yang/appc-interfaces-service.yang
appc-oam/appc-oam-bundle/src/main/resources/org/onap/appc/default.properties
appc-outbound/appc-aai-client/pom.xml
appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
appc-sdc-listener/appc-sdc-listener-bundle/src/test/java/org/onap/appc/sdc/listener/SdcConfigTest.java

index b650372..8edee57 100644 (file)
@@ -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");
         }
 
index f1f9f25..90691d1 100644 (file)
@@ -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");
index ec33580..cde7f7d 100644 (file)
 # 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
 
index fec61a2..daffd1c 100644 (file)
@@ -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
index ec33580..0741938 100644 (file)
@@ -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
 
index 1158312..651dcf8 100644 (file)
                        <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>
                     <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>
index a5d0237..6ac9242 100644 (file)
@@ -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>
index d77d039..e0b8f27 100644 (file)
@@ -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>
index 2329f99..caac1a3 100644 (file)
             </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>
index 8d9f562..910ac6d 100644 (file)
             </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>
index 4698c81..322e1a6 100644 (file)
@@ -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";
 
 }
index 94b346c..a39f0d2 100644 (file)
@@ -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());
 
index 85064d0..801ab7d 100644 (file)
                                </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>
index d1be5e6..87d1c97 100644 (file)
@@ -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);
index ba3e9b8..2c12c32 100644 (file)
 # ============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=
index 5912d36..807b52b 100644 (file)
                 </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>
index 3b6c674..57f905a 100644 (file)
         </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>
index f691af8..cddf501 100644 (file)
@@ -51,7 +51,7 @@
         "id": "96807105.79369",\r
         "type": "execute",\r
         "name": "execute : Download Configuration",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 533,\r
index ee59773..1976980 100644 (file)
@@ -51,7 +51,7 @@
         "id": "b7e24e35.0af5c",\r
         "type": "execute",\r
         "name": "execute : Download Configuration",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 523,\r
         "id": "3fd1791d.d55476",\r
         "type": "execute",\r
         "name": "execute : Mount Device",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 459,\r
index 5242a5d..918e7c8 100644 (file)
@@ -62,7 +62,7 @@
         "id": "f83cb7cd.e4dd78",\r
         "type": "execute",\r
         "name": "execute: Get Rest Configuration",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 704.75,\r
     {\r
         "id": "fde847ff.94d008",\r
         "type": "comment",\r
-        "name": "User Story ID: US731106",\r
-        "info": "Developed by Brinda Santh <bs2796@att.com>",\r
+        "name": "comment1",\r
+        "info": "comment1",\r
         "comments": "",\r
         "x": 887.7499694824219,\r
         "y": 28.75,\r
index 50b215a..3a6cb17 100644 (file)
         "id": "7f1ad793.7b648",\r
         "type": "execute",\r
         "name": "execute read PD file",\r
-        "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\" />",\r
+        "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\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1466.5,\r
index ac9bde9..08bfe32 100644 (file)
         "id": "949cd4f7.5ed8f",\r
         "type": "set",\r
         "name": "set fileName",\r
-        "xml": "<set>\n<parameter name='tmp.fileName' value=\"`'/opt/app/bvc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001'  + '.json'`\"/>\n",\r
+        "xml": "<set>\n<parameter name='tmp.fileName' value=\"`'/opt/onap/appc/cvaas/' + $vnf-id + '_' + $tmp.uploadConfigInfo.UPLOAD-TIMESTAMP + '_appc001'  + '.json'`\"/>\n",\r
         "comments": "",\r
         "x": 457,\r
         "y": 164,\r
         "id": "38f8974.498d2e8",\r
         "type": "set",\r
         "name": "set dcae-error-message",\r
-        "xml": "<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/app/bvc/cvaas\" />\n",\r
+        "xml": "<set>\n<parameter name='dcae-error-message' value=\"Unable to write file to /opt/onap/appc/cvaas\" />\n",\r
         "comments": "",\r
         "x": 1596,\r
         "y": 376,\r
index 181b5bc..c3bfc54 100644 (file)
         "id": "235a2caa.dc26a4",\r
         "type": "configure",\r
         "name": "SDN_GP Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 783.4718627929688,\r
         "id": "f43f3748.859d08",\r
         "type": "execute",\r
         "name": "execute: EIPAM_UnassignIPAddress",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",\r
         "outputs": 1,\r
         "x": 2643.284980773926,\r
         "y": 4735.545325279236,\r
         "id": "86c2f124.a637c",\r
         "type": "configure",\r
         "name": "MSO Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n",\r
         "outputs": 1,\r
         "x": 2613.2713928222656,\r
         "y": 4886.871339797974,\r
         "id": "a7de75f9.c2b138",\r
         "type": "configure",\r
         "name": "SDN-GP Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"AUDIT\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 852,\r
         "id": "583ef652.3fb778",\r
         "type": "execute",\r
         "name": "execute: setTime(modify-timestamp)",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1187,\r
index d942228..6891733 100644 (file)
         "id": "66448305.03e3cc",\r
         "type": "execute",\r
         "name": "execute getTimeDifference",\r
-        "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\"/>",\r
+        "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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1085,\r
index 8e7d802..53042ac 100644 (file)
         "id": "d5e2186e.f0d268",\r
         "type": "execute",\r
         "name": "execute: setTime(modify-timestamp)",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 821.7498779296875,\r
index d3b38b4..093ecd7 100644 (file)
         "id": "ed61d3df.d15ae",\r
         "type": "execute",\r
         "name": "execute: setTime(modify-timestamp)",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 368.5,\r
index 65d24ee..ceb4caa 100644 (file)
         "id": "b94ddf6d.56216",\r
         "type": "configure",\r
         "name": "SDN_GP Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 672.9213256835938,\r
         "id": "7b44beed.e0798",\r
         "type": "execute",\r
         "name": "execute: EIPAM_UnassignIPAddress",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.EIPAM.EIPAMPlugin\" method=\"unassignIPAddress\">\n\t<parameter name=\"deleteEIPAM_status\" value=\"PENDING_DELETE\" />",\r
         "outputs": 1,\r
         "x": 2874.284980773926,\r
         "y": 5149.545325279236,\r
         "id": "d6d749b0.cfeac8",\r
         "type": "configure",\r
         "name": "MSO Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.mso.MSOAdaptor\" key=\"MSO\">\n      <parameter name=\"dummyparam\" value=\"test\"/>\n",\r
         "outputs": 1,\r
         "x": 2844.2713928222656,\r
         "y": 5300.871339797974,\r
         "id": "bbe81125.eaf2d",\r
         "type": "configure",\r
         "name": "SDN_GP Asynch Notification",\r
-        "xml": "<configure activate=\"true\" adaptor=\"com.att.sdnctl.sli.adaptor.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>",\r
+        "xml": "<configure activate=\"true\" adaptor=\"org.onap.ccsdk.sli.adaptors.async.AsyncResponseAdaptor\" key=\"CONFIG\">\n<parameter name=\"dummyparam\" value=\"test\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 827.0951843261719,\r
         "id": "3fdf2b46.361354",\r
         "type": "execute",\r
         "name": "execute: setTime(modify-timestamp)",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1104.4494934082031,\r
index a426f3c..aa76741 100644 (file)
         "id": "db7678e6.fdbd48",\r
         "type": "execute",\r
         "name": "execute getTimeDifference",\r
-        "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\"/>",\r
+        "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\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 950.8333435058594,\r
index 1328fce..623918e 100644 (file)
         "id": "a87cb168.0c421",\r
         "type": "execute",\r
         "name": "execute: setTime(modify-timestamp)",\r
-        "xml": "<execute plugin=\"com.att.sdnctl.sli.plugin.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.ipAddressTools.IpAddressTool\" method=\"setTime\">\n\t<parameter name=\"ctxVariable\" value=\"service-data.oper-status.modify-timestamp\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 914.7498779296875,\r
index 7754ee7..9885d25 100644 (file)
@@ -51,7 +51,7 @@
         "id": "906908fc.43cf18",\r
         "type": "execute",\r
         "name": "execute",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 920.306266784668,\r
index 3169f3b..8815913 100644 (file)
         "id": "3f7d06de.4adc9a",\r
         "type": "execute",\r
         "name": "executeTest",\r
-        "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`\"/>",\r
+        "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`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 741.8060150146484,\r
index b7b919e..d8ab025 100644 (file)
         "id": "e7b3ea7a.c2c148",\r
         "type": "execute",\r
         "name": "executePreRestart",\r
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n",\r
+        "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.smp.SMPDGPlugin' method='restartSequenceGenerator' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 700.8542175292969,\r
index 102ae39..22585cf 100644 (file)
@@ -51,7 +51,7 @@
         "id": "5fb00be2.55cd14",\r
         "type": "execute",\r
         "name": "Start Application ",\r
-        "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`\" />",\r
+        "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 575.470588684082,\r
         "id": "6c8ebab7.6be074",\r
         "type": "execute",\r
         "name": "Get Node Name",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 595.888916015625,\r
index eb94a37..07406ed 100644 (file)
         "id": "cba91b7e.1a9828",\r
         "type": "execute",\r
         "name": "Execute stop node",\r
-        "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`\" />",\r
+        "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 907.5,\r
         "id": "bb87dbed.34a348",\r
         "type": "execute",\r
         "name": "Healthcheck to get Node Name",\r
-        "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`\"/>",\r
+        "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`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 447.5,\r
         "id": "d6d1b7f.22dce48",\r
         "type": "execute",\r
         "name": "Select vnf-host-ip via connection test",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 464.5,\r
index 2aedf4b..04df73d 100644 (file)
         "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,
index ef781c1..ca95747 100644 (file)
         "id": "7e300025.5253a",\r
         "type": "execute",\r
         "name": "execute CvaasDataIntoContext",\r
-        "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`\" />",\r
+        "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1943.9172744750977,\r
index 19046f5..830b561 100644 (file)
         "id": "bcfe699a.fbac68",\r
         "type": "execute",\r
         "name": "executeTest",\r
-        "xml": "<execute plugin='com.att.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeTest'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",\r
+        "xml": "<execute plugin='org.onap.appc.dg.vSCP.v3_5_5.VSCPDGUtils' method='executeTest'>\n<parameter name=\"connection-details\" value=\"`$connection-details`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 940.7498474121094,\r
index 35ec375..adb0bdc 100644 (file)
         "id": "6711af89.05acc",\r
         "type": "execute",\r
         "name": "execute: liveUpgrade",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 919.5277938842773,\r
index fe978a0..7f6b3f7 100644 (file)
         "id": "6a8d06b2.533f18",\r
         "type": "execute",\r
         "name": "executeUpload",\r
-        "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`\" />",\r
+        "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1714.7499732971191,\r
index 2fb4fc8..3120a1f 100644 (file)
         "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,
index 994fbc7..6aba42b 100644 (file)
@@ -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;
index 3c939cb..1e7835c 100644 (file)
@@ -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;
 
index 9f6d676..29d7b0f 100644 (file)
@@ -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;
 
index 6022ac8..894ddd7 100644 (file)
@@ -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;
index 2f6f745..3cf70fe 100644 (file)
@@ -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;
 
index 231dd6b..87d3f45 100644 (file)
@@ -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;
index af0423b..36c549a 100644 (file)
@@ -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());
 
index 3223cb9..95fcf3e 100644 (file)
@@ -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;
 
index f7307ac..9587a96 100644 (file)
@@ -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;
 
index 52e2041..074aa6f 100644 (file)
@@ -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;
 
index b84b051..d08bd4f 100644 (file)
@@ -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;
 
index 6bc9d10..d9b9ad4 100644 (file)
@@ -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;
index 56b0bab..0b5cf7e 100644 (file)
@@ -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;
 
index f239972..bf7d5e2 100644 (file)
@@ -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;
index 943edf2..6cc0517 100644 (file)
@@ -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;
index 9eed43e..a0a2024 100644 (file)
@@ -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;
index 6d23d13..6f3847e 100644 (file)
@@ -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");
index 7c2247a..073c3d7 100644 (file)
@@ -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;
index 0168b47..04f6e80 100644 (file)
@@ -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
       
 
index 4d6b0aa..940ea0e 100644 (file)
@@ -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
 
 
index 6e6659c..e4b86e7 100644 (file)
@@ -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
index 5cf5181..ec9fba8 100644 (file)
@@ -25,8 +25,8 @@ parameters:
   required: false\r
   source: null\r
   class-type: null\r
-  default-value: "fd00:f4d5:ea06:1:0:110:136:254"\r
-  assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"\r
+  default-value: "10.0.0.147"\r
+  assigned-value: "10.0.0.147"\r
   path: null\r
   request-keys: null\r
   response-keys: null\r
@@ -61,8 +61,8 @@ parameters:
   required: false\r
   source: null\r
   class-type: null\r
-  default-value: "fd00:f4d5:ea06:1:0:110:136:254"\r
-  assigned-value: "fd00:f4d5:ea06:1:0:110:136:254"\r
+  default-value: "10.0.0.147"\r
+  assigned-value: "10.0.0.147"\r
   path: null\r
   request-keys: null\r
   response-keys: null\r
index 9bd143c..f023075 100644 (file)
@@ -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"
                     }
                 ]
         ]
     },
     "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"
     }
 }
index d6b2ebb..794c8d8 100644 (file)
@@ -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"
                     }
                 ]
     },
     "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"
     }
 }
index 3eb302e..f065c30 100644 (file)
@@ -21,7 +21,7 @@ vnf-parameter-list:
   required: false\r
   source: "INSTAR"\r
   rule-type: null\r
-  default: "fd00:f4d5:ea06:1:0:110:136:254"\r
+  default: "10.0.0.147"\r
   request-keys:\r
   - key-name: "address_fqdn"\r
     key-value: "m001dbj001p1n004v006"\r
@@ -52,7 +52,7 @@ vnf-parameter-list:
   required: false\r
   source: null\r
   rule-type: null\r
-  default: "fd00:f4d5:ea06:1:0:110:136:254"\r
+  default: "10.0.0.147"\r
   request-keys: null\r
   response-keys: null\r
 - name: "REMOTE_BILLING_IP_ADDR"\r
index cb9e332..3abb4fe 100644 (file)
             </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>
index d889582..424a2d6 100644 (file)
@@ -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);
index d126542..b499b08 100644 (file)
 ###
 
 
-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
index b6e0438..e671bbe 100644 (file)
@@ -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.";
index 1913038..c4cb34c 100644 (file)
@@ -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\
index f12ecbd..b827338 100755 (executable)
@@ -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>
index a5947c4..7c6df09 100644 (file)
@@ -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.";
index f799db5..5d88fe7 100644 (file)
@@ -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);