aboutsummaryrefslogtreecommitdiffstats
path: root/appc-config
diff options
context:
space:
mode:
authormojahidi <mojahidul.islam@amdocs.com>2017-08-29 18:20:26 +0530
committerMarcus Williams <marcus.williams@intel.com>2017-08-31 18:56:59 +0000
commit3df3182a7badeef662f743bfc8d67cea805b1ef4 (patch)
tree20e41c1f971de4c21ddd62e6c087d7a5d7ea5ae9 /appc-config
parentdc2344fc5754dee739f1db69cc6c16dfe0522ab8 (diff)
Update ASDC References to SDC 1/2
This patch changes ASDC to SDC in APPC code, bundle names and other pertinent places. This change sanitizes SDC for Open Source. It is the first in a two part change, the first updates code mentions and artifacts. The second will update database references. Change-Id: Iffd73480cc325172b5d8969fe839728f1c88ef78 Issue-ID:APPC-179 Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>
Diffstat (limited to 'appc-config')
-rw-r--r--appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java2
-rw-r--r--appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java4
-rw-r--r--appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java4
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java18
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java4
5 files changed, 16 insertions, 16 deletions
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
index 87e0f2c9b..fed2e7cae 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/AppcDataServiceConstant.java
@@ -34,7 +34,7 @@ public class AppcDataServiceConstant {
public static String OUTPUT_PARAM_ERROR_MESSAGE = "error-message";
public static final String INPUT_PARAM_FILE_CATEGORY = "fileCategory";
public static final String INPUT_PARAM_VM_INSTANCE = "vmInstance";
- public static final String INPUT_PARAM_ASDC_ARTIFACT_IND = "asdcArtifactInd";
+ public static final String INPUT_PARAM_SDC_ARTIFACT_IND = "asdcArtifactInd";
public static final Object INPUT_PARAM_VNF_ID = "vnfId";
public static final Object INPUT_PARAM_VM_NAME = "vmName";
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
index 3ec42f61a..98fd50cc9 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/db/DGGeneralDBService.java
@@ -203,7 +203,7 @@ public class DGGeneralDBService {
}
- public QueryStatus savePrepareRelationship(SvcLogicContext ctx, String prefix, String fileId, String asdcInd)
+ public QueryStatus savePrepareRelationship(SvcLogicContext ctx, String prefix, String fileId, String sdcInd)
throws SvcLogicException {
QueryStatus status = null;
@@ -211,7 +211,7 @@ public class DGGeneralDBService {
if (serviceLogic != null && ctx != null) {
- if ("Y".equals(asdcInd))
+ if ("Y".equals(sdcInd))
key = "INSERT INTO PREPARE_FILE_RELATIONSHIP " + " SET service_instance_id = $service-instance-id , "
+ " request_id = $request-id , " + " asdc_artifacts_id = " + fileId + " ;";
diff --git a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
index 942493905..4676d37cb 100644
--- a/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
+++ b/appc-config/appc-data-services/provider/src/main/java/org/openecomp/appc/data/services/node/ConfigResourceNode.java
@@ -301,14 +301,14 @@ public class ConfigResourceNode implements SvcLogicJavaPlugin {
log.info("Received savePrepareRelationship call with params : " + inParams);
String responsePrefix = inParams.get(AppcDataServiceConstant.INPUT_PARAM_RESPONSE_PREFIX);
- String asdcArtifactInd = inParams.get(AppcDataServiceConstant.INPUT_PARAM_ASDC_ARTIFACT_IND);
+ String sdcArtifactInd = inParams.get(AppcDataServiceConstant.INPUT_PARAM_SDC_ARTIFACT_IND);
String fileId = inParams.get(AppcDataServiceConstant.INPUT_PARAM_FILE_ID);
try {
responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
DGGeneralDBService db = DGGeneralDBService.initialise();
- QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel", fileId, asdcArtifactInd);
+ QueryStatus status = db.savePrepareRelationship(ctx, "tmp.preparerel", fileId, sdcArtifactInd);
if (status == QueryStatus.FAILURE)
throw new Exception("Unable to save prepare_relationship");
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
index c3ea6ede8..528be3263 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/dbervices/FlowControlDBService.java
@@ -82,8 +82,8 @@ public class FlowControlDBService {
String fn = "DBService.getDesignTimeFlowModel ";
QueryStatus status = null;
if (serviceLogic != null && localContext != null) {
- String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_ASDC_ARTIFACTS
- + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_ASDC_REFERENCE +
+ String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_SDC_ARTIFACTS
+ + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_SDC_REFERENCE +
" where vnf_type= $" + FlowControllerConstants.VNF_TYPE +
" and vnfc_type = $" + FlowControllerConstants.VNFC_TYPE +
" and action = $" + FlowControllerConstants.REQUEST_ACTION +
@@ -96,7 +96,7 @@ public class FlowControlDBService {
if(status.toString().equals("FAILURE"))
throw new SvcLogicException("Error - while getting FlowReferenceData ");
- String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_ASDC_ARTIFACTS +
+ String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_SDC_ARTIFACTS +
" where artifact_name = $artifactName and internal_version = $maxInternalVersion ";
log.debug(fn + "Query String : " + queryString1);
@@ -168,8 +168,8 @@ public class FlowControlDBService {
String fn = "DBService.getDependencyInfo ";
QueryStatus status = null;
if (serviceLogic != null && localContext != null) {
- String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_ASDC_ARTIFACTS
- + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_ASDC_REFERENCE +
+ String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_SDC_ARTIFACTS
+ + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_SDC_REFERENCE +
" where vnf_type= $" + FlowControllerConstants.VNF_TYPE +
" and file_category = '" + FlowControllerConstants.DEPENDENCYMODEL +"' )" ;
@@ -179,7 +179,7 @@ public class FlowControlDBService {
if(status.toString().equals("FAILURE"))
throw new SvcLogicException("Error - while getting dependencydata ");
- String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_ASDC_ARTIFACTS +
+ String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_SDC_ARTIFACTS +
" where artifact_name = $artifactName and internal_version = $maxInternalVersion ";
log.debug(fn + "Query String : " + queryString1);
@@ -195,8 +195,8 @@ public class FlowControlDBService {
String fn = "DBService.getCapabilitiesData ";
QueryStatus status = null;
if (serviceLogic != null && localContext != null) {
- String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_ASDC_ARTIFACTS
- + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_ASDC_REFERENCE +
+ String queryString = "select max(internal_version) as maxInternalVersion, artifact_name as artifactName from " + FlowControllerConstants.DB_SDC_ARTIFACTS
+ + " where artifact_name in (select artifact_name from " + FlowControllerConstants.DB_SDC_REFERENCE +
" where vnf_type= $" + FlowControllerConstants.VNF_TYPE +
" and file_category = '" + FlowControllerConstants.CAPABILITY +"' )" ;
@@ -206,7 +206,7 @@ public class FlowControlDBService {
if(status.toString().equals("FAILURE"))
throw new SvcLogicException("Error - while getting capabilitiesData ");
- String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_ASDC_ARTIFACTS +
+ String queryString1 = "select artifact_content from " + FlowControllerConstants.DB_SDC_ARTIFACTS +
" where artifact_name = $artifactName and internal_version = $maxInternalVersion ";
log.debug(fn + "Query String : " + queryString1);
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
index 70500c4b1..9adade961 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/openecomp/appc/flow/controller/utils/FlowControllerConstants.java
@@ -81,8 +81,8 @@ public class FlowControllerConstants {
public static final String REST = "rest";
- public static final String DB_ASDC_ARTIFACTS = "ASDC_ARTIFACTS";
- public static final String DB_ASDC_REFERENCE = "ASDC_REFERENCE";
+ public static final String DB_SDC_ARTIFACTS = "ASDC_ARTIFACTS";
+ public static final String DB_SDC_REFERENCE = "ASDC_REFERENCE";
public static final String DB_REQUEST_ARTIFACTS = "REQUEST_ARTIFACTS";
public static final String DB_MULTISTEP_FLOW_REFERENCE = "MULTISTEP_FLOW_REFERENCE";
public static final String DB_PROTOCOL_REFERENCE = "PROTOCOL_REFERENCE";