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";
}
- 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;
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 + " ;";
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");
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 +
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);
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 +"' )" ;
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);
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 +"' )" ;
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);
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";
public static final String REQUEST_ID_FIELD_NAME = "REQUEST_ID";
public static final String CREATION_DATE_FIELD_NAME = "CREATION_DATE";
public static final String LOG_FIELD_NAME = "LOG";
- public static final String ASDC_ARTIFACTS_TABLE_NAME = "ASDC_ARTIFACTS";
+ public static final String SDC_ARTIFACTS_TABLE_NAME = "ASDC_ARTIFACTS";
// input fields names
public static final String PAYLOAD = "payload";
*/
public static final String AAI_VNF_MODEL_VERSION_ID ="model-version-id";
- public enum ASDC_ARTIFACTS_FIELDS {
+ public enum SDC_ARTIFACTS_FIELDS {
SERVICE_UUID,
DISTRIBUTION_ID,
SERVICE_NAME,
/*
@Test
- public void testASDCMessage() {
+ public void testSDCMessage() {
try {
- String propertyfileName = "ASDC-MESSAGE_method_configuration-document-request_TC1.properties";
+ String propertyfileName = "SDC-MESSAGE_method_configuration-document-request_TC1.properties";
- String configurationDocumentRequestXML = "src/main/resources/xml/ASDC-MESSAGE_method_configuration-document-request_3.0.0.xml";
+ String configurationDocumentRequestXML = "src/main/resources/xml/SDC-MESSAGE_method_configuration-document-request_3.0.0.xml";
// Register Call graphs
serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode());
serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode());
- GraphKey graphKey = new GraphKey("ASDC-MESSAGE", null, "configuration-document-request", null);
+ GraphKey graphKey = new GraphKey("SDC-MESSAGE", null, "configuration-document-request", null);
DGTestCase tc = new DGTestCase(graphKey);
tc.setInjectGraphXmls(injectGraphXmls);
tc.setServiceReferences(serviceReferences);
# ============LICENSE_END=========================================================
###
-asdc-reference.configuration-document-request-input.document-parameters.artifact-contents=tcfile://vdbe_template.xml
-asdc-reference.outCome=SUCCESS
-tmp.asdc-artifacts.outCome=SUCCESS
+sdc-reference.configuration-document-request-input.document-parameters.artifact-contents=tcfile://vdbe_template.xml
+sdc-reference.outCome=SUCCESS
+tmp.sdc-artifacts.outCome=SUCCESS
public static final String REQUEST_ID_FIELD_NAME = "REQUEST_ID";
public static final String CREATION_DATE_FIELD_NAME = "CREATION_DATE";
public static final String LOG_FIELD_NAME = "LOG";
- public static final String ASDC_ARTIFACTS = "ASDC_ARTIFACTS";
+ public static final String SDC_ARTIFACTS = "ASDC_ARTIFACTS";
// input fields names
public static final String PAYLOAD = "payload";
public static final String IS_ACQUIRE_ENTITLEMENT_REQUIRE ="is.acquire-entitlement.require";
public static final String IS_RELEASE_ENTITLEMENT_REQUIRE ="is.release-entitlement.require";
- public enum ASDC_ARTIFACTS_FIELDS {
+ public enum SDC_ARTIFACTS_FIELDS {
SERVICE_UUID,
DISTRIBUTION_ID,
SERVICE_NAME,
import com.att.eelf.configuration.EELFManager;
import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
-import static org.openecomp.appc.licmgr.Constants.ASDC_ARTIFACTS_FIELDS;
+import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS;
import java.sql.SQLException;
import java.util.ArrayList;
DataAccessException {
Map<String,String> result = new HashMap<>();
- if (null == fields || 0 == fields.length) fields = new String[]{ASDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT.name()};
+ if (null == fields || 0 == fields.length) fields = new String[]{SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT.name()};
String queryString = buildQueryStatement();
result.put(field, data.getString(field));
}
} else {
- String msg = "Missing license model for VNF_TYPE: " + vnfType + " and VNF_VERSION: " + vnfVersion + " in table " + Constants.ASDC_ARTIFACTS;
+ String msg = "Missing license model for VNF_TYPE: " + vnfType + " and VNF_VERSION: " + vnfVersion + " in table " + Constants.SDC_ARTIFACTS;
logger.info(msg);
}
} catch (SQLException e) {
}
private String buildQueryStatement() {
- return "select * " + "from " + Constants.ASDC_ARTIFACTS + " " +
- "where " + ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME.name() + " = ?" +
- " AND " + ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION.name() + " = ?" +
- " AND " + ASDC_ARTIFACTS_FIELDS.ARTIFACT_TYPE.name() + " = ?";
+ return "select * " + "from " + Constants.SDC_ARTIFACTS + " " +
+ "where " + SDC_ARTIFACTS_FIELDS.RESOURCE_NAME.name() + " = ?" +
+ " AND " + SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION.name() + " = ?" +
+ " AND " + SDC_ARTIFACTS_FIELDS.ARTIFACT_TYPE.name() + " = ?";
}
}
package org.openecomp.appc.licmgr.impl;
-import static org.openecomp.appc.licmgr.Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT;
+import static org.openecomp.appc.licmgr.Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT;
import java.util.Map;
}
leaf request-action {
type enumeration {
- enum "StoreAsdcDocumentRequest";
+ enum "StoreSdcDocumentRequest";
}
}
leaf request-sub-action {
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<configuration>
<instructions>
<Bundle-SymbolicName>org.openecomp.appc.artifact.handler</Bundle-SymbolicName>
- <Bundle-Activator>org.openecomp.appc.artifact.handler.AsdcArtifactHandlerActivator</Bundle-Activator>
+ <Bundle-Activator>org.openecomp.appc.artifact.handler.SdcArtifactHandlerActivator</Bundle-Activator>
<Export-Package>org.openecomp.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl</Export-Package>
<Import-Package>*</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.openecomp.appc.artifact.handler.node.ArtifactHandlerNode;
import org.openecomp.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
-import org.openecomp.appc.artifact.handler.utils.AsdcArtifactHandlerConstants;
+import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
import org.openecomp.sdnc.sli.SvcLogicContext;
import com.att.eelf.configuration.EELFLogger;
try{
if(input.getRequestInformation().getSource() !=null){
- if(input.getRequestInformation().getSource().equalsIgnoreCase(AsdcArtifactHandlerConstants.DESIGN_TOOL)){
+ if(input.getRequestInformation().getSource().equalsIgnoreCase(SdcArtifactHandlerConstants.DESIGN_TOOL)){
designUtil.processTemplate(designUtil.createDummyRequestData());
configResponseBuilder.setStatus(ArtifactHandlerProviderUtil.DistributionStatusEnum.DEPLOY_OK.toString());
}
import java.util.LinkedList;
import java.util.List;
-import java.util.Properties;
import org.openecomp.appc.artifact.handler.node.ArtifactHandlerNode;
import org.osgi.framework.BundleActivator;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-public class AsdcArtifactHandlerActivator implements BundleActivator {
+public class SdcArtifactHandlerActivator implements BundleActivator {
- private static final EELFLogger log = EELFManager.getInstance().getLogger(AsdcArtifactHandlerActivator.class);
+ private static final EELFLogger log = EELFManager.getInstance().getLogger(SdcArtifactHandlerActivator.class);
private List<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
@Override
import java.sql.SQLException;
import java.util.HashMap;
-import org.openecomp.appc.artifact.handler.utils.AsdcArtifactHandlerConstants;
+import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
import org.openecomp.sdnc.sli.SvcLogicContext;
import org.openecomp.sdnc.sli.SvcLogicException;
import org.openecomp.sdnc.sli.SvcLogicResource;
if(status.toString().equals("FAILURE"))
throw new SvcLogicException("Error - getting Artifact ID from database");
artifactID = ctx.getAttribute("id");
- log.info("ASDC_ARTIFACTS_ID received as : " + ctx.getAttribute("id"));
+ log.info("SDC_ARTIFACTS_ID received as : " + ctx.getAttribute("id"));
}
return artifactID;
}
status = serviceLogic.save("SQL", false, false, key, null, null, ctx);
if(status.toString().equals("FAILURE"))
- throw new SvcLogicException("Error While processing storing Artifact: " +ctx.getAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME));
+ throw new SvcLogicException("Error While processing storing Artifact: " +ctx.getAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME));
}
return status;
public void processConfigureActionDg(SvcLogicContext context, boolean isUpdate) {
String fn = "DBService.processConfigureActionDg";
- log.info("Update Parameter for ASDC Reference " + isUpdate );
+ log.info("Update Parameter for SDC Reference " + isUpdate );
String key = "";
QueryStatus status = null;
if(isUpdate);
}
- public void processAsdcReferences(SvcLogicContext context, boolean isUpdate) throws SvcLogicException {
- String fn = "DBService.processAsdcReferences";
+ public void processSdcReferences(SvcLogicContext context, boolean isUpdate) throws SvcLogicException {
+ String fn = "DBService.processSdcReferences";
String key = "";
QueryStatus status = null;
- if (isUpdate && AsdcArtifactHandlerConstants.FILE_CATEGORY.equals(AsdcArtifactHandlerConstants.CAPABILITY)) {
- key = "update " + AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE + " set ARTIFACT_NAME = $" + AsdcArtifactHandlerConstants.ARTIFACT_NAME +
- " where VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " and FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY +
+ if (isUpdate && SdcArtifactHandlerConstants.FILE_CATEGORY.equals(SdcArtifactHandlerConstants.CAPABILITY)) {
+ key = "update " + SdcArtifactHandlerConstants.DB_SDC_REFERENCE + " set ARTIFACT_NAME = $" + SdcArtifactHandlerConstants.ARTIFACT_NAME +
+ " where VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " and FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY +
" and ACTION = null";
}
else if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE + " set ARTIFACT_NAME = $" + AsdcArtifactHandlerConstants.ARTIFACT_NAME +
- " where VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " and FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY +
- " and ACTION = $" + AsdcArtifactHandlerConstants.ACTION ;
+ key = "update " + SdcArtifactHandlerConstants.DB_SDC_REFERENCE + " set ARTIFACT_NAME = $" + SdcArtifactHandlerConstants.ARTIFACT_NAME +
+ " where VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " and FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY +
+ " and ACTION = $" + SdcArtifactHandlerConstants.ACTION ;
else {
- if (AsdcArtifactHandlerConstants.FILE_CATEGORY.equals(AsdcArtifactHandlerConstants.CAPABILITY)) {
- key = "insert into " + AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE +
+ if (SdcArtifactHandlerConstants.FILE_CATEGORY.equals(SdcArtifactHandlerConstants.CAPABILITY)) {
+ key = "insert into " + SdcArtifactHandlerConstants.DB_SDC_REFERENCE +
" set VNFC_TYPE = null " +
- " , FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY +
- " , VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
+ " , FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY +
+ " , VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
" , ACTION = null " +
" , ARTIFACT_TYPE = null " +
- " , ARTIFACT_NAME = $" + AsdcArtifactHandlerConstants.ARTIFACT_NAME ;
+ " , ARTIFACT_NAME = $" + SdcArtifactHandlerConstants.ARTIFACT_NAME ;
}
else {
- key = "insert into " + AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE +
- " set VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " , FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY +
- " , VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
- " , ACTION = $" + AsdcArtifactHandlerConstants.ACTION +
- " , ARTIFACT_TYPE = $" + AsdcArtifactHandlerConstants.ARTIFACT_TYPE +
- " , ARTIFACT_NAME = $" + AsdcArtifactHandlerConstants.ARTIFACT_NAME ;
+ key = "insert into " + SdcArtifactHandlerConstants.DB_SDC_REFERENCE +
+ " set VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " , FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY +
+ " , VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
+ " , ACTION = $" + SdcArtifactHandlerConstants.ACTION +
+ " , ARTIFACT_TYPE = $" + SdcArtifactHandlerConstants.ARTIFACT_TYPE +
+ " , ARTIFACT_NAME = $" + SdcArtifactHandlerConstants.ARTIFACT_NAME ;
}
}
if (serviceLogic != null && context != null) {
log.info("Insert Key: " + key);
status = serviceLogic.save("SQL", false, false, key, null, null, context);
if(status.toString().equals("FAILURE"))
- throw new SvcLogicException("Error While processing asdc_reference table ");
+ throw new SvcLogicException("Error While processing sdc_reference table ");
}
}
log.info("Checking if Update required for this data" );
log.info("db" + db);
- log.info("ACTION=" + context.getAttribute(AsdcArtifactHandlerConstants.ACTION));
- log.info("VNFC_TYPE=" + context.getAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE));
- log.info("VNFC_INSTANCE=" + context.getAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE));
- log.info("VM_INSTANCE=" + context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE));
- log.info("VNF_TYPE=" + context.getAttribute(AsdcArtifactHandlerConstants.VNF_TYPE));
+ log.info("ACTION=" + context.getAttribute(SdcArtifactHandlerConstants.ACTION));
+ log.info("VNFC_TYPE=" + context.getAttribute(SdcArtifactHandlerConstants.VNFC_TYPE));
+ log.info("VNFC_INSTANCE=" + context.getAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE));
+ log.info("VM_INSTANCE=" + context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE));
+ log.info("VNF_TYPE=" + context.getAttribute(SdcArtifactHandlerConstants.VNF_TYPE));
String whereClause = "";
QueryStatus status = null;
- /* if(context.getAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME) !=null &&
- context.getAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME).toLowerCase().startsWith(AsdcArtifactHandlerConstants.PD))
- whereClause = " where artifact_name = $" + AsdcArtifactHandlerConstants.ARTIFACT_NAME
+ /* if(context.getAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME) !=null &&
+ context.getAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME).toLowerCase().startsWith(SdcArtifactHandlerConstants.PD))
+ whereClause = " where artifact_name = $" + SdcArtifactHandlerConstants.ARTIFACT_NAME
+ " and vnf_type = 'DummyVnf' ";
else*/
- whereClause = " where VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE;
+ whereClause = " where VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE;
- if (db !=null && db.equals(AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE) &&
- context.getAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY).equals(AsdcArtifactHandlerConstants.CAPABILITY) &&
- context.getAttribute(AsdcArtifactHandlerConstants.ACTION) ==null) {
- whereClause = whereClause + " and FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY ;
+ if (db !=null && db.equals(SdcArtifactHandlerConstants.DB_SDC_REFERENCE) &&
+ context.getAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY).equals(SdcArtifactHandlerConstants.CAPABILITY) &&
+ context.getAttribute(SdcArtifactHandlerConstants.ACTION) ==null) {
+ whereClause = whereClause + " and FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY ;
}
- else if(db !=null && db.equals(AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE)) {
- whereClause = whereClause + " and VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE
- + " and FILE_CATEGORY = $" + AsdcArtifactHandlerConstants.FILE_CATEGORY
- + " and ACTION = $" + AsdcArtifactHandlerConstants.ACTION;
+ else if(db !=null && db.equals(SdcArtifactHandlerConstants.DB_SDC_REFERENCE)) {
+ whereClause = whereClause + " and VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE
+ + " and FILE_CATEGORY = $" + SdcArtifactHandlerConstants.FILE_CATEGORY
+ + " and ACTION = $" + SdcArtifactHandlerConstants.ACTION;
}
- else if(db.equals(AsdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE)) {
- whereClause = " where PROTOCOL = $" + AsdcArtifactHandlerConstants.DEVICE_PROTOCOL;
+ else if(db.equals(SdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE)) {
+ whereClause = " where PROTOCOL = $" + SdcArtifactHandlerConstants.DEVICE_PROTOCOL;
}
- else if(db.equals(AsdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG)) {
- whereClause = whereClause + " and ACTION = $" + AsdcArtifactHandlerConstants.ACTION;
+ else if(db.equals(SdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG)) {
+ whereClause = whereClause + " and ACTION = $" + SdcArtifactHandlerConstants.ACTION;
}
- else if(db.equals(AsdcArtifactHandlerConstants.DB_VNFC_REFERENCE)){
+ else if(db.equals(SdcArtifactHandlerConstants.DB_VNFC_REFERENCE)){
int vm_instance = -1 ;
- if(context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE) !=null)
- vm_instance = Integer.parseInt(context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE));
+ if(context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE) !=null)
+ vm_instance = Integer.parseInt(context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE));
int vnfc_instance = -1 ;
- if(context.getAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE) !=null)
- vnfc_instance = Integer.parseInt(context.getAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE));
- whereClause = whereClause + " and ACTION = $" + AsdcArtifactHandlerConstants.ACTION
- + " and VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE
- + " and VNFC_INSTANCE = $" + AsdcArtifactHandlerConstants.VNFC_INSTANCE
- + " and VM_INSTANCE = $" + AsdcArtifactHandlerConstants.VM_INSTANCE ;
+ if(context.getAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE) !=null)
+ vnfc_instance = Integer.parseInt(context.getAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE));
+ whereClause = whereClause + " and ACTION = $" + SdcArtifactHandlerConstants.ACTION
+ + " and VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE
+ + " and VNFC_INSTANCE = $" + SdcArtifactHandlerConstants.VNFC_INSTANCE
+ + " and VM_INSTANCE = $" + SdcArtifactHandlerConstants.VM_INSTANCE ;
}
if (serviceLogic != null && context != null) {
String key = "";
QueryStatus status = null;
if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL +
- " set PROTOCOL = $" + AsdcArtifactHandlerConstants.DEVICE_PROTOCOL +
+ key = "update " + SdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL +
+ " set PROTOCOL = $" + SdcArtifactHandlerConstants.DEVICE_PROTOCOL +
" , DG_RPC = 'getDeviceRunningConfig' " +
" , MODULE = 'APPC' " +
- " where VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE ;
+ " where VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE ;
else
- key = "insert into " + AsdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL+
- " set VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
- " , PROTOCOL = $" + AsdcArtifactHandlerConstants.DEVICE_PROTOCOL +
+ key = "insert into " + SdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL+
+ " set VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
+ " , PROTOCOL = $" + SdcArtifactHandlerConstants.DEVICE_PROTOCOL +
" , DG_RPC = 'getDeviceRunningConfig' " +
" , MODULE = 'APPC' " ;
String key = "";
QueryStatus status = null;
if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION +
- " set USER_NAME = $" + AsdcArtifactHandlerConstants.USER_NAME +
+ key = "update " + SdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION +
+ " set USER_NAME = $" + SdcArtifactHandlerConstants.USER_NAME +
" , PASSWORD = 'dummy' " +
- " , PORT_NUMBER = $" + AsdcArtifactHandlerConstants.PORT_NUMBER +
- " where VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE ;
+ " , PORT_NUMBER = $" + SdcArtifactHandlerConstants.PORT_NUMBER +
+ " where VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE ;
else
- key = "insert into " + AsdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION+
- " set VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
- " , USER_NAME = $" + AsdcArtifactHandlerConstants.USER_NAME +
+ key = "insert into " + SdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION+
+ " set VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
+ " , USER_NAME = $" + SdcArtifactHandlerConstants.USER_NAME +
" , PASSWORD = 'dummy' " +
- " , PORT_NUMBER = $" + AsdcArtifactHandlerConstants.PORT_NUMBER;
+ " , PORT_NUMBER = $" + SdcArtifactHandlerConstants.PORT_NUMBER;
if (serviceLogic != null && context != null) {
status = serviceLogic.save("SQL", false, false, key, null, null, context);
log.info(fn + "Starting DB operation for Vnfc Reference " + isUpdate );
String key = "";
int vm_instance = -1 ;
- if(context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE) !=null)
- vm_instance = Integer.parseInt(context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE));
+ if(context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE) !=null)
+ vm_instance = Integer.parseInt(context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE));
int vnfc_instance = -1 ;
- if(context.getAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE) !=null)
- vnfc_instance = Integer.parseInt(context.getAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE));
+ if(context.getAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE) !=null)
+ vnfc_instance = Integer.parseInt(context.getAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE));
QueryStatus status = null;
if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_VNFC_REFERENCE +
+ key = "update " + SdcArtifactHandlerConstants.DB_VNFC_REFERENCE +
" set VM_INSTANCE = " + vm_instance +
" , VNFC_INSTANCE = " + vnfc_instance +
- " , VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " , VNFC_FUNCTION_CODE = $" + AsdcArtifactHandlerConstants.VNFC_FUNCTION_CODE +
- " , GROUP_NOTATION_TYPE = $" + AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE +
- " , GROUP_NOTATION_VALUE = $" + AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE +
- " , IPADDRESS_V4_OAM_VIP = $" + AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP +
- " where VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
- " and ACTION = $" + AsdcArtifactHandlerConstants.ACTION +
- " and VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " and VNFC_INSTANCE = $" + AsdcArtifactHandlerConstants.VNFC_INSTANCE
- + " and VM_INSTANCE = $" + AsdcArtifactHandlerConstants.VM_INSTANCE ;
+ " , VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " , VNFC_FUNCTION_CODE = $" + SdcArtifactHandlerConstants.VNFC_FUNCTION_CODE +
+ " , GROUP_NOTATION_TYPE = $" + SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE +
+ " , GROUP_NOTATION_VALUE = $" + SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE +
+ " , IPADDRESS_V4_OAM_VIP = $" + SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP +
+ " where VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
+ " and ACTION = $" + SdcArtifactHandlerConstants.ACTION +
+ " and VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " and VNFC_INSTANCE = $" + SdcArtifactHandlerConstants.VNFC_INSTANCE
+ + " and VM_INSTANCE = $" + SdcArtifactHandlerConstants.VM_INSTANCE ;
else
- key = "insert into " + AsdcArtifactHandlerConstants.DB_VNFC_REFERENCE+
- " set VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE +
- " , ACTION = $" + AsdcArtifactHandlerConstants.ACTION +
- " , VM_INSTANCE = $" + AsdcArtifactHandlerConstants.VM_INSTANCE +
- " , VNFC_INSTANCE = $" + AsdcArtifactHandlerConstants.VNFC_INSTANCE +
- " , VNFC_TYPE = $" + AsdcArtifactHandlerConstants.VNFC_TYPE +
- " , VNFC_FUNCTION_CODE = $" + AsdcArtifactHandlerConstants.VNFC_FUNCTION_CODE +
- " , GROUP_NOTATION_TYPE = $" + AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE +
- " , IPADDRESS_V4_OAM_VIP = $" + AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP +
- " , GROUP_NOTATION_VALUE = $" + AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE ;
+ key = "insert into " + SdcArtifactHandlerConstants.DB_VNFC_REFERENCE+
+ " set VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE +
+ " , ACTION = $" + SdcArtifactHandlerConstants.ACTION +
+ " , VM_INSTANCE = $" + SdcArtifactHandlerConstants.VM_INSTANCE +
+ " , VNFC_INSTANCE = $" + SdcArtifactHandlerConstants.VNFC_INSTANCE +
+ " , VNFC_TYPE = $" + SdcArtifactHandlerConstants.VNFC_TYPE +
+ " , VNFC_FUNCTION_CODE = $" + SdcArtifactHandlerConstants.VNFC_FUNCTION_CODE +
+ " , GROUP_NOTATION_TYPE = $" + SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE +
+ " , IPADDRESS_V4_OAM_VIP = $" + SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP +
+ " , GROUP_NOTATION_VALUE = $" + SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE ;
if (serviceLogic != null && context != null) {
status = serviceLogic.save("SQL", false, false, key, null, null, context);
QueryStatus status = null;
if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE +
- " set DOWNLOAD_CONFIG_DG = $" + AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
- " where PROTOCOL = $" + AsdcArtifactHandlerConstants.DEVICE_PROTOCOL ;
+ key = "update " + SdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE +
+ " set DOWNLOAD_CONFIG_DG = $" + SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
+ " where PROTOCOL = $" + SdcArtifactHandlerConstants.DEVICE_PROTOCOL ;
else
- key = "insert into " + AsdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE+
- " set DOWNLOAD_CONFIG_DG = $" + AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
- " , PROTOCOL = $" + AsdcArtifactHandlerConstants.DEVICE_PROTOCOL ;
+ key = "insert into " + SdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE+
+ " set DOWNLOAD_CONFIG_DG = $" + SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
+ " , PROTOCOL = $" + SdcArtifactHandlerConstants.DEVICE_PROTOCOL ;
if (serviceLogic != null && context != null)
status = serviceLogic.save("SQL", false, false, key, null, null, context);
String key = "";
QueryStatus status = null;
- if(context.getAttribute(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE) != null &&
- context.getAttribute(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE).length() > 0){
+ if(context.getAttribute(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE) != null &&
+ context.getAttribute(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE).length() > 0){
if(isUpdate)
- key = "update " + AsdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG +
- " set DOWNLOAD_CONFIG_DG = $" + AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
- " where ACTION = $" + AsdcArtifactHandlerConstants.ACTION +
- " and VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE ;
+ key = "update " + SdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG +
+ " set DOWNLOAD_CONFIG_DG = $" + SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
+ " where ACTION = $" + SdcArtifactHandlerConstants.ACTION +
+ " and VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE ;
else
- key = "insert into " + AsdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG+
- " set DOWNLOAD_CONFIG_DG = $" + AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
- " , ACTION = $" + AsdcArtifactHandlerConstants.ACTION +
- " , VNF_TYPE = $" + AsdcArtifactHandlerConstants.VNF_TYPE ;
+ key = "insert into " + SdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG+
+ " set DOWNLOAD_CONFIG_DG = $" + SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE +
+ " , ACTION = $" + SdcArtifactHandlerConstants.ACTION +
+ " , VNF_TYPE = $" + SdcArtifactHandlerConstants.VNF_TYPE ;
if (serviceLogic != null && context != null)
status = serviceLogic.save("SQL", false, false, key, null, null, context);
import org.json.JSONObject;
import org.openecomp.appc.artifact.handler.dbservices.DBService;
import org.openecomp.appc.artifact.handler.utils.ArtifactHandlerProviderUtil;
-import org.openecomp.appc.artifact.handler.utils.AsdcArtifactHandlerConstants;
+import org.openecomp.appc.artifact.handler.utils.SdcArtifactHandlerConstants;
import org.openecomp.appc.yang.YANGGenerator;
import org.openecomp.appc.yang.impl.YANGGeneratorFactory;
import org.openecomp.sdnc.config.params.transformer.tosca.ArtifactProcessorImpl;
String postData = inParams.get("postData");
JSONObject input = new JSONObject(postData).getJSONObject("input");
responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix+".") : "";
- storeUpdateAsdcArtifacts(input);
+ storeUpdateSdcArtifacts(input);
}
}
catch(Exception e){
}
}
- private boolean storeUpdateAsdcArtifacts(JSONObject postDataJson) throws Exception {
- log.info("Starting processing of ASDC Artifacs into Handler with Data : " + postDataJson.toString());
+ private boolean storeUpdateSdcArtifacts(JSONObject postDataJson) throws Exception {
+ log.info("Starting processing of SDC Artifacs into Handler with Data : " + postDataJson.toString());
try{
- JSONObject request_information = (JSONObject)postDataJson.get(AsdcArtifactHandlerConstants.REQUEST_INFORMATION);
- JSONObject document_information =(JSONObject)postDataJson.get(AsdcArtifactHandlerConstants.DOCUMENT_PARAMETERS);
- String artifact_name = document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME);
+ JSONObject request_information = (JSONObject)postDataJson.get(SdcArtifactHandlerConstants.REQUEST_INFORMATION);
+ JSONObject document_information =(JSONObject)postDataJson.get(SdcArtifactHandlerConstants.DOCUMENT_PARAMETERS);
+ String artifact_name = document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME);
if(artifact_name !=null){
updateStoreArtifacts(request_information, document_information );
- if(artifact_name.toLowerCase().startsWith(AsdcArtifactHandlerConstants.REFERENCE))
+ if(artifact_name.toLowerCase().startsWith(SdcArtifactHandlerConstants.REFERENCE))
return storeReferenceData(request_information, document_information );
- else if (artifact_name.toLowerCase().startsWith(AsdcArtifactHandlerConstants.PD))
+ else if (artifact_name.toLowerCase().startsWith(SdcArtifactHandlerConstants.PD))
return createDataForPD(request_information, document_information );
}
else
- throw new Exception("Missing Artifact Name for Request : " + request_information.getString(AsdcArtifactHandlerConstants.REQUETS_ID));
+ throw new Exception("Missing Artifact Name for Request : " + request_information.getString(SdcArtifactHandlerConstants.REQUETS_ID));
}
catch(Exception e){
e.printStackTrace();
- throw new Exception("Error while processing Request ID : " + ((JSONObject)postDataJson.get(AsdcArtifactHandlerConstants.REQUEST_INFORMATION)).getString(AsdcArtifactHandlerConstants.REQUETS_ID) + e.getMessage());
+ throw new Exception("Error while processing Request ID : " + ((JSONObject)postDataJson.get(SdcArtifactHandlerConstants.REQUEST_INFORMATION)).getString(SdcArtifactHandlerConstants.REQUETS_ID) + e.getMessage());
}
return false;
private boolean createDataForPD(JSONObject request_information, JSONObject document_information) throws Exception {
String fn = "ArtifactHandlerNode.createReferenceDataForPD";
- String artifact_name = document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME);
- log.info(fn + "Received PD File Name: " + artifact_name + " and suffix lenght " + AsdcArtifactHandlerConstants.PD.length());
+ String artifact_name = document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME);
+ log.info(fn + "Received PD File Name: " + artifact_name + " and suffix lenght " + SdcArtifactHandlerConstants.PD.length());
try {
- String suffix = artifact_name.substring(AsdcArtifactHandlerConstants.PD.length());
+ String suffix = artifact_name.substring(SdcArtifactHandlerConstants.PD.length());
createArtifactRecords(request_information, document_information, suffix);
} catch (Exception e) {
e.printStackTrace();
private void createArtifactRecords(JSONObject request_information, JSONObject document_information, String suffix) throws Exception {
- log.info("Creating Tosca Records and storing into ASDC Artifacs");
+ log.info("Creating Tosca Records and storing into SDC Artifacs");
String [] docs = {"Tosca", "Yang"};
ArtifactHandlerProviderUtil ahpUtil = new ArtifactHandlerProviderUtil();
- String PDFileContents = document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS);
+ String PDFileContents = document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS);
//Tosca generation
OutputStream toscaStream = new ByteArrayOutputStream();
String yangName = null;
for(String doc : docs){
- document_information.put(AsdcArtifactHandlerConstants.ARTIFACT_TYPE, doc.concat("Type"));
- document_information.put(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, doc.concat("Model"));
+ document_information.put(SdcArtifactHandlerConstants.ARTIFACT_TYPE, doc.concat("Type"));
+ document_information.put(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, doc.concat("Model"));
if(doc.equals("Tosca"))
- document_information.put(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS, ahpUtil.escapeSql(toscaContents));
+ document_information.put(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS, ahpUtil.escapeSql(toscaContents));
else if (doc.equals("Yang"))
- document_information.put(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS, ahpUtil.escapeSql(yangContents));
- document_information.put(AsdcArtifactHandlerConstants.ARTIFACT_NAME, doc.concat(suffix));
+ document_information.put(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS, ahpUtil.escapeSql(yangContents));
+ document_information.put(SdcArtifactHandlerConstants.ARTIFACT_NAME, doc.concat(suffix));
yangName = doc.concat(suffix);
updateStoreArtifacts(request_information, document_information);
}
}
private boolean updateStoreArtifacts(JSONObject request_information, JSONObject document_information ) throws Exception {
- log.info("UpdateStoreArtifactsStarted storing of ASDC Artifacs ");
+ log.info("UpdateStoreArtifactsStarted storing of SDC Artifacs ");
SvcLogicContext context = new SvcLogicContext();
DBService dbservice = DBService.initialise();
ArtifactHandlerProviderUtil ahpUtil = new ArtifactHandlerProviderUtil();
int intversion = 0;
- context.setAttribute("artifact_name",document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME));
- String internal_version = dbservice.getInternalVersionNumber(context, document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME), null);
+ context.setAttribute("artifact_name",document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME));
+ String internal_version = dbservice.getInternalVersionNumber(context, document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME), null);
log.info("Internal Version number received from Database : " + internal_version);
if(internal_version != null){
intversion = Integer.parseInt(internal_version);
intversion++ ;
}
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_UUID, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.DISTRIBUTION_ID, document_information.getString(AsdcArtifactHandlerConstants.DISTRIBUTION_ID));
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_NAME, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_NAME));
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_UUID, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME,document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_TYPE, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_TYPE));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_UUID, document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_TYPE,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_TYPE));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS,ahpUtil.escapeSql(document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS)));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_UUID, document_information.getString(SdcArtifactHandlerConstants.SERVICE_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.DISTRIBUTION_ID, document_information.getString(SdcArtifactHandlerConstants.DISTRIBUTION_ID));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_NAME, document_information.getString(SdcArtifactHandlerConstants.SERVICE_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION, document_information.getString(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_UUID, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME,document_information.getString(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_VERSOIN, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_VERSOIN));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_TYPE, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_UUID, document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_TYPE,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS,ahpUtil.escapeSql(document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS)));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME));
dbservice.saveArtifacts(context, intversion);
return true;
}
public boolean storeReferenceData(JSONObject request_information, JSONObject document_information) throws Exception {
- log.info("Started storing of ASDC Artifacs into Handler" );
+ log.info("Started storing of SDC Artifacs into Handler" );
try{
boolean updateRequired = false;
boolean pdFile = false;
String categorySuffix = null;
DBService dbservice = DBService.initialise();
ArtifactHandlerProviderUtil ahpUtil = new ArtifactHandlerProviderUtil();
- String contentString = ahpUtil.escapeSql(document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS)) ;
- String artifactName=ahpUtil.escapeSql(document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME));
- String capabilityArtifactName=StringUtils.replace(artifactName,AsdcArtifactHandlerConstants.ARTIFACT_NAME_REFERENCE,AsdcArtifactHandlerConstants.ARTIFACT_NAME_CAPABILITY);
+ String contentString = ahpUtil.escapeSql(document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS)) ;
+ String artifactName=ahpUtil.escapeSql(document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME));
+ String capabilityArtifactName=StringUtils.replace(artifactName, SdcArtifactHandlerConstants.ARTIFACT_NAME_REFERENCE, SdcArtifactHandlerConstants.ARTIFACT_NAME_CAPABILITY);
JSONObject capabilities = new JSONObject();
JSONArray vnfActionList = new JSONArray();
JSONArray vfModuleActionList = new JSONArray();
JSONObject scope = content.getJSONObject("scope");
log.info("scope :" + scope);
SvcLogicContext context = new SvcLogicContext();
- vnfType=scope.getString(AsdcArtifactHandlerConstants.VNF_TYPE);
- context.setAttribute(AsdcArtifactHandlerConstants.VNF_TYPE, scope.getString(AsdcArtifactHandlerConstants.VNF_TYPE));
- context.setAttribute(AsdcArtifactHandlerConstants.ACTION, content.getString(AsdcArtifactHandlerConstants.ACTION));
- String actionLevel=content.getString(AsdcArtifactHandlerConstants.ACTION_LEVEL);
- context.setAttribute(AsdcArtifactHandlerConstants.ACTION_LEVEL, content.getString(AsdcArtifactHandlerConstants.ACTION_LEVEL));
- if ((null != actionLevel) && actionLevel.equalsIgnoreCase(AsdcArtifactHandlerConstants.ACTION_LEVEL_VNFC)) {
- vnfcActionList.put(content.getString(AsdcArtifactHandlerConstants.ACTION));
+ vnfType=scope.getString(SdcArtifactHandlerConstants.VNF_TYPE);
+ context.setAttribute(SdcArtifactHandlerConstants.VNF_TYPE, scope.getString(SdcArtifactHandlerConstants.VNF_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.ACTION, content.getString(SdcArtifactHandlerConstants.ACTION));
+ String actionLevel=content.getString(SdcArtifactHandlerConstants.ACTION_LEVEL);
+ context.setAttribute(SdcArtifactHandlerConstants.ACTION_LEVEL, content.getString(SdcArtifactHandlerConstants.ACTION_LEVEL));
+ if ((null != actionLevel) && actionLevel.equalsIgnoreCase(SdcArtifactHandlerConstants.ACTION_LEVEL_VNFC)) {
+ vnfcActionList.put(content.getString(SdcArtifactHandlerConstants.ACTION));
}
- if (null != actionLevel && actionLevel.equalsIgnoreCase(AsdcArtifactHandlerConstants.ACTION_LEVEL_VF_MODULE)) {
- vfModuleActionList.put(content.getString(AsdcArtifactHandlerConstants.ACTION));
+ if (null != actionLevel && actionLevel.equalsIgnoreCase(SdcArtifactHandlerConstants.ACTION_LEVEL_VF_MODULE)) {
+ vfModuleActionList.put(content.getString(SdcArtifactHandlerConstants.ACTION));
}
- if (null != actionLevel && actionLevel.equalsIgnoreCase(AsdcArtifactHandlerConstants.ACTION_LEVEL_VNF)) {
- vnfActionList.put(content.getString(AsdcArtifactHandlerConstants.ACTION));
+ if (null != actionLevel && actionLevel.equalsIgnoreCase(SdcArtifactHandlerConstants.ACTION_LEVEL_VNF)) {
+ vnfActionList.put(content.getString(SdcArtifactHandlerConstants.ACTION));
}
- if (null != actionLevel && actionLevel.equalsIgnoreCase(AsdcArtifactHandlerConstants.ACTION_LEVEL_VM)) {
- vmActionList.put(content.getString(AsdcArtifactHandlerConstants.ACTION));
+ if (null != actionLevel && actionLevel.equalsIgnoreCase(SdcArtifactHandlerConstants.ACTION_LEVEL_VM)) {
+ vmActionList.put(content.getString(SdcArtifactHandlerConstants.ACTION));
}
- if(scope.has(AsdcArtifactHandlerConstants.VNFC_TYPE) && !scope.isNull(AsdcArtifactHandlerConstants.VNFC_TYPE) )
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE, scope.getString(AsdcArtifactHandlerConstants.VNFC_TYPE));
+ if(scope.has(SdcArtifactHandlerConstants.VNFC_TYPE) && !scope.isNull(SdcArtifactHandlerConstants.VNFC_TYPE) )
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE, scope.getString(SdcArtifactHandlerConstants.VNFC_TYPE));
else
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE,null);
- if (content.has(AsdcArtifactHandlerConstants.DEVICE_PROTOCOL))
- context.setAttribute(AsdcArtifactHandlerConstants.DEVICE_PROTOCOL, content.getString(AsdcArtifactHandlerConstants.DEVICE_PROTOCOL));
- if (content.has(AsdcArtifactHandlerConstants.USER_NAME))
- context.setAttribute(AsdcArtifactHandlerConstants.USER_NAME, content.getString(AsdcArtifactHandlerConstants.USER_NAME));
- if (content.has(AsdcArtifactHandlerConstants.PORT_NUMBER))
- context.setAttribute(AsdcArtifactHandlerConstants.PORT_NUMBER, content.getString(AsdcArtifactHandlerConstants.PORT_NUMBER));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_TYPE, "");
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE,null);
+ if (content.has(SdcArtifactHandlerConstants.DEVICE_PROTOCOL))
+ context.setAttribute(SdcArtifactHandlerConstants.DEVICE_PROTOCOL, content.getString(SdcArtifactHandlerConstants.DEVICE_PROTOCOL));
+ if (content.has(SdcArtifactHandlerConstants.USER_NAME))
+ context.setAttribute(SdcArtifactHandlerConstants.USER_NAME, content.getString(SdcArtifactHandlerConstants.USER_NAME));
+ if (content.has(SdcArtifactHandlerConstants.PORT_NUMBER))
+ context.setAttribute(SdcArtifactHandlerConstants.PORT_NUMBER, content.getString(SdcArtifactHandlerConstants.PORT_NUMBER));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_TYPE, "");
if(content.has("artifact-list") && content.get("artifact-list") instanceof JSONArray){
JSONArray artifactLists = (JSONArray)content.get("artifact-list");
for(int i=0;i<artifactLists.length();i++){
JSONObject artifact=(JSONObject)artifactLists.get(i);
log.info("artifact is " + artifact);
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME, artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME));
- context.setAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY, artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME, artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_TYPE));
- if(artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME) !=null &&
- artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME).toLowerCase().startsWith(AsdcArtifactHandlerConstants.PD))
+ if(artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME) !=null &&
+ artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME).toLowerCase().startsWith(SdcArtifactHandlerConstants.PD))
{
- suffix = artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_NAME).substring(AsdcArtifactHandlerConstants.PD.length());
- categorySuffix = artifact.getString(AsdcArtifactHandlerConstants.ARTIFACT_TYPE).substring(AsdcArtifactHandlerConstants.PD.length());
+ suffix = artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_NAME).substring(SdcArtifactHandlerConstants.PD.length());
+ categorySuffix = artifact.getString(SdcArtifactHandlerConstants.ARTIFACT_TYPE).substring(SdcArtifactHandlerConstants.PD.length());
pdFile = true;
}
- dbservice.processAsdcReferences(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE));
+ dbservice.processSdcReferences(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_SDC_REFERENCE));
cleanArtifactInstanceData(context);
}
if(pdFile)
{
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME, "Tosca".concat(suffix));
- context.setAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY, AsdcArtifactHandlerConstants.TOSCA_MODEL);
- dbservice.processAsdcReferences(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME, "Yang".concat(suffix));
- context.setAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY, AsdcArtifactHandlerConstants.PARAMETER_YANG);
- dbservice.processAsdcReferences(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME, "Tosca".concat(suffix));
+ context.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, SdcArtifactHandlerConstants.TOSCA_MODEL);
+ dbservice.processSdcReferences(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_SDC_REFERENCE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME, "Yang".concat(suffix));
+ context.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, SdcArtifactHandlerConstants.PARAMETER_YANG);
+ dbservice.processSdcReferences(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_SDC_REFERENCE));
}
}
- if (content.getString(AsdcArtifactHandlerConstants.ACTION).equals("Configure")) {
- if(content.has(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE) && content.getString(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE).length() > 0){
- context.setAttribute(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE, content.getString(AsdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE));
- dbservice.processDownloadDgReference(context, dbservice.isArtifactUpdateRequired(context,AsdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE));
+ if (content.getString(SdcArtifactHandlerConstants.ACTION).equals("Configure")) {
+ if(content.has(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE) && content.getString(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE).length() > 0){
+ context.setAttribute(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE, content.getString(SdcArtifactHandlerConstants.DOWNLOAD_DG_REFERENCE));
+ dbservice.processDownloadDgReference(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_DOWNLOAD_DG_REFERENCE));
}
- dbservice.processConfigActionDg(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG));
- dbservice.processDeviceInterfaceProtocol(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL));
- dbservice.processDeviceAuthentication(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION));
+ dbservice.processConfigActionDg(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_CONFIG_ACTION_DG));
+ dbservice.processDeviceInterfaceProtocol(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_DEVICE_INTERFACE_PROTOCOL));
+ dbservice.processDeviceAuthentication(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_DEVICE_AUTHENTICATION));
}
populateProtocolReference(dbservice, content);
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE, null);
- if( content.has(AsdcArtifactHandlerConstants.VM) && content.get(AsdcArtifactHandlerConstants.VM) instanceof JSONArray){
- JSONArray vmList = (JSONArray)content.get(AsdcArtifactHandlerConstants.VM);
+ if( content.has(SdcArtifactHandlerConstants.VM) && content.get(SdcArtifactHandlerConstants.VM) instanceof JSONArray){
+ JSONArray vmList = (JSONArray)content.get(SdcArtifactHandlerConstants.VM);
for(int i=0;i<vmList.length();i++){
JSONObject vmInstance=(JSONObject)vmList.get(i);
- context.setAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE, String.valueOf(vmInstance.getInt(AsdcArtifactHandlerConstants.VM_INSTANCE)));
- log.info("VALUE = " + context.getAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE));
- if(vmInstance.get(AsdcArtifactHandlerConstants.VNFC) instanceof JSONArray){
- JSONArray vnfcInstanceList = (JSONArray)vmInstance.get(AsdcArtifactHandlerConstants.VNFC);
+ context.setAttribute(SdcArtifactHandlerConstants.VM_INSTANCE, String.valueOf(vmInstance.getInt(SdcArtifactHandlerConstants.VM_INSTANCE)));
+ log.info("VALUE = " + context.getAttribute(SdcArtifactHandlerConstants.VM_INSTANCE));
+ if(vmInstance.get(SdcArtifactHandlerConstants.VNFC) instanceof JSONArray){
+ JSONArray vnfcInstanceList = (JSONArray)vmInstance.get(SdcArtifactHandlerConstants.VNFC);
for(int k=0;k<vnfcInstanceList.length();k++){
JSONObject vnfcInstance = (JSONObject)vnfcInstanceList.get(k);
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE, String.valueOf(vnfcInstance.getInt(AsdcArtifactHandlerConstants.VNFC_INSTANCE)));
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE, vnfcInstance.getString(AsdcArtifactHandlerConstants.VNFC_TYPE));
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_FUNCTION_CODE, vnfcInstance.getString(AsdcArtifactHandlerConstants.VNFC_FUNCTION_CODE));
- if(vnfcInstance.has(AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP))
- context.setAttribute(AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP, vnfcInstance.getString(AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP));
- if(vnfcInstance.has(AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE))
- context.setAttribute(AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE, vnfcInstance.getString(AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE));
- if(vnfcInstance.has(AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE))
- context.setAttribute(AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE, vnfcInstance.getString(AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE));
- dbservice.processVnfcReference(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_VNFC_REFERENCE));
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE, String.valueOf(vnfcInstance.getInt(SdcArtifactHandlerConstants.VNFC_INSTANCE)));
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE, vnfcInstance.getString(SdcArtifactHandlerConstants.VNFC_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_FUNCTION_CODE, vnfcInstance.getString(SdcArtifactHandlerConstants.VNFC_FUNCTION_CODE));
+ if(vnfcInstance.has(SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP))
+ context.setAttribute(SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP, vnfcInstance.getString(SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP));
+ if(vnfcInstance.has(SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE))
+ context.setAttribute(SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE, vnfcInstance.getString(SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE));
+ if(vnfcInstance.has(SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE))
+ context.setAttribute(SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE, vnfcInstance.getString(SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE));
+ dbservice.processVnfcReference(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_VNFC_REFERENCE));
cleanVnfcInstance(context);
}
- context.setAttribute(AsdcArtifactHandlerConstants.VM_INSTANCE,null);
+ context.setAttribute(SdcArtifactHandlerConstants.VM_INSTANCE,null);
}
}
}
private void cleanArtifactInstanceData(SvcLogicContext context)
{
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME, null);
- context.setAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY, null);
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME, null);
+ context.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, null);
}
private void cleanVnfcInstance(SvcLogicContext context) {
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_INSTANCE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_FUNCTION_CODE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP, null);
- context.setAttribute(AsdcArtifactHandlerConstants.GROUP_NOTATION_TYPE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.GROUP_NOTATION_VALUE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_INSTANCE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_FUNCTION_CODE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.IPADDRESS_V4_OAM_VIP, null);
+ context.setAttribute(SdcArtifactHandlerConstants.GROUP_NOTATION_TYPE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.GROUP_NOTATION_VALUE, null);
}
JSONObject newCapabilitiesObject=new JSONObject();
newCapabilitiesObject.put("capabilities", capabilities);
SvcLogicContext context = new SvcLogicContext();
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME,capabilityArtifactName);
- context.setAttribute(AsdcArtifactHandlerConstants.FILE_CATEGORY, AsdcArtifactHandlerConstants.CAPABILITY);
- context.setAttribute(AsdcArtifactHandlerConstants.ACTION, null);
- context.setAttribute(AsdcArtifactHandlerConstants.VNFC_TYPE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_TYPE, null);
- context.setAttribute(AsdcArtifactHandlerConstants.VNF_TYPE,vnfType);
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_CONTENTS,newCapabilitiesObject.toString());
- dbservice.processAsdcReferences(context, dbservice.isArtifactUpdateRequired(context, AsdcArtifactHandlerConstants.DB_ASDC_REFERENCE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME,capabilityArtifactName);
+ context.setAttribute(SdcArtifactHandlerConstants.FILE_CATEGORY, SdcArtifactHandlerConstants.CAPABILITY);
+ context.setAttribute(SdcArtifactHandlerConstants.ACTION, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNFC_TYPE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_TYPE, null);
+ context.setAttribute(SdcArtifactHandlerConstants.VNF_TYPE,vnfType);
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_CONTENTS,newCapabilitiesObject.toString());
+ dbservice.processSdcReferences(context, dbservice.isArtifactUpdateRequired(context, SdcArtifactHandlerConstants.DB_SDC_REFERENCE));
int intversion = 0;
- String internal_version = dbservice.getInternalVersionNumber(context, context.getAttribute(AsdcArtifactHandlerConstants.ARTIFACT_NAME), null);
+ String internal_version = dbservice.getInternalVersionNumber(context, context.getAttribute(SdcArtifactHandlerConstants.ARTIFACT_NAME), null);
log.info("Internal Version number received from Database : " + internal_version);
if(internal_version != null){
intversion = Integer.parseInt(internal_version);
intversion++ ;
}
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_UUID, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.DISTRIBUTION_ID, document_information.getString(AsdcArtifactHandlerConstants.DISTRIBUTION_ID));
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_NAME, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_NAME));
- context.setAttribute(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION, document_information.getString(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_UUID, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME,document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN));
- context.setAttribute(AsdcArtifactHandlerConstants.RESOURCE_TYPE, document_information.getString(AsdcArtifactHandlerConstants.RESOURCE_TYPE));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_UUID, document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_UUID));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN));
- context.setAttribute(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION,document_information.getString(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_UUID, document_information.getString(SdcArtifactHandlerConstants.SERVICE_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.DISTRIBUTION_ID, document_information.getString(SdcArtifactHandlerConstants.DISTRIBUTION_ID));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_NAME, document_information.getString(SdcArtifactHandlerConstants.SERVICE_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION, document_information.getString(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_UUID, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME,document_information.getString(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_VERSOIN, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_VERSOIN));
+ context.setAttribute(SdcArtifactHandlerConstants.RESOURCE_TYPE, document_information.getString(SdcArtifactHandlerConstants.RESOURCE_TYPE));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_UUID, document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_UUID));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN));
+ context.setAttribute(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION,document_information.getString(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION));
dbservice.saveArtifacts(context, intversion);
SvcLogicContext context = new SvcLogicContext();
JSONObject scope = content.getJSONObject("scope");
String vnfType=null,protocol=null,action=null,actionLevel=null,template=null;
- if(scope.has(AsdcArtifactHandlerConstants.VNF_TYPE) && !scope.isNull(AsdcArtifactHandlerConstants.VNF_TYPE))
- vnfType=scope.getString(AsdcArtifactHandlerConstants.VNF_TYPE);
- if (content.has(AsdcArtifactHandlerConstants.DEVICE_PROTOCOL))
- protocol=content.getString(AsdcArtifactHandlerConstants.DEVICE_PROTOCOL);
- if (content.has(AsdcArtifactHandlerConstants.ACTION))
- action= content.getString(AsdcArtifactHandlerConstants.ACTION);
- if (content.has(AsdcArtifactHandlerConstants.ACTION_LEVEL))
- actionLevel=content.getString(AsdcArtifactHandlerConstants.ACTION_LEVEL);
- if (content.has(AsdcArtifactHandlerConstants.TEMPLATE) && !content.isNull(AsdcArtifactHandlerConstants.TEMPLATE))
- template=content.getString(AsdcArtifactHandlerConstants.TEMPLATE);
+ if(scope.has(SdcArtifactHandlerConstants.VNF_TYPE) && !scope.isNull(SdcArtifactHandlerConstants.VNF_TYPE))
+ vnfType=scope.getString(SdcArtifactHandlerConstants.VNF_TYPE);
+ if (content.has(SdcArtifactHandlerConstants.DEVICE_PROTOCOL))
+ protocol=content.getString(SdcArtifactHandlerConstants.DEVICE_PROTOCOL);
+ if (content.has(SdcArtifactHandlerConstants.ACTION))
+ action= content.getString(SdcArtifactHandlerConstants.ACTION);
+ if (content.has(SdcArtifactHandlerConstants.ACTION_LEVEL))
+ actionLevel=content.getString(SdcArtifactHandlerConstants.ACTION_LEVEL);
+ if (content.has(SdcArtifactHandlerConstants.TEMPLATE) && !content.isNull(SdcArtifactHandlerConstants.TEMPLATE))
+ template=content.getString(SdcArtifactHandlerConstants.TEMPLATE);
dbservice.insertProtocolReference(context, vnfType,protocol,action,actionLevel,template);
}
catch (Exception e) {
JSONObject requestInfo = new JSONObject();
String random = getRandom();
- requestInfo.put(AsdcArtifactHandlerConstants.REQUETS_ID, "TLRID-" + random);
- requestInfo.put(AsdcArtifactHandlerConstants.REQUEST_ACTION, "StoreAsdcDocumentRequest");
- requestInfo.put(AsdcArtifactHandlerConstants.SOURCE, "TemplateLoader");
+ requestInfo.put(SdcArtifactHandlerConstants.REQUETS_ID, "TLRID-" + random);
+ requestInfo.put(SdcArtifactHandlerConstants.REQUEST_ACTION, "StoreSdcDocumentRequest");
+ requestInfo.put(SdcArtifactHandlerConstants.SOURCE, "TemplateLoader");
JSONObject docParams = new JSONObject();
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_UUID, "TLSUUID" + templateData.getRequestInformation().getRequestId());
- docParams.put(AsdcArtifactHandlerConstants.DISTRIBUTION_ID, "TLDID" + random);
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_NAME, "TLServiceName");
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION, "Template Loader Test");
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_ARTIFACTS, "[]");
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_UUID, "TLRUID" + random);
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME, "TLRIName");
- docParams.put(AsdcArtifactHandlerConstants.REOURCE_NAME, "TLResourceName");
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN, "TLResourceVersion");
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_TYPE, "TLResourceType");
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_UUID, "TLAUUID" + random);
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_NAME, templateData.getDocumentParameters().getArtifactName());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_TYPE, "APPC-CONFIG");
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN, templateData.getDocumentParameters().getArtifactVersion());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, "AsdcTestDescription");
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_UUID, "TLSUUID" + templateData.getRequestInformation().getRequestId());
+ docParams.put(SdcArtifactHandlerConstants.DISTRIBUTION_ID, "TLDID" + random);
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_NAME, "TLServiceName");
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION, "Template Loader Test");
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_ARTIFACTS, "[]");
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_UUID, "TLRUID" + random);
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME, "TLRIName");
+ docParams.put(SdcArtifactHandlerConstants.REOURCE_NAME, "TLResourceName");
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_VERSOIN, "TLResourceVersion");
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_TYPE, "TLResourceType");
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_UUID, "TLAUUID" + random);
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_NAME, templateData.getDocumentParameters().getArtifactName());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_TYPE, "APPC-CONFIG");
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN, templateData.getDocumentParameters().getArtifactVersion());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, "SdcTestDescription");
// String data = IOUtils.toString(TestartifactHandlerNode.class.getClassLoader().getResourceAsStream("template_msrp_msc_a_template.json"), "utf-8");
// String data = IOUtils.toString(TemplateProcessor.class.getClassLoader().getResourceAsStream("referenceData.json"), "utf-8");
// this.templateData = this.templateData.substring(this.templateData.indexOf("}") + 1);
docParams.put("artifact-contents", templateData.getDocumentParameters().getArtifactContents());
- json.put(AsdcArtifactHandlerConstants.REQUEST_INFORMATION, requestInfo);
- json.put(AsdcArtifactHandlerConstants.DOCUMENT_PARAMETERS, docParams);
+ json.put(SdcArtifactHandlerConstants.REQUEST_INFORMATION, requestInfo);
+ json.put(SdcArtifactHandlerConstants.DOCUMENT_PARAMETERS, docParams);
System.out.println("Final data =" + this.templateData);
return String.format("{\"input\": %s}", json.toString());
}
JSONObject requestInfo = new JSONObject();
String random = getRandom();
- requestInfo.put(AsdcArtifactHandlerConstants.REQUETS_ID, templateData.getRequestInformation().getRequestId());
- requestInfo.put(AsdcArtifactHandlerConstants.REQUEST_ACTION, "StoreAsdcDocumentRequest");
- requestInfo.put(AsdcArtifactHandlerConstants.SOURCE, templateData.getRequestInformation().getSource());
+ requestInfo.put(SdcArtifactHandlerConstants.REQUETS_ID, templateData.getRequestInformation().getRequestId());
+ requestInfo.put(SdcArtifactHandlerConstants.REQUEST_ACTION, "StoreSdcDocumentRequest");
+ requestInfo.put(SdcArtifactHandlerConstants.SOURCE, templateData.getRequestInformation().getSource());
JSONObject docParams = new JSONObject();
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_UUID, templateData.getDocumentParameters().getResourceUuid());
- docParams.put(AsdcArtifactHandlerConstants.DISTRIBUTION_ID, templateData.getDocumentParameters().getDistributionId());
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_NAME, templateData.getDocumentParameters().getServiceName());
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_DESCRIPTION, templateData.getDocumentParameters().getServiceDescription());
- docParams.put(AsdcArtifactHandlerConstants.SERVICE_ARTIFACTS, templateData.getDocumentParameters().getServiceArtifacts());
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_UUID, templateData.getDocumentParameters().getResourceUuid());
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME, templateData.getDocumentParameters().getResourceInstanceName());
- docParams.put(AsdcArtifactHandlerConstants.REOURCE_NAME, templateData.getDocumentParameters().getResourceName());
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_VERSOIN, templateData.getDocumentParameters().getResourceVersion());
- docParams.put(AsdcArtifactHandlerConstants.RESOURCE_TYPE, templateData.getDocumentParameters().getResourceType());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_UUID, templateData.getDocumentParameters().getArtifactUuid());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_NAME, templateData.getDocumentParameters().getArtifactName());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_TYPE, templateData.getDocumentParameters().getArtifactType());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_VERSOIN, templateData.getDocumentParameters().getArtifactVersion());
- docParams.put(AsdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, templateData.getDocumentParameters().getArtifactDescription());
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_UUID, templateData.getDocumentParameters().getResourceUuid());
+ docParams.put(SdcArtifactHandlerConstants.DISTRIBUTION_ID, templateData.getDocumentParameters().getDistributionId());
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_NAME, templateData.getDocumentParameters().getServiceName());
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_DESCRIPTION, templateData.getDocumentParameters().getServiceDescription());
+ docParams.put(SdcArtifactHandlerConstants.SERVICE_ARTIFACTS, templateData.getDocumentParameters().getServiceArtifacts());
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_UUID, templateData.getDocumentParameters().getResourceUuid());
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_INSTANCE_NAME, templateData.getDocumentParameters().getResourceInstanceName());
+ docParams.put(SdcArtifactHandlerConstants.REOURCE_NAME, templateData.getDocumentParameters().getResourceName());
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_VERSOIN, templateData.getDocumentParameters().getResourceVersion());
+ docParams.put(SdcArtifactHandlerConstants.RESOURCE_TYPE, templateData.getDocumentParameters().getResourceType());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_UUID, templateData.getDocumentParameters().getArtifactUuid());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_NAME, templateData.getDocumentParameters().getArtifactName());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_TYPE, templateData.getDocumentParameters().getArtifactType());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_VERSOIN, templateData.getDocumentParameters().getArtifactVersion());
+ docParams.put(SdcArtifactHandlerConstants.ARTIFACT_DESRIPTION, templateData.getDocumentParameters().getArtifactDescription());
docParams.put("artifact-contents", templateData.getDocumentParameters().getArtifactContents());
- json.put(AsdcArtifactHandlerConstants.REQUEST_INFORMATION, requestInfo);
- json.put(AsdcArtifactHandlerConstants.DOCUMENT_PARAMETERS, docParams);
+ json.put(SdcArtifactHandlerConstants.REQUEST_INFORMATION, requestInfo);
+ json.put(SdcArtifactHandlerConstants.DOCUMENT_PARAMETERS, docParams);
System.out.println("Final data =" + this.templateData);
return String.format("{\"input\": %s}", json.toString());
}
package org.openecomp.appc.artifact.handler.utils;
-public class AsdcArtifactHandlerConstants {
+public class SdcArtifactHandlerConstants {
public static final String DOCUMENT_PARAMETERS = "document-parameters";
public static final String SERVICE_UUID = "service-uuid";
public static final String DB_DOWNLOAD_DG_REFERENCE = "DOWNLOAD_DG_REFERENCE";
- public static final String DB_ASDC_REFERENCE = "ASDC_REFERENCE";
+ public static final String DB_SDC_REFERENCE = "ASDC_REFERENCE";
public static final String DB_DEVICE_INTERFACE_PROTOCOL = "DEVICE_INTERFACE_PROTOCOL";
public static final String DB_DEVICE_AUTHENTICATION = "DEVICE_AUTHENTICATION";
public static final String DB_VNFC_REFERENCE = "VNFC_REFERENCE";
grouping status {
description "The specific response codes are to be aligned with APPC/ECOMP messaging Systems";
container status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
leaf code {
description "Response code";
type string;
ArtifactHandlerClient ac = new ArtifactHandlerClient();
String requestString = ac.createArtifactData(payload, requestID);
ac.execute(requestString, "POST");
- int asdc_artifact_id = getASDCArtifactIDbyRequestID(requestID);
- int asdc_reference_id = getASDCReferenceID(payload);
- createArtifactTrackingRecord(payload, requestID,asdc_artifact_id, asdc_reference_id );
+ int sdc_artifact_id = getSDCArtifactIDbyRequestID(requestID);
+ int sdc_reference_id = getSDCReferenceID(payload);
+ createArtifactTrackingRecord(payload, requestID,sdc_artifact_id, sdc_reference_id );
String status = getDataFromActionStatus(payload, "STATUS");
if(status == null || status.isEmpty())
setActionStatus(payload, "Not Tested");
- linkstatusRelationShip(asdc_artifact_id,asdc_reference_id, payload);
+ linkstatusRelationShip(sdc_artifact_id,sdc_reference_id, payload);
}
catch(Exception e){
}
- private void linkstatusRelationShip(int asdc_artifact_id, int asdc_reference_id, String payload) throws Exception {
+ private void linkstatusRelationShip(int sdc_artifact_id, int sdc_reference_id, String payload) throws Exception {
ObjectMapper objectMapper = new ObjectMapper();
JsonNode payloadObject = objectMapper.readTree(payload);
ArrayList<String> argList = new ArrayList<>();
- argList.add(String.valueOf(asdc_artifact_id));
- argList.add(String.valueOf(asdc_reference_id));
+ argList.add(String.valueOf(sdc_artifact_id));
+ argList.add(String.valueOf(sdc_reference_id));
argList.add(payloadObject.get(DesignServiceConstants.VNF_TYPE).textValue());
argList.add(payloadObject.get(DesignServiceConstants.ACTION).textValue());
argList.add(payloadObject.get(DesignServiceConstants.USER_ID).textValue());
throw new Exception("Error while updating RealtionShip table");
}
- private int getASDCReferenceID(String payload) throws Exception {
+ private int getSDCReferenceID(String payload) throws Exception {
String vnfc_type = null;
ObjectMapper objectMapper = new ObjectMapper();
log.info("Query String :" + queryString);
ResultSet data = dbservice.getDBData(queryString, argList);
- int asdc_reference_id = 0;
+ int sdc_reference_id = 0;
while(data.next()) {
- asdc_reference_id = data.getInt("ASDC_REFERENCE_ID");
+ sdc_reference_id = data.getInt("ASDC_REFERENCE_ID");
}
- log.info("Got asdc_reference_id = " + asdc_reference_id );
- return asdc_reference_id;
+ log.info("Got sdc_reference_id = " + sdc_reference_id );
+ return sdc_reference_id;
}
return updateStatus;
}
- private void createArtifactTrackingRecord(String payload, String requestID, int asdc_artifact_id, int asdc_reference_id) throws Exception {
+ private void createArtifactTrackingRecord(String payload, String requestID, int sdc_artifact_id, int sdc_reference_id) throws Exception {
String vnfc_type = null;
ObjectMapper objectMapper = new ObjectMapper();
JsonNode payloadObject = objectMapper.readTree(payload);
ArrayList<String> argList = new ArrayList<>();
- argList.add(String.valueOf(asdc_artifact_id));
- argList.add(String.valueOf(asdc_reference_id));
+ argList.add(String.valueOf(sdc_artifact_id));
+ argList.add(String.valueOf(sdc_reference_id));
argList.add(payloadObject.get(DesignServiceConstants.USER_ID).textValue());
if (payloadObject.get(DesignServiceConstants.TECHNOLOGY) != null &&! payloadObject.get(DesignServiceConstants.TECHNOLOGY).textValue().isEmpty())
argList.add(payloadObject.get(DesignServiceConstants.TECHNOLOGY).textValue());
}
- private int getASDCArtifactIDbyRequestID(String requestID) throws Exception {
+ private int getSDCArtifactIDbyRequestID(String requestID) throws Exception {
log.info("Starting getArtifactIDbyRequestID DB Operation");
int artifact_id = 0;
try{
e.printStackTrace();
throw e;
}
- log.info("Got ASDC_ARTIFACTS_ID As :" + artifact_id);
+ log.info("Got SDC_ARTIFACTS_ID As :" + artifact_id);
return artifact_id;
}
// localContext.setAttribute("userID", UserId);
// if (serviceLogic != null && localContext != null) {
// String queryString = "SELECT AR.VNF_TYPE, AR.VNFC_TYPE, DAT.PROTOCOL, DAT.IN_CART from " +
- // DesignServiceConstants.DB_DT_ARTIFACT_TRACKING + " DAT , " + DesignServiceConstants.DB_ASDC_REFERENCE +
- // " AR where DAT.ASDC_REFERENCE_ID= AR.ASDC_REFERENCE_ID and DAT.USER = $userID" ;
+ // DesignServiceConstants.DB_DT_ARTIFACT_TRACKING + " DAT , " + DesignServiceConstants.DB_SDC_REFERENCE +
+ // " AR where DAT.SDC_REFERENCE_ID= AR.SDC_REFERENCE_ID and DAT.USER = $userID" ;
//
// log.info(fn + "Query String : " + queryString);
// try {
argList.add(UserID);
String queryString = "SELECT AR.VNF_TYPE, AR.VNFC_TYPE, DAT.PROTOCOL, DAT.IN_CART, AR.ACTION, AR.ARTIFACT_NAME, AR.ARTIFACT_TYPE from " +
- DesignServiceConstants.DB_DT_ARTIFACT_TRACKING + " DAT , " + DesignServiceConstants.DB_ASDC_REFERENCE +
+ DesignServiceConstants.DB_DT_ARTIFACT_TRACKING + " DAT , " + DesignServiceConstants.DB_SDC_REFERENCE +
" AR where DAT.ASDC_REFERENCE_ID= AR.ASDC_REFERENCE_ID and DAT.USER = ? ";
DesignResponse designResponse = new DesignResponse();
ObjectNode requestInfo = objectMapper.createObjectNode();
requestInfo.put(DesignServiceConstants.REQUETS_ID, requestID);
- requestInfo.put(DesignServiceConstants.REQUEST_ACTION, "StoreAsdcDocumentRequest");
+ requestInfo.put(DesignServiceConstants.REQUEST_ACTION, "StoreSdcDocumentRequest");
requestInfo.put(DesignServiceConstants.SOURCE, DesignServiceConstants.DESIGN_TOOL);
String random = getRandom();
public static final String DB_DT_ARTIFACT_TRACKING = "DT_ARTIFACT_TRACKING";
- public static final String DB_ASDC_REFERENCE = "ASDC_REFERENCE";
+ public static final String DB_SDC_REFERENCE = "ASDC_REFERENCE";
public static final String SCHEMA_SDNCTL = "SDNCTL";
public static final String GETARTIFACT = "getArtifact";
public static final String USER_ID = "userID";
}
@Test
- public void testGetASDCReferenceID() {
+ public void testGetSDCReferenceID() {
try {
String content = FileUtils.readFileToString(new File("src/test/resources/uploadArtifact"));
String payload = " { \"userID\": \"0000\",\"status\":\"Test\", \"vnf-type\" : \"DesigTest-VNF\", \"action\" : \"Configure\", \"artifact-name\":\"DesignRestArtifact_reference\",\"artifact-version\" :\"0.01\",\"artifact-type\" :\"DESIGNTOOL-TEST\",\"artifact-status\":\"\",\"artifact-contents\": "+ content + " } ";
DesignDBService design = DesignDBService.initialise();
- Whitebox.invokeMethod(design, "getASDCReferenceID", payload);
+ Whitebox.invokeMethod(design, "getSDCReferenceID", payload);
} catch (Exception e) {
}
}
}
@Test
- public void testGetASDCArtifactIDbyRequestID() {
+ public void testGetSDCArtifactIDbyRequestID() {
try {
String content = FileUtils.readFileToString(new File("src/test/resources/uploadArtifact"));
String payload = " { \"userID\": \"0000\",\"status\":\"Test\", \"vnf-type\" : \"DesigTest-VNF\", \"action\" : \"Configure\", \"artifact-name\":\"DesignRestArtifact_reference\",\"artifact-version\" :\"0.01\",\"artifact-type\" :\"DESIGNTOOL-TEST\",\"artifact-status\":\"\",\"artifact-contents\": "+ content + " } ";
DesignDBService design = DesignDBService.initialise();
- Whitebox.invokeMethod(design, "getASDCArtifactIDbyRequestID", "0");
+ Whitebox.invokeMethod(design, "getSDCArtifactIDbyRequestID", "0");
} catch (Exception e) {
}
}
}
grouping status {
- description "The specific response codes are to be aligned with ASDC reference
+ description "The specific response codes are to be aligned with SDC reference
doc (main table removed to avoid duplication and digression from
- main table). See ASDC and ECOMP Distribution Consumer Interface
+ main table). See SDC and ECOMP Distribution Consumer Interface
Agreement";
container status {
- description "The specific response codes are to be aligned with ASDC reference
+ description "The specific response codes are to be aligned with SDC reference
doc (main table removed to avoid duplication and digression from
- main table). See ASDC and ECOMP Distribution Consumer Interface
+ main table). See SDC and ECOMP Distribution Consumer Interface
Agreement";
leaf code {
description "Response code";
grouping status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
container status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
leaf code {
description "Response code";
type uint16;
}
grouping status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
container status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
leaf code {
description "Response code";
type uint16;
grouping ResponseAttributes {
description "The response contains the status of executed functionality";
container Status {
- description "The specific response codes are to be aligned with ASDC reference doc (main table removed to avoid duplication and digression from main table). See ASDC and ECOMP Distribution Consumer Interface Agreement";
+ description "The specific response codes are to be aligned with SDC reference doc (main table removed to avoid duplication and digression from main table). See SDC and ECOMP Distribution Consumer Interface Agreement";
leaf Code {
description "Response code value";
type uint32;
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>appc-asdc-listener</artifactId>
+ <artifactId>appc-sdc-listener</artifactId>
<groupId>org.openecomp.appc</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<snakeyaml.version>1.15</snakeyaml.version>
</properties>
- <artifactId>appc-asdc-listener-bundle</artifactId>
+ <artifactId>appc-sdc-listener-bundle</artifactId>
<packaging>bundle</packaging>
<dependencies>
<configuration>
<instructions>
<Bundle-SymbolicName>org.openecomp.appc.sdc.listener</Bundle-SymbolicName>
- <!--Bundle-Activator>org.openecomp.appc.sdc.listener.AppcAsdcListenerActivator</Bundle-Activator -->
+ <!--Bundle-Activator>org.openecomp.appc.sdc.listener.AppcSdcListenerActivator</Bundle-Activator -->
<Export-Package>org.openecomp.appc.sdc.listener</Export-Package>
<Import-Package>
org.openecomp.appc.licmgr,
private static final String SCHEMA = "sdnctl";
- private static final String SELECT_QUERY = Constants.SELECT_FROM + Constants.ASDC_ARTIFACTS +
- Constants.WHERE + Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME + Constants.QUERY_PLACEHOLDER +
- AND + Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + Constants.QUERY_PLACEHOLDER +
+ private static final String SELECT_QUERY = Constants.SELECT_FROM + Constants.SDC_ARTIFACTS +
+ Constants.WHERE + Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_NAME + Constants.QUERY_PLACEHOLDER +
+ AND + Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + Constants.QUERY_PLACEHOLDER +
AND + Constants.ARTIFACT_TYPE + Constants.QUERY_PLACEHOLDER;
- private static final String SELECT_QUERY_SDC_REFERENCE = Constants.SELECT_FROM + Constants.ASDC_REFERENCE +
- Constants.WHERE + Constants.ASDC_REFERENCE_FIELDS.VNF_TYPE + Constants.QUERY_PLACEHOLDER +
- AND + Constants.ASDC_REFERENCE_FIELDS.FILE_CATEGORY + Constants.QUERY_PLACEHOLDER ;
+ private static final String SELECT_QUERY_SDC_REFERENCE = Constants.SELECT_FROM + Constants.SDC_REFERENCE +
+ Constants.WHERE + Constants.SDC_REFERENCE_FIELDS.VNF_TYPE + Constants.QUERY_PLACEHOLDER +
+ AND + Constants.SDC_REFERENCE_FIELDS.FILE_CATEGORY + Constants.QUERY_PLACEHOLDER ;
- private static final String INSERT_QUERY = Constants.INSERT + Constants.ASDC_ARTIFACTS +
- " ( " + Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_UUID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_UUID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_TYPE + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_UUID + COMMA +
+ private static final String INSERT_QUERY = Constants.INSERT + Constants.SDC_ARTIFACTS +
+ " ( " + Constants.SDC_ARTIFACTS_FIELDS.SERVICE_UUID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.SERVICE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_UUID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_TYPE + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_UUID + COMMA +
Constants.ARTIFACT_TYPE + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.CREATION_DATE + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.CREATION_DATE + COMMA +
Constants.ARTIFACT_NAME +COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT + " ) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT + " ) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
- private static final String INSERT_QUERY_WITH_INT_VER = Constants.INSERT + Constants.ASDC_ARTIFACTS +
- " ( " + Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_UUID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_UUID + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_TYPE + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_UUID + COMMA +
+ private static final String INSERT_QUERY_WITH_INT_VER = Constants.INSERT + Constants.SDC_ARTIFACTS +
+ " ( " + Constants.SDC_ARTIFACTS_FIELDS.SERVICE_UUID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.SERVICE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_UUID + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_NAME + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_TYPE + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_UUID + COMMA +
Constants.ARTIFACT_TYPE + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.CREATION_DATE + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.CREATION_DATE + COMMA +
Constants.ARTIFACT_NAME + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT + COMMA +
- Constants.ASDC_ARTIFACTS_FIELDS.INTERNAL_VERSION + " ) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT + COMMA +
+ Constants.SDC_ARTIFACTS_FIELDS.INTERNAL_VERSION + " ) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
- private static final String ASDC_REF_INSERT_QUERY = Constants.INSERT + Constants.ASDC_REFERENCE +
- "( "+ Constants.ASDC_REFERENCE_FIELDS.VNF_TYPE + COMMA +
- Constants.ASDC_REFERENCE_FIELDS.VNFC_TYPE+ COMMA +
- Constants.ASDC_REFERENCE_FIELDS.FILE_CATEGORY +COMMA +
- Constants.ASDC_REFERENCE_FIELDS.ACTION +COMMA +
+ private static final String SDC_REF_INSERT_QUERY = Constants.INSERT + Constants.SDC_REFERENCE +
+ "( "+ Constants.SDC_REFERENCE_FIELDS.VNF_TYPE + COMMA +
+ Constants.SDC_REFERENCE_FIELDS.VNFC_TYPE+ COMMA +
+ Constants.SDC_REFERENCE_FIELDS.FILE_CATEGORY +COMMA +
+ Constants.SDC_REFERENCE_FIELDS.ACTION +COMMA +
Constants.ARTIFACT_TYPE + COMMA +
Constants.ARTIFACT_NAME + " ) values (?,?,?,?,?,?)";
- private static final String SELECT_MAX_INT_VERSION = "SELECT coalesce(max(" + Constants.ASDC_ARTIFACTS_FIELDS.INTERNAL_VERSION + ")+1,1) as " + Constants.ASDC_ARTIFACTS_FIELDS.INTERNAL_VERSION +
- " FROM " + Constants.ASDC_ARTIFACTS + Constants.WHERE + Constants.ARTIFACT_NAME + Constants.QUERY_PLACEHOLDER;
+ private static final String SELECT_MAX_INT_VERSION = "SELECT coalesce(max(" + Constants.SDC_ARTIFACTS_FIELDS.INTERNAL_VERSION + ")+1,1) as " + Constants.SDC_ARTIFACTS_FIELDS.INTERNAL_VERSION +
+ " FROM " + Constants.SDC_ARTIFACTS + Constants.WHERE + Constants.ARTIFACT_NAME + Constants.QUERY_PLACEHOLDER;
private final EELFLogger logger = EELFManager.getInstance().getLogger(ArtifactStorageService.class);
* @param artifact - SDC Artifact object
* @throws APPCException
*/
- public void storeASDCArtifact(SDCArtifact artifact) throws APPCException {
+ public void storeSDCArtifact(SDCArtifact artifact) throws APPCException {
if(logger.isDebugEnabled()){
- logger.debug("Entering storeASDCArtifact with : " + artifact.toString());
+ logger.debug("Entering storeSDCArtifact with : " + artifact.toString());
}
try {
initializeDBLibService();
throw new APPCException(e.getMessage(),e);
}
if(logger.isDebugEnabled()){
- logger.debug("Exiting storeASDCArtifact");
+ logger.debug("Exiting storeSDCArtifact");
}
}
* @param reference - SDC reference object
* @throws APPCException
*/
- public void storeASDCArtifactWithReference(SDCArtifact artifact , SDCReference reference) throws APPCException {
+ public void storeSDCArtifactWithReference(SDCArtifact artifact , SDCReference reference) throws APPCException {
if(logger.isDebugEnabled()){
- logger.debug("Entering storeASDCArtifactWithReference with : " + artifact.toString());
+ logger.debug("Entering storeSDCArtifactWithReference with : " + artifact.toString());
}
try {
initializeDBLibService();
if(existingReference == null){
logger.debug("Inserting SDC Reference data: " +reference.toString());
ArrayList<String> arguments = prepareReferenceArguments(reference);
- dbLibService.writeData(ASDC_REF_INSERT_QUERY,arguments,SCHEMA);
+ dbLibService.writeData(SDC_REF_INSERT_QUERY,arguments,SCHEMA);
}else{
logger.debug("Artifact reference already exists for: " +reference.toString());
}
throw new APPCException(e.getMessage(),e);
}
if(logger.isDebugEnabled()){
- logger.debug("Exiting storeASDCArtifactWithReference");
+ logger.debug("Exiting storeSDCArtifactWithReference");
}
}
arguments.add(artifactName);
CachedRowSet rowSet = dbLibService.getData(SELECT_MAX_INT_VERSION, arguments, SCHEMA);
if (rowSet.first()) {
- version = rowSet.getInt(Constants.ASDC_ARTIFACTS_FIELDS.INTERNAL_VERSION .toString());
+ version = rowSet.getInt(Constants.SDC_ARTIFACTS_FIELDS.INTERNAL_VERSION .toString());
}
}catch (SQLException e) {
logger.error("Error getting internal version for artifact name " + artifactName , e);
/**
* Reads the SDC artifact from APP-C database
- * @param resourceName - resource Name from ASDC Artifact
- * @param resourceVersion - resource version from ASDC Artifact
- * @param artifactType artifact type from ASDC Artifact
- * @return - ASDC_ARTIFACT record if data exists
+ * @param resourceName - resource Name from SDC Artifact
+ * @param resourceVersion - resource version from SDC Artifact
+ * @param artifactType artifact type from SDC Artifact
+ * @return - SDC_ARTIFACT record if data exists
* @throws APPCException
*/
public SDCArtifact retrieveSDCArtifact(String resourceName, String resourceVersion, String artifactType) throws APPCException {
CachedRowSet rowSet = dbLibService.getData(SELECT_QUERY, arguments, SCHEMA);
if (rowSet.first()) {
artifact = new SDCArtifact();
- artifact.setArtifactUUID(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_UUID.toString()));
+ artifact.setArtifactUUID(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_UUID.toString()));
artifact.setArtifactName(rowSet.getString(Constants.ARTIFACT_NAME));
artifact.setArtifactType(rowSet.getString(Constants.ARTIFACT_TYPE));
- artifact.setArtifactVersion(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION.toString()));
- artifact.setArtifactDescription(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION.toString()));
- artifact.setArtifactContent(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT.toString()));
+ artifact.setArtifactVersion(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_VERSION.toString()));
+ artifact.setArtifactDescription(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_DESCRIPTION.toString()));
+ artifact.setArtifactContent(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.ARTIFACT_CONTENT.toString()));
- artifact.setResourceUUID(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_UUID.toString()));
- artifact.setResourceName(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME.toString()));
- artifact.setResourceType(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_TYPE.toString()));
- artifact.setResourceVersion(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION.toString()));
- artifact.setResourceInstanceName(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME.toString()));
+ artifact.setResourceUUID(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_UUID.toString()));
+ artifact.setResourceName(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_NAME.toString()));
+ artifact.setResourceType(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_TYPE.toString()));
+ artifact.setResourceVersion(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION.toString()));
+ artifact.setResourceInstanceName(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_INSTANCE_NAME.toString()));
- artifact.setServiceUUID(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_UUID.toString()));
- artifact.setServiceName(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_NAME.toString()));
- artifact.setServiceDescription(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION.toString()));
+ artifact.setServiceUUID(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.SERVICE_UUID.toString()));
+ artifact.setServiceName(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.SERVICE_NAME.toString()));
+ artifact.setServiceDescription(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.SERVICE_DESCRIPTION.toString()));
- artifact.setCreationDate(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.CREATION_DATE.toString()));
- artifact.setDistributionId(rowSet.getString(Constants.ASDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID.toString()));
+ artifact.setCreationDate(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.CREATION_DATE.toString()));
+ artifact.setDistributionId(rowSet.getString(Constants.SDC_ARTIFACTS_FIELDS.DISTRIBUTION_ID.toString()));
}
} catch (SQLException e) {
- logger.error("Error query artifact for " + Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_NAME + " = " + resourceName +
- Constants.ASDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + " = " + resourceVersion +
+ logger.error("Error query artifact for " + Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_NAME + " = " + resourceName +
+ Constants.SDC_ARTIFACTS_FIELDS.RESOURCE_VERSION + " = " + resourceVersion +
Constants.ARTIFACT_TYPE + " = " + artifactType, e);
throw new APPCException(e);
}
/**
* Reads the SDC reference from APP-C database
- * @param vnfType - vnf Type from ASDC reference
- * @param fileCategory - file category from ASDC reference
- * @return - ASDC_ARTIFACT record if data exists
+ * @param vnfType - vnf Type from SDC reference
+ * @param fileCategory - file category from SDC reference
+ * @return - SDC_ARTIFACT record if data exists
* @throws APPCException
*/
public SDCReference retrieveSDCReference(String vnfType, String fileCategory) throws APPCException {
CachedRowSet rowSet = dbLibService.getData(SELECT_QUERY_SDC_REFERENCE, arguments, SCHEMA);
if (rowSet.first()) {
reference = new SDCReference();
- reference.setVnfType(rowSet.getString(Constants.ASDC_REFERENCE_FIELDS.VNF_TYPE.toString()));
- reference.setVnfcType(rowSet.getString(Constants.ASDC_REFERENCE_FIELDS.VNFC_TYPE.toString()));
- reference.setFileCategory(rowSet.getString(Constants.ASDC_REFERENCE_FIELDS.FILE_CATEGORY.toString()));
- reference.setAction(rowSet.getString(Constants.ASDC_REFERENCE_FIELDS.ACTION.toString()));
+ reference.setVnfType(rowSet.getString(Constants.SDC_REFERENCE_FIELDS.VNF_TYPE.toString()));
+ reference.setVnfcType(rowSet.getString(Constants.SDC_REFERENCE_FIELDS.VNFC_TYPE.toString()));
+ reference.setFileCategory(rowSet.getString(Constants.SDC_REFERENCE_FIELDS.FILE_CATEGORY.toString()));
+ reference.setAction(rowSet.getString(Constants.SDC_REFERENCE_FIELDS.ACTION.toString()));
reference.setArtifactType(rowSet.getString(Constants.ARTIFACT_TYPE));
reference.setArtifactName(rowSet.getString(Constants.ARTIFACT_NAME));
}
} catch (SQLException e) {
- logger.error("Error querying ASDC_REFERENCE for " + Constants.ASDC_REFERENCE_FIELDS.VNF_TYPE + " = " + vnfType +
- Constants.ASDC_REFERENCE_FIELDS.FILE_CATEGORY + " = " + fileCategory , e);
+ logger.error("Error querying SDC_REFERENCE for " + Constants.SDC_REFERENCE_FIELDS.VNF_TYPE + " = " + vnfType +
+ Constants.SDC_REFERENCE_FIELDS.FILE_CATEGORY + " = " + fileCategory , e);
throw new APPCException(e);
}
return reference;
package org.openecomp.appc.sdc.artifacts.helper;
/**
- * Constants required in ASDC listener module
+ * Constants required in SDC listener module
*/
public class Constants {
- static final String ASDC_ARTIFACTS = "ASDC_ARTIFACTS";
- static final String ASDC_REFERENCE = "ASDC_REFERENCE";
+ static final String SDC_ARTIFACTS = "ASDC_ARTIFACTS";
+ static final String SDC_REFERENCE = "ASDC_REFERENCE";
static final String AND = " AND ";
static final String VF_LICENSE = "VF_LICENSE";
- public enum ASDC_ARTIFACTS_FIELDS {
+ public enum SDC_ARTIFACTS_FIELDS {
SERVICE_UUID,
DISTRIBUTION_ID,
SERVICE_NAME,
ARTIFACT_CONTENT
}
- public enum ASDC_REFERENCE_FIELDS{
- ASDC_REFERENCE_ID,
+ public enum SDC_REFERENCE_FIELDS{
+ SDC_REFERENCE_ID,
VNF_TYPE,
VNFC_TYPE,
FILE_CATEGORY,
if (null == eventSender){
return;
}
- String errorDescription = String.format("ASDC distribution of service '%s', version '%s' is failed with reason: '%s'",
+ String errorDescription = String.format("SDC distribution of service '%s', version '%s' is failed with reason: '%s'",
serviceName, serviceVersion, errorMessage);
EventMessage eventMessage = new EventMessage(
import org.openecomp.appc.adapter.message.EventSender;
import org.openecomp.appc.sdc.artifacts.ArtifactProcessor;
import org.openecomp.appc.sdc.artifacts.object.ArtifactType;
-import org.openecomp.appc.sdc.listener.AsdcListener;
import org.openecomp.sdc.api.IDistributionClient;
import org.openecomp.sdc.api.notification.IArtifactInfo;
import org.openecomp.sdc.api.notification.INotificationData;
@Override
public void processArtifact(SDCArtifact artifact) throws APPCException {
- String postData = Util.toAsdcStoreDocumentInput(notification, resource, super.artifact, artifact.getArtifactContent());
+ String postData = Util.toSdcStoreDocumentInput(notification, resource, super.artifact, artifact.getArtifactContent());
try {
ProviderResponse result = ProviderOperations.post(storeUri.toURL(), postData, null);
if (result.getStatus() == 200) {
if (StringUtils.isEmpty(vnfType) ||
StringUtils.isEmpty(version) ||
StringUtils.isEmpty(packageArtifactID)) {
- String errStr = String.format("Missing information in ASDC request. Details: resource_type='%s', resource_version='%s', artifactID='%s'", vnfType, version, packageArtifactID);
+ String errStr = String.format("Missing information in SDC request. Details: resource_type='%s', resource_version='%s', artifactID='%s'", vnfType, version, packageArtifactID);
logger.error(errStr);
throw new APPCException(errStr);
}
if (existingArtifact ==null) { // new resource
logger.debug("Artifact not found from database for vnfType = " + vnfType + " , version = " + version + " , artifactType = " + artifact.getArtifactType());
- artifactStorageService.storeASDCArtifact(artifact);
+ artifactStorageService.storeSDCArtifact(artifact);
} else { // duplicate
logger.debug("Artifact retrieved from database = " + existingArtifact);
logger.warn(String.format("Artifact of type '%s' already deployed for resource_type='%s' and resource_version='%s'", Constants.VF_LICENSE, vnfType, version));
reference.setVnfType(vnfType);
reference.setFileCategory("tosca_model");
reference.setArtifactName(artifact.getArtifactName());
- logger.debug("Storing TOSCA to ASDC Artifact");
- artifactStorageService.storeASDCArtifactWithReference(artifact,reference);
+ logger.debug("Storing TOSCA to SDC Artifact");
+ artifactStorageService.storeSDCArtifactWithReference(artifact,reference);
SDCArtifact dependencyArtifact = getDependencyArtifact(artifact);
SDCReference dependencyReference = new SDCReference();
dependencyReference.setVnfType(vnfType);
dependencyReference.setFileCategory("tosca_dependency_model");
dependencyReference.setArtifactName(dependencyArtifact.getArtifactName());
- logger.debug("Storing Dependency to ASDC Artifact");
- artifactStorageService.storeASDCArtifactWithReference(dependencyArtifact,dependencyReference);
+ logger.debug("Storing Dependency to SDC Artifact");
+ artifactStorageService.storeSDCArtifactWithReference(dependencyArtifact,dependencyReference);
} catch (Exception e) {
logger.error("Error processing artifact : " + artifact.toString() );
throw new APPCException(e.getMessage(),e);
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-public class AsdcCallback implements INotificationCallback {
+public class SdcCallback implements INotificationCallback {
- private final EELFLogger logger = EELFManager.getInstance().getLogger(AsdcCallback.class);
+ private final EELFLogger logger = EELFManager.getInstance().getLogger(SdcCallback.class);
private URI storeUri;
private IDistributionClient client;
private AtomicBoolean isRunning = new AtomicBoolean(false);
- public AsdcCallback(URI storeUri, IDistributionClient client) {
+ public SdcCallback(URI storeUri, IDistributionClient client) {
this.storeUri = storeUri;
this.client = client;
BundleContext bctx = FrameworkUtil.getBundle(EventSender.class).getBundleContext();
ServiceReference sref = bctx.getServiceReference(EventSender.class);
eventSender = (EventSender) bctx.getService(sref);
- } catch (Exception e) {
- logger.error("AsdcCallback failed on initializing EventSender", e);
+ } catch (Throwable t) {
+ logger.error("SdcCallback failed on initializing EventSender", t);
}
}
if (isRunning.get()) {
for(IArtifactInfo artifact:data.getServiceArtifacts()){
- ArtifactProcessor artifactProcessor = ArtifactProcessorFactory.getArtifactProcessor(
- client, eventSender, data, null, artifact, storeUri);
+ ArtifactProcessor artifactProcessor = ArtifactProcessorFactory.getArtifactProcessor(client, eventSender, data, null, artifact, storeUri);
if(artifactProcessor!=null){
executor.submit(artifactProcessor);
}
for (IResourceInstance resource : data.getResources()) {
for (IArtifactInfo artifact : resource.getArtifacts()) {
- logger.info(Util.toAsdcStoreDocumentInput(data, resource, artifact, "abc"));
+ logger.info(Util.toSdcStoreDocumentInput(data, resource, artifact, "abc"));
if (executor.getQueue().size() >= threadCount) {
// log warning about job backlog
}
}
}
} else {
- // TODO - return a failed result so asdc knows we are shut down
+ // TODO - return a failed result so sdc knows we are shut down
}
}
public void stop(int waitSec) {
isRunning.set(false);
- logger.info(String.format("Stopping the ASDC listener and waiting up to %ds for %d pending jobs", waitSec,
+ logger.info(String.format("Stopping the SDC listener and waiting up to %ds for %d pending jobs", waitSec,
executor.getQueue().size()));
boolean cleanShutdown = false;
executor.shutdown();
import java.util.Map;
import java.util.Properties;
-public class AsdcConfig implements IConfiguration {
+public class SdcConfig implements IConfiguration {
private String host;
private String consumer;
private Properties props;
- private final EELFLogger logger = EELFManager.getInstance().getLogger(AsdcConfig.class);
+ private final EELFLogger logger = EELFManager.getInstance().getLogger(SdcConfig.class);
- AsdcConfig(Properties props) throws Exception {
+ SdcConfig(Properties props) throws Exception {
this.props = props;
init();
}
}
// Keystore for ca cert
- keystorePath = props.getProperty("appc.asdc.keystore.path");
- keystorePass = props.getProperty("appc.asdc.keystore.pass");
+ keystorePath = props.getProperty("appc.sdc.keystore.path");
+ keystorePass = props.getProperty("appc.sdc.keystore.pass");
// ASDC host
- host = props.getProperty("appc.asdc.host");
- env = props.getProperty("appc.asdc.env");
- user = props.getProperty("appc.asdc.user");
- pass = props.getProperty("appc.asdc.pass");
+ host = props.getProperty("appc.sdc.host");
+ env = props.getProperty("appc.sdc.env");
+ user = props.getProperty("appc.sdc.user");
+ pass = props.getProperty("appc.sdc.pass");
// DMaaP properties
- consumer = props.getProperty("appc.asdc.consumer");
- consumerId = props.getProperty("appc.asdc.consumer.id");
+ consumer = props.getProperty("appc.sdc.consumer");
+ consumerId = props.getProperty("appc.sdc.consumer.id");
pollingInterval = Integer.valueOf(props.getProperty("interval", "60"));
types.add("VF_LICENSE");
types.add("TOSCA_CSAR");
- storeOp = new URI(props.getProperty("appc.asdc.provider.url"));
+ storeOp = new URI(props.getProperty("appc.sdc.provider.url"));
}
@Override
*/
private void logParams() {
Map<String, String> params = new HashMap<>();
- params.put("ASDC Host", getAsdcAddress());
- params.put("ASDC Environment", getEnvironmentName());
+ params.put("SDC Host", getAsdcAddress());
+ params.put("SDC Environment", getEnvironmentName());
params.put("Consumer Name", getConsumerGroup());
params.put("Consumer ID", getConsumerID());
params.put("Poll Active Wait", String.valueOf(getPollingInterval()));
params.put("Poll Timeout", String.valueOf(getPollingTimeout()));
- logger.info(String.format("ASDC Params: %s", params));
+ logger.info(String.format("SDC Params: %s", params));
}
}
* Register connection with SDC server based on properties file configuration when start,
* and disconnect with SDC server when stop.
*/
-public class AsdcListener {
- private final EELFLogger logger = EELFManager.getInstance().getLogger(AsdcListener.class);
+public class SdcListener {
+ private final EELFLogger logger = EELFManager.getInstance().getLogger(SdcListener.class);
/**
* The bundle context
*/
private IDistributionClient client;
- private AsdcCallback callback;
- private AsdcConfig config;
+ private SdcCallback callback;
+ private SdcConfig config;
private CountDownLatch latch;
private Thread startThread = null;
Configuration configuration = ConfigurationFactory.getConfiguration();
Properties props = configuration.getProperties();
- config = new AsdcConfig(props);
+ config = new SdcConfig(props);
logger.debug(String.format("[%d] created SDC config", timeStamp));
client = DistributionClientFactory.createDistributionClient();
logger.debug(String.format("[%d] created SDC client", timeStamp));
- callback = new AsdcCallback(config.getStoreOpURI(), client);
+ callback = new SdcCallback(config.getStoreOpURI(), client);
logger.debug(String.format("[%d] created SDC callback", timeStamp));
latch = new CountDownLatch(1);
public void stop() throws InterruptedException {
// Add timestamp to the log to differentiate the jmeter run testing calls.
final long timeStamp = System.currentTimeMillis();
- logger.info(String.format("[%d] Stopping ASDC Listener", timeStamp));
+ logger.info(String.format("[%d] Stopping SDC Listener", timeStamp));
stopStartThread(timeStamp);
if (latch != null) {
- logger.debug(String.format("[%d] waiting ASDC latch count to 0 for 10 seconds", timeStamp));
+ logger.debug(String.format("[%d] waiting SDC latch count to 0 for 10 seconds", timeStamp));
latch.await(10, TimeUnit.SECONDS);
latch = null;
}
if (callback != null) {
- logger.debug(String.format("[%d] stopping ASDC callback", timeStamp));
+ logger.debug(String.format("[%d] stopping SDC callback", timeStamp));
callback.stop();
callback = null;
}
if (client != null) {
- logger.debug(String.format("[%d] stopping ASDC client", timeStamp));
+ logger.debug(String.format("[%d] stopping SDC client", timeStamp));
client.stop();
client = null;
}
- logger.info(String.format("[%d] ASDC Listener stopped successfully", timeStamp));
+ logger.info(String.format("[%d] SDC Listener stopped successfully", timeStamp));
}
void stopStartThread(long timeStamp) throws InterruptedException {
}
if (startThread.getState() == Thread.State.TERMINATED) {
- logger.debug(String.format("[%d] ASDC thread(%s) is already terminated.",
+ logger.debug(String.format("[%d] SDC thread(%s) is already terminated.",
timeStamp, startThread.getName()));
} else {
- logger.debug(String.format("[%d] ASDC thread(%s) is to be interrupted with state(%s)",
+ logger.debug(String.format("[%d] SDC thread(%s) is to be interrupted with state(%s)",
timeStamp, startThread.getName(), startThread.getState().toString()));
startThread.interrupt();
- logger.debug(String.format("[%d] ASDC thread(%s) has been interrupted(%s) with state(%s)",
+ logger.debug(String.format("[%d] SDC thread(%s) has been interrupted(%s) with state(%s)",
timeStamp, startThread.getName(), startThread.isInterrupted(),
startThread.getState().toString()));
}
}
/**
- * Runnable implementation for actual initialization during ASDC listener start
+ * Runnable implementation for actual initialization during SDC listener start
*/
class StartRunnable implements Runnable {
private final long timeStamp;
}
/**
- * This run method calls ASDC client for init and start which are synchronized calls along with stop.
+ * This run method calls SDC client for init and start which are synchronized calls along with stop.
* To interrupt this thread at stop time, we added thread interrupted checking in each step
* for earlier interruption.
*/
@Override
public void run() {
if (!initialRegistration()) {
- logger.warn(String.format("[%d] ASDC thread initial registration failed.", timeStamp));
+ logger.warn(String.format("[%d] SDC thread initial registration failed.", timeStamp));
}
if (isThreadInterrupted("after initial registration")) {
if (result.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
client.start();
} else {
- logger.error(String.format("[%d] Could not register ASDC client. %s - %s",
+ logger.error(String.format("[%d] Could not register SDC client. %s - %s",
timeStamp, result.getDistributionActionResult(), result.getDistributionMessageResult()));
}
return result.getStatus() == 200;
} catch (Exception e) {
logger.error(
- "Error performing initial registration with ASDC server. User may not be able to connect",
+ "Error performing initial registration with SDC server. User may not be able to connect",
e);
return false;
}
private boolean isThreadInterrupted(String details) {
if (Thread.currentThread().isInterrupted()) {
- logger.info(String.format("[%d] ASDC thread interrupted %s.", timeStamp, details));
+ logger.info(String.format("[%d] SDC thread interrupted %s.", timeStamp, details));
return true;
}
return false;
public class Util {
// TODO - Use the yang builder instead
- public static String toAsdcStoreDocumentInput(INotificationData notification, IResourceInstance resource,
+ public static String toSdcStoreDocumentInput(INotificationData notification, IResourceInstance resource,
IArtifactInfo artifact, String data) {
JSONObject json = new JSONObject();
JSONObject requestInfo = new JSONObject();
requestInfo.put("request-id", notification.getServiceUUID());
- requestInfo.put("request-action", "StoreAsdcDocumentRequest");
- requestInfo.put("source", "ASDC");
+ requestInfo.put("request-action", "StoreSdcDocumentRequest");
+ requestInfo.put("source", "SDC");
JSONObject docParams = new JSONObject();
docParams.put("service-uuid", notification.getServiceUUID());
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
- <bean id="AsdcListener" class="org.openecomp.appc.sdc.listener.AsdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
+ <bean id="SdcListener" class="org.openecomp.appc.sdc.listener.SdcListener" init-method="start" destroy-method="stop" scope="singleton" activation="eager">
</bean>
<!--
- <bean id="AsdcListenerBean" class="org.openecomp.appc.sdc.listener.impl.AsdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
- <service id="AsdcListener" interface="org.openecomp.appc.sdc.listener.AsdcListener" ref="AsdcListenerBean"/>
+ <bean id="SdcListenerBean" class="org.openecomp.appc.sdc.listener.impl.SdcListenerBean" init-method="start" destroy-method="stop" activation="eager" scope="singleton" />
+ <service SdcListenerener" interfaorg.openecomp.appc.sdc.listener.SdcListenerner" ref="SdcListenerBean"/>
-->
</blueprint>
org.openecomp.appc.bootstrap.file=appc.properties
org.openecomp.appc.bootstrap.path=/opt/openecomp/appc/data/properties,${user.home},.
-# These ASDC properties were provided by the ASDC Op-So team
-appc.asdc.keystore.path=etc/asdc-client.jks
-appc.asdc.keystore.pass=Aa123456
+# These SDC properties were provided by the SDC Op-So team
+appc.sdc.keystore.path=etc/sdc-client.jks
+appc.sdc.keystore.pass=Aa123456
-appc.asdc.host=192.168.1.2:8443
-appc.asdc.env=TEST
-appc.asdc.user=appc
-appc.asdc.pass=appc
+appc.sdc.host=192.168.1.2:8443
+appc.sdc.env=TEST
+appc.sdc.user=appc
+appc.sdc.pass=appc
-appc.asdc.consumer=TEST
-appc.asdc.consumer.id=TEST
-appc.asdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request
+appc.sdc.consumer=TEST
+appc.sdc.consumer.id=TEST
+appc.sdc.provider.url=http://localhost:8181/restconf/operations/SdcMessage:configuration-document-request
package org.openecomp.appc.sdc.listener;
import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mockito;
ArtifactStorageService.class,
ToscaCsarArtifactProcessor.class,
ArtifactProcessorFactory.class})
-public class AsdcCallbackTest {
+public class SdcCallbackTest {
- private IDistributionClient client;
+ IDistributionClient client;
private EventSender eventSender;
- private INotificationCallback asdcCallback;
+ private INotificationCallback sdcCallback;
private ArtifactStorageService storageService;
private ToscaCsarArtifactProcessor artifactProcessor;
+
@Before
public void setup() throws Exception {
client = PowerMockito.mock(IDistributionClient.class);
eventSender = PowerMockito.mock(EventSender.class);
- asdcCallback = new AsdcCallback(null,client);
+ sdcCallback = new SdcCallback(null,client);
- artifactProcessor = Mockito.spy(new ToscaCsarArtifactProcessor(
- client, eventSender, getNotificationData(), getResources().get(0),
- getServiceArtifacts().get(0),null));
+ artifactProcessor = Mockito.spy(new ToscaCsarArtifactProcessor(client,eventSender,getNotificationData(),getResources().get(0)
+ ,getServiceArtifacts().get(0),null));
storageService = PowerMockito.mock(ArtifactStorageService.class);
Whitebox.setInternalState(artifactProcessor,"artifactStorageService", storageService);
- PowerMockito.doCallRealMethod().when(artifactProcessor)
- .processArtifact((IDistributionClientDownloadResult) Matchers.anyObject());
+ PowerMockito.doCallRealMethod().when(artifactProcessor).processArtifact((IDistributionClientDownloadResult) Matchers.anyObject());
PowerMockito.doCallRealMethod().when(artifactProcessor).run();
+
PowerMockito.mockStatic(ArtifactProcessorFactory.class);
- PowerMockito.when(ArtifactProcessorFactory.getArtifactProcessor((IDistributionClient)Matchers.anyObject(),
- (EventSender)Matchers.anyObject(),
+ PowerMockito.when(ArtifactProcessorFactory.getArtifactProcessor((IDistributionClient)Matchers.anyObject(), (EventSender)Matchers.anyObject(),
(INotificationData)Matchers.anyObject(), (IResourceInstance)Matchers.anyObject(),
(IArtifactInfo)Matchers.anyObject(), (URI)Matchers.anyObject())).thenReturn(artifactProcessor);
- Whitebox.setInternalState(asdcCallback,"eventSender", eventSender);
+ Whitebox.setInternalState(sdcCallback,"eventSender", eventSender);
PowerMockito.doReturn(readDownloadResult()).when(client).download((IArtifactInfo) Matchers.anyObject());
- PowerMockito.doReturn(null).when(client).sendDownloadStatus(
- (IDistributionStatusMessage) Matchers.anyObject());
+ PowerMockito.doReturn(null).when(client).sendDownloadStatus((IDistributionStatusMessage) Matchers.anyObject());
- PowerMockito.doReturn(null).when(storageService).retrieveSDCArtifact(Matchers.anyString(),
- Matchers.anyString(), Matchers.anyString());
+ PowerMockito.doReturn(null).when(storageService).retrieveSDCArtifact(Matchers.anyString(),Matchers.anyString(),Matchers.anyString());
PowerMockito.doAnswer(new Answer<Object>() {
@Override
- public Object answer(InvocationOnMock invocationOnMock) throws Exception {
+ public Object answer(InvocationOnMock invocationOnMock) throws Throwable {
System.out.print(invocationOnMock.getArguments()[0].toString());
return null;
}
- }).when(storageService).storeASDCArtifact((SDCArtifact)Matchers.anyObject());
+ }).when(storageService).storeSDCArtifact((SDCArtifact)Matchers.anyObject());
}
private IDistributionClientDownloadResult readDownloadResult() throws IOException, URISyntaxException {
- DistributionClientDownloadResultImpl downloadResult = new DistributionClientDownloadResultImpl(
- DistributionActionResultEnum.SUCCESS,"Download success");
+ DistributionClientDownloadResultImpl downloadResult = new DistributionClientDownloadResultImpl(DistributionActionResultEnum.SUCCESS,"Download success");
File file = new File(this.getClass().getResource("/csar/service-ServiceAppc-csar.csar").toURI());
byte[] bFile = new byte[(int) file.length()];
return downloadResult;
}
- @Ignore
- @Test
- public void testASDCListener()
- throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException {
+
+// @Test
+ public void testSDCListener() throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException {
+
+
INotificationData notificationData = getNotificationData();
- asdcCallback.activateCallback(notificationData);
+ sdcCallback.activateCallback(notificationData);
+
// pause();
}
// }
// }
- private INotificationData getNotificationData()
- throws ClassNotFoundException, IllegalAccessException, InstantiationException, InvocationTargetException {
+ private INotificationData getNotificationData() throws ClassNotFoundException, IllegalAccessException, InstantiationException, InvocationTargetException {
- INotificationData notificationData = (INotificationData)getObject(
- "org.openecomp.sdc.impl.NotificationDataImpl");
+ INotificationData notificationData = (INotificationData)getObject("org.openecomp.sdc.impl.NotificationDataImpl");
List<IArtifactInfo> serviceArtifacts = getServiceArtifacts();
return notificationData;
}
- private List<IResourceInstance> getResources()
- throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
+ private List<IResourceInstance> getResources() throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
List<IResourceInstance> resources = new ArrayList<>();
- IResourceInstance resource = (IResourceInstance)getObject(
- "org.openecomp.sdc.impl.JsonContainerResourceInstance");
+ IResourceInstance resource = (IResourceInstance)getObject("org.openecomp.sdc.impl.JsonContainerResourceInstance");
List<IArtifactInfo> serviceArtifacts = getServiceArtifacts();
invokeMethod(resource,"setArtifacts",serviceArtifacts);
return resources;
}
- private void invokeMethod(Object object, String methodName,Object... arguments)
- throws IllegalAccessException, InvocationTargetException {
+ private void invokeMethod(Object object, String methodName,Object... arguments) throws IllegalAccessException, InvocationTargetException {
Method[] methods = object.getClass().getDeclaredMethods();
for(Method method:methods){
if(methodName.equalsIgnoreCase(method.getName())){
}
}
- private Object getObject(String fqcn)
- throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException {
+ private Object getObject(String fqcn) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException {
Constructor constructor = Class.forName(fqcn).getDeclaredConstructors()[0];
constructor.setAccessible(true);
return constructor.newInstance();
}
- private List<IArtifactInfo> getServiceArtifacts()
- throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
+ private List<IArtifactInfo> getServiceArtifacts() throws ClassNotFoundException, InvocationTargetException, InstantiationException, IllegalAccessException {
List<IArtifactInfo> serviceArtifacts = new ArrayList<>();
IArtifactInfo artifactInfo = (IArtifactInfo)getObject("org.openecomp.sdc.impl.ArtifactInfoImpl");
invokeMethod(artifactInfo,"setArtifactType","TOSCA_CSAR");
@RunWith(PowerMockRunner.class)
@PrepareForTest(Thread.class)
-public class AsdcListenerTest {
- private AsdcListener asdcListener;
+public class SdcListenerTest {
+ private SdcListener sdcListener;
private EELFLogger mockLogger = mock(EELFLogger.class);
@Before
public void setUp() throws Exception {
- asdcListener = new AsdcListener();
+ sdcListener = new SdcListener();
// to avoid operation on logger fail, mock up the logger
- Whitebox.setInternalState(asdcListener, "logger", mockLogger);
+ Whitebox.setInternalState(sdcListener, "logger", mockLogger);
}
@Test
public void testStart() throws Exception {
- asdcListener.start();
+ sdcListener.start();
Assert.assertTrue("Should created startThread",
- Whitebox.getInternalState(asdcListener, "startThread") != null);
+ Whitebox.getInternalState(sdcListener, "startThread") != null);
}
@Test
// test interrupt thread and other null case
MockThread mockThread = spy(new MockThread());
mockThread.setNewState(Thread.State.TIMED_WAITING);
- Whitebox.setInternalState(asdcListener, "startThread", mockThread);
+ Whitebox.setInternalState(sdcListener, "startThread", mockThread);
- asdcListener.stop();
+ sdcListener.stop();
Mockito.verify(mockThread, times(1)).interrupt();
Assert.assertTrue("Should reset startThread",
- Whitebox.getInternalState(asdcListener, "startThread") == null);
+ Whitebox.getInternalState(sdcListener, "startThread") == null);
// test other non-null case and thread null case
IDistributionClient mockClient = mock(IDistributionClient.class);
- Whitebox.setInternalState(asdcListener, "client", mockClient);
- AsdcCallback mockCallback = mock(AsdcCallback.class);
- Whitebox.setInternalState(asdcListener, "callback", mockCallback);
+ Whitebox.setInternalState(sdcListener, "client", mockClient);
+ SdcCallback mockCallback = mock(SdcCallback.class);
+ Whitebox.setInternalState(sdcListener, "callback", mockCallback);
CountDownLatch mockLatch = mock(CountDownLatch.class);
- Whitebox.setInternalState(asdcListener, "latch", mockLatch);
+ Whitebox.setInternalState(sdcListener, "latch", mockLatch);
- asdcListener.stop();
+ sdcListener.stop();
Mockito.verify(mockLatch, times(1)).await(10, TimeUnit.SECONDS);
Mockito.verify(mockCallback, times(1)).stop();
Mockito.verify(mockClient, times(1)).stop();
Assert.assertTrue("Should reset latch",
- Whitebox.getInternalState(asdcListener, "latch") == null);
+ Whitebox.getInternalState(sdcListener, "latch") == null);
Assert.assertTrue("Should reset callback",
- Whitebox.getInternalState(asdcListener, "callback") == null);
+ Whitebox.getInternalState(sdcListener, "callback") == null);
Assert.assertTrue("Should reset client",
- Whitebox.getInternalState(asdcListener, "client") == null);
+ Whitebox.getInternalState(sdcListener, "client") == null);
}
@Test
public void testStopStartThread() throws Exception {
// null case
- asdcListener.stopStartThread(123);
+ sdcListener.stopStartThread(123);
Mockito.verify(mockLogger, times(0)).debug(String.valueOf(any()));
MockThread mockThread = spy(new MockThread());
// thread terminated case
- Whitebox.setInternalState(asdcListener, "startThread", mockThread);
+ Whitebox.setInternalState(sdcListener, "startThread", mockThread);
mockThread.setNewState(Thread.State.TERMINATED);
- asdcListener.stopStartThread(123);
+ sdcListener.stopStartThread(123);
Mockito.verify(mockThread, times(0)).interrupt();
Mockito.verify(mockLogger, times(1)).debug(String.valueOf(any()));
Assert.assertTrue("Should reset startThread",
- Whitebox.getInternalState(asdcListener, "startThread") == null);
+ Whitebox.getInternalState(sdcListener, "startThread") == null);
// thread not termianted case
int timesCallThread = 0;
if (state == Thread.State.TERMINATED) {
continue;
}
- Whitebox.setInternalState(asdcListener, "startThread", mockThread);
+ Whitebox.setInternalState(sdcListener, "startThread", mockThread);
mockThread.setNewState(state);
- asdcListener.stopStartThread(123);
+ sdcListener.stopStartThread(123);
Mockito.verify(mockThread, times(++ timesCallThread)).interrupt();
Mockito.verify(mockLogger, times(timesCallLogger += 2)).debug(String.valueOf(any()));
Assert.assertTrue("Should reset startThread",
- Whitebox.getInternalState(asdcListener, "startThread") == null);
+ Whitebox.getInternalState(sdcListener, "startThread") == null);
}
}
@Test
public void testRunning() throws Exception {
/*
- AppcAsdcListenerActivator a = new AppcAsdcListenerActivator();
+ AppcSdcListenerActivator a = new AppcSdcListenerActivator();
a.start(null);
Thread.sleep(10000);
a.stop(null);
###
# These ASDC properties were provided by the ASDC Op-So team
-appc.asdc.keystore.path=etc/asdc-client.jks
-appc.asdc.keystore.pass=Aa123456
+appc.sdc.keystore.path=etc/sdc-client.jks
+appc.sdc.keystore.pass=Aa123456
-appc.asdc.host=192.168.1.2:8443
-appc.asdc.env=TEST
-appc.asdc.user=appc
-appc.asdc.pass=appc
+appc.sdc.host=192.168.1.2:8443
+appc.sdc.env=TEST
+appc.sdc.user=appc
+appc.sdc.pass=appc
-appc.asdc.consumer=TEST
-appc.asdc.consumer.id=TEST
-appc.asdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:configuration-document-request
+appc.sdc.consumer=TEST
+appc.sdc.consumer.id=TEST
+appc.sdc.provider.url=http://localhost:8181/restconf/operations/SdcMessage:configuration-document-request
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>appc-asdc-listener</artifactId>
+ <artifactId>appc-sdc-listener</artifactId>
<groupId>org.openecomp.appc</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>appc-asdc-listener-features</artifactId>
+ <artifactId>appc-sdc-listener-features</artifactId>
<name>Event Listener - Features</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.openecomp.appc</groupId>
- <artifactId>appc-asdc-listener-bundle</artifactId>
+ <artifactId>appc-sdc-listener-bundle</artifactId>
<version>${project.version}</version>
</dependency>
-->
-<features name="appc-asdc-listener-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="appc-sdc-listener-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
<!-- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository> -->
<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
- <feature name='appc-asdc-listener' description="asdc listener" version='${project.version}'>
+ <feature name='appc-sdc-listener' description="sdc listener" version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
<bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.openecomp.appc/appc-asdc-listener-bundle/${project.version}</bundle>
+ <bundle>mvn:org.openecomp.appc/appc-sdc-listener-bundle/${project.version}</bundle>
</feature>
</features>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>appc-asdc-listener</artifactId>
+ <artifactId>appc-sdc-listener</artifactId>
<groupId>org.openecomp.appc</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>appc-asdc-listener-installer</artifactId>
- <name>ASDC Listener - Karaf Installer</name>
+ <artifactId>appc-sdc-listener-installer</artifactId>
+ <name>SDC Listener - Karaf Installer</name>
<packaging>pom</packaging>
<properties>
- <application.name>appc-asdc-listener</application.name>
- <features.boot>appc-asdc-listener</features.boot>
- <features.repositories>mvn:org.openecomp.appc/appc-asdc-listener-features/${project.version}/xml/features</features.repositories>
+ <application.name>appc-sdc-listener</application.name>
+ <features.boot>appc-sdc-listener</features.boot>
+ <features.repositories>mvn:org.openecomp.appc/appc-sdc-listener-features/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<dependency>
<groupId>org.openecomp.appc</groupId>
- <artifactId>appc-asdc-listener-features</artifactId>
+ <artifactId>appc-sdc-listener-features</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
<dependency>
<groupId>org.openecomp.appc</groupId>
- <artifactId>appc-asdc-listener-bundle</artifactId>
+ <artifactId>appc-sdc-listener-bundle</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>appc-asdc-listener</artifactId>
+ <artifactId>appc-sdc-listener</artifactId>
<groupId>org.openecomp.appc</groupId>
<version>1.1.0-SNAPSHOT</version>
</parent>
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>appc-asdc-listener</artifactId>
- <name>ASDC Event Listener</name>
+ <artifactId>appc-sdc-listener</artifactId>
+ <name>SDC Event Listener</name>
<description>Listener to read and write events from DMaaP (Cambria) or DMaaP.</description>
<packaging>pom</packaging>
<modules>
<module>appc-yang-generator</module>
- <module>appc-asdc-listener-bundle</module>
- <module>appc-asdc-listener-features</module>
- <module>appc-asdc-listener-installer</module>
+ <module>appc-sdc-listener-bundle</module>
+ <module>appc-sdc-listener-features</module>
+ <module>appc-sdc-listener-installer</module>
</modules>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============LICENSE_START=======================================================
+ONAP : APPC
+================================================================================
+Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+================================================================================
+Copyright (C) 2017 Amdocs
+=============================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END=========================================================
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<module>appc-adapters</module>
<module>appc-provider</module>
<module>appc-event-listener</module>
- <module>appc-asdc-listener</module>
+ <module>appc-sdc-listener</module>
<module>appc-lifecycle-management</module>
<module>appc-oam</module>
<module>appc-config</module>