summaryrefslogtreecommitdiffstats
path: root/appc-config/appc-flow-controller/provider/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/main/java')
-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
2 files changed, 11 insertions, 11 deletions
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";