Changes for bypassing normal flow when client passes an already resolved name. Plus, unit test updates, and code formatting updates to follow standards.
Change-Id: I7e432531b6f344f6aeb358e2b28b8a6fd74c5070
Issue-ID: CCSDK-608
Signed-off-by: BT2983 <BT2983@att.com>
import org.onap.ccsdk.apps.ms.neng.core.persistence.NamePersister;
import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyFinder;
import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyParameters;
-import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyPropertyMethodUtils;
import org.onap.ccsdk.apps.ms.neng.core.policy.PolicySequence;
import org.onap.ccsdk.apps.ms.neng.core.policy.PropertyOperator;
import org.onap.ccsdk.apps.ms.neng.core.policy.RecipeParser;
private final List<Map<String, String>> allElements;
private final Map<String, Map<String, String>> earlierNames;
private final Map<String, Map<String, ?>> policyCache;
+ private final List<String> earlierNamingTypes;
/**
* Constructor.
* to names (which is a map with keys "resource-name", "resource-value" and "external-key")
* @param policyCache cache containing policies retrieved in this transaction, to avoid repeated
* calls to policy manager within the same transaction
+ * @param earlierNamingTypes naming-types used earlier in the same transaction
*/
public NameGenerator(PolicyFinder policyFinder, PolicyParameters policyParams, SequenceGenerator seqGenerator,
DbNameValidator dbValidator, AaiNameValidator aaiValidator, NamePersister namePersister,
Map<String, String> requestElement, List<Map<String, String>> allElements,
- Map<String, Map<String, String>> earlierNames, Map<String, Map<String, ?>> policyCache) {
+ Map<String, Map<String, String>> earlierNames, Map<String, Map<String, ?>> policyCache,
+ List<String> earlierNamingTypes) {
this.policyFinder = policyFinder;
this.policyParams = policyParams;
this.seqGenerator = seqGenerator;
this.allElements = allElements;
this.earlierNames = earlierNames;
this.policyCache = policyCache;
+ this.earlierNamingTypes = earlierNamingTypes;
}
/**
throw new NengException("Could not find policy name in the request");
}
String namingType = findElementNamingType();
+ String relaxedNamingType = relaxedNamingType(namingType);
+ Map<String,String> generated = null;
if (namingType != null) {
- Map<String, String> generated = this.earlierNames.get(namingType);
+ if (!earlierNamingTypes.contains(namingType)) {
+ generated = this.earlierNames.get(namingType);
+ if (generated == null) {
+ generated = this.earlierNames.get(relaxedNamingType);
+ }
+ }
if (generated != null) {
return generated;
}
+ earlierNamingTypes.add(namingType);
return generateNew(policyName, namingType);
+
} else {
throw new NengException("Could not find naming type in the request for policy " + policyName);
}
}
+ /**
+ * Updates a generated name.
+ *
+ * @return the map (with keys "resource-name", "resource-value" and "external-key") containing the name.
+ */
+ public Map<String, String> updateGenerateName() throws Exception {
+ String externalKey = findElementExternalKey();
+ String resourceValue = value(this.requestElement, RESOURCE_VALUE_ELEMENT_ITEM);
+ String reqNamingType = findElementNamingType();
+ String reqResourceName = findElementResourceName();
+ String namingType = (reqNamingType == null) ? reqResourceName : reqNamingType;
+ String relaxedNamingType = relaxedNamingType(namingType);
+
+ if (!aaiValidator.validate(namingType, resourceValue)) {
+ throw new NengException("Name already exists in AAI");
+ }
+ GeneratedName generatedName = null;
+ if (relaxedNamingType != null) {
+ generatedName = namePersister.findByExternalIdAndElementType(externalKey, relaxedNamingType);
+ } else {
+ throw new NengException("Resource Name or naming type must be provided");
+ }
+ if (generatedName == null) {
+ generatedName = new GeneratedName();
+ }
+ generatedName.setName(resourceValue);
+ generatedName.setExternalId(externalKey);
+ generatedName.setElementType(namingType);
+ generatedName.setSequenceNumber(null);
+ generatedName.setSequenceNumberEnc(null);
+ generatedName.setPrefix(null);
+ generatedName.setSuffix(null);
+ generatedName.setIsReleased(null);
+ namePersister.persist(generatedName);
+ Map<String, String> respMap = buildResponse(externalKey, reqResourceName, resourceValue);
+ respMap.put(externalKey, "Resource value updated successfully");
+
+ return respMap;
+ }
+
String applyNameOperation(Map<String, ?> namingModel, String name) throws Exception {
String nameOperation = namingOperation(namingModel);
if (nameOperation != null && !"".equals(nameOperation)) {
return name;
}
- String applyPropertyOperation(String value, Map<String, ?> propertyMap) throws Exception {
- return new PropertyOperator().apply(value, propertyMap, this.policyParams);
+ String applyPropertyOperation(String value, Map<String, ?> propertyMap, String recipeItem) throws Exception {
+ return new PropertyOperator().apply(value, propertyMap, this.policyParams, recipeItem);
}
static Map<String, String> buildResponse(String key, String name, String value) {
for (String recipeItem : recipe) {
Map<String, ?> propMap = namingProperty(namingModel, recipeItem);
if ("SEQUENCE".equals(recipeItem)) {
- PolicySequence seq = seq(propMap);
- recipeValues.put(recipeItem, seq);
- } else if ("UUID".equals(recipeItem)) {
- String uuid = PolicyPropertyMethodUtils.genUuid();
- recipeValues.put(recipeItem, uuid);
- } else if ("TIMESTAMP".equals(recipeItem)) {
- String ts = PolicyPropertyMethodUtils.getIsoDateString();
- recipeValues.put(recipeItem, ts);
+ String propValue = value(this.requestElement,recipeItem);
+ if (propValue != null) {
+ recipeValues.put(recipeItem, propValue);
+ } else {
+ PolicySequence seq = seq(propMap);
+ recipeValues.put(recipeItem, seq);
+ }
} else {
String val = generateNonSequenceValue(namingModels, policyName, namingType, namingModel, propMap,
recipeItem);
val = generateValueRecursively(namingModels, policyName, recipeItem);
}
if (val != null) {
- val = applyPropertyOperation(val, propMap);
+ val = applyPropertyOperation(val, propMap, null);
+ }
+ if (val == null) {
+ val = applyPropertyOperation(val, propMap, recipeItem);
+ }
+ if (val == null) {
+ val = value(namingModel, recipeItem);
}
return val;
}
}
if (relaxedElement != null) {
NameGenerator recursive = new NameGenerator(policyFinder, policyParams, seqGenerator, dbValidator,
- aaiValidator, namePersister, relaxedElement, allElements, earlierNames, policyCache);
+ aaiValidator, namePersister, relaxedElement, allElements, earlierNames, policyCache,
+ earlierNamingTypes);
Map<String, String> gen =
recursive.generateNew(policyName, relaxedNamingType, namingModels, relaxedModel);
if (gen != null) {
seqEncoded = seqData.getSeqEncoded();
}
GeneratedName record = new GeneratedName();
- GeneratedName releasedName = namePersister.findBy(namingType, name, "Y");
+ GeneratedName releasedName = namePersister.findByElementTypeAndNameAndReleased(namingType, name, "Y");
if (releasedName != null) {
record = releasedName;
record.setLastUpdatedTime(new Timestamp(System.currentTimeMillis()));
* @param name A name
* @param isReleased An Y/N flag indicating if the name is released or not
*/
- public GeneratedName findBy(String elementType, String name, String isReleased) {
+ public GeneratedName findByElementTypeAndNameAndReleased(String elementType, String name, String isReleased) {
return repository.findByElementTypeAndNameAndIsReleased(elementType, name, isReleased);
}
+
+ /**
+ * Finds a name stored in the DB of the given external ID and type.
+ *
+ * @param externalId The external ID
+ * @param elementType The type of the name
+ */
+ public GeneratedName findByExternalIdAndElementType(String externalId, String elementType) {
+ return repository.findByExternalIdAndRelaxedElementType(externalId, elementType);
+ }
}
*/
public static String genUuid() {
UUID uuid = UUID.randomUUID();
- return uuid.toString();
+ String str = uuid.toString();
+ str = str.replaceAll("-", "");
+ return str;
}
/**
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
/**
* Converts policy data to the structure expected by this micro-service.
* Finds the property-value from the given property map.
*/
public static String propertyValue(Map<String, ?> properties) {
- return value(properties, "property-value");
+ String value = value(properties, "property-value");
+ if (value != null && !Pattern.matches("\\$\\{.*\\}.*", value)) {
+ return value;
+ }
+ return null;
}
/**
* @param type the naming-type
*/
public static String relaxedNamingType(String type) {
+ if (type == null) {
+ return type;
+ }
type = type.toUpperCase();
if (type.endsWith("NAME")) {
type = type.substring(0, type.length() - 4);
if (!(value instanceof String)) {
value = null;
}
+ if (value != null && !Pattern.matches("\\$\\{.*\\}.*", value)) {
+ return value;
+ } else {
+ value = null;
+ }
}
return value;
}
if (!(value instanceof String)) {
value = null;
}
+ if (value != null && !Pattern.matches("\\$\\{.*\\}.*", value)) {
+ return value;
+ } else {
+ value = null;
+ }
}
return value;
} else {
* @param propertyMap a map representing the property, the key of which is "property-operation"
* and the value is the actual property
* @param policyParams parameters configuring policy
+ * @param recipeItem a special recipe item (such as TIMESTAMP, UUID)
* @return the result of applying the property
* @throws Exception all exceptions are propagated
*/
- public String apply(String value, Map<String, ?> propertyMap, PolicyParameters policyParams) throws Exception {
+ public String apply(String value, Map<String, ?> propertyMap, PolicyParameters policyParams,
+ String recipeItem) throws Exception {
String op = propertyOperation(propertyMap);
String mapped = null;
if (op != null) {
}
}
value = applyJavaOperation(value, op, mapped);
+ } else if (recipeItem != null) {
+ value = applyOperationByRecipeName(recipeItem, policyParams);
}
return value;
}
argPart = op.substring(funcStartIndex + 1, funcEndIndex);
}
- argPart = inputString + "," + argPart;
- String[] args = argPart.split(",");
+ String[] args = new String[0];
+ if (inputString != null) {
+ argPart = inputString + "," + argPart;
+ args = argPart.split(",");
+ }
PolicyPropertyMethodUtils utils = new PolicyPropertyMethodUtils();
for (Method m : PolicyPropertyMethodUtils.class.getDeclaredMethods()) {
}
return postOp;
}
+
+ private String applyOperationByRecipeName(String recipeItem, PolicyParameters policyParams) throws Exception {
+ String mapped = policyParams.mapFunction(recipeItem);
+ if (mapped == null) {
+ mapped = camelConverted(recipeItem);
+ }
+ String value = applyJavaOperation(null, recipeItem, mapped);
+ return value;
+ }
static String operationFunction(String operation) throws Exception {
operation = operation.trim();
}
return buf.toString();
}
+
+
}
package org.onap.ccsdk.apps.ms.neng.core.service;
+import java.util.List;
+import java.util.Map;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.HelloWorld;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenRequest;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenResponse;
*/
public interface SpringService {
/**
- * Name generation API.
+ * API to add a naming policy to the database cache in this micro-service.
+ *
+ * <p/>This is not used by clients -- it is here to help with diagnostics.
*/
- public NameGenResponse genNetworkElementName(NameGenRequest request) throws Exception;
+ public void addPolicy(Object request) throws Exception;
/**
- * Name removal API.
+ * Name generation API.
*/
- public NameGenResponse releaseNetworkElementName(NameGenRequest request) throws Exception;
+ public NameGenResponse genNetworkElementName(NameGenRequest request) throws Exception;
/**
- * API to return naming policy cached in this micro-service.
- *
- * <p/>This is not used by clients -- it is here to help with diagnostics.
+ * Name generation or update API.
*/
- public PolicyDetails getPolicyDetails(String policyName);
+ public NameGenResponse generateOrUpdateName(NameGenRequest request) throws Exception;
/**
- * API to add a naming policy to the database cache in this micro-service.
+ * Heart-beat/ping API.
*
* <p/>This is not used by clients -- it is here to help with diagnostics.
*/
- public void addPolicy(Object request) throws Exception;
+ public HelloWorld getQuickHello(String name);
/**
- * Heart-beat/ping API.
+ * API to return naming policy cached in this micro-service.
*
* <p/>This is not used by clients -- it is here to help with diagnostics.
*/
- public HelloWorld getQuickHello(String name);
+ public PolicyDetails getPolicyDetails(String policyName);
+
+ /**
+ * Name removal API.
+ */
+ public NameGenResponse releaseNetworkElementName(NameGenRequest request) throws Exception;
+
+ /**
+ * Name update API.
+ */
+ public List<Map<String, String>> updateNetworkElementName(NameGenRequest request) throws Exception;
}
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.logging.Logger;
-import java.util.stream.Collectors;
+import java.util.regex.Pattern;
import javax.transaction.Transactional;
import org.onap.ccsdk.apps.ms.neng.core.exceptions.NengException;
import org.onap.ccsdk.apps.ms.neng.core.gen.NameGenerator;
import org.onap.ccsdk.apps.ms.neng.core.persistence.NamePersister;
import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyFinder;
import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyParameters;
+import org.onap.ccsdk.apps.ms.neng.core.policy.PolicyReader;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.HelloWorld;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenRequest;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenResponse;
@Autowired GeneratedNameRespository generatedNameRepository;
/**
- * Heart-beat/ping API.
+ * API to add a naming policy to the database cache in this micro-service.
*/
@Override
- public HelloWorld getQuickHello(String name) {
- if (name == null || name.isEmpty()) {
- name = "world";
+ public void addPolicy(Object request) throws Exception {
+ @SuppressWarnings("unchecked")
+ Map<String, Object> policyData = (Map<String, Object>)request;
+ PolicyDetails pd = new PolicyDetails();
+ String name = (String) policyData.get("policyName");
+ pd.setPolicyName(name);
+ ObjectMapper objectmapper = new ObjectMapper();
+ log.info(objectmapper.writeValueAsString(policyData.get("policyValue")));
+ pd.setPolicyResponse((String)policyData.get("policyValue"));
+ policyDetailsRepository.save(pd);
+ }
+
+ /**
+ * Name generation API -- generates or updates the name.
+ */
+ @Transactional(rollbackOn = Exception.class)
+ public NameGenResponse generateOrUpdateName(NameGenRequest request) throws Exception {
+ if (isUpdateRequest(request)) {
+ NameGenResponse resp = new NameGenResponse();
+ resp.setElements(updateNetworkElementName(request));
+ return resp;
+ } else {
+ return genNetworkElementName(request);
}
- String message = "Hello " + name + "!";
- log.info(message);
- HelloWorld hello = new HelloWorld(message);
- log.info(hello.toString());
- return hello;
}
/**
List<Map<String, String>> allElements = new ArrayList<>();
Map<String, Map<String, ?>> policyCache = new HashMap<>();
List<Map<String, String>> generatedNames = new ArrayList<>();
+ List<String> earlierNamingTypes = new ArrayList<String>();
validateRequest(request);
- if (!request.getElements().isEmpty()) {
+ if (request.getElements() != null && !request.getElements().isEmpty()) {
allElements.addAll(request.getElements());
}
PolicyFinder policyFinderImpl = findPolicyFinderImpl(request);
log.info("Processing " + requestElement.toString());
NameGenerator nameGen = new NameGenerator(policyFinderImpl, policyParameters, sequenceGenerator,
dbNameValidator, aaiNameValidator, namePersister, requestElement, allElements,
- earlierNames, policyCache);
+ earlierNames, policyCache, earlierNamingTypes);
generatedNames.add(nameGen.generate());
}
NameGenResponse resp = new NameGenResponse();
}
}
+ /**
+ * API to return naming policy cached in this micro-service.
+ */
+ @Override
+ public PolicyDetails getPolicyDetails(String policyName) {
+ try {
+ return policyDetailsRepository.findPolicyResponseByName(policyName);
+ } catch (Exception e) {
+ return new PolicyDetails();
+ }
+ }
+
+ /**
+ * Heart-beat/ping API.
+ */
+ @Override
+ public HelloWorld getQuickHello(String name) {
+ if (name == null || name.isEmpty()) {
+ name = "world";
+ }
+ String message = "Hello " + name + "!";
+ log.info(message);
+ HelloWorld hello = new HelloWorld(message);
+ log.info(hello.toString());
+ return hello;
+ }
+
/**
* Name removal API.
*/
}
/**
- * API to return naming policy cached in this micro-service.
+ * Name update API.
*/
@Override
- public PolicyDetails getPolicyDetails(String policyName) {
- try {
- return policyDetailsRepository.findPolicyResponseByName(policyName);
- } catch (Exception e) {
- return new PolicyDetails();
+ @Transactional(rollbackOn = Exception.class)
+ public List<Map<String, String>> updateNetworkElementName(NameGenRequest request) throws Exception {
+ List<Map<String, String>> responseList = new ArrayList<>();
+ for (Map<String, String> reqElement :request.getElements()) {
+ NameGenerator nameGen = new NameGenerator(null, null,null, null, aaiNameValidator, namePersister,
+ reqElement, request.getElements(),null, null, null);
+ Map<String, String> resp = nameGen.updateGenerateName();
+ responseList.add(resp);
}
- }
-
- /**
- * API to add a naming policy to the database cache in this micro-service.
- */
- @Override
- public void addPolicy(Object request) throws Exception {
- @SuppressWarnings("unchecked")
- Map<String, Object> policyData = (Map<String, Object>)request;
- PolicyDetails pd = new PolicyDetails();
- String name = (String) policyData.get("policyName");
- pd.setPolicyName(name);
- ObjectMapper objectmapper = new ObjectMapper();
- log.info(objectmapper.writeValueAsString(policyData.get("policyValue")));
- pd.setPolicyResponse((String)policyData.get("policyValue"));
- policyDetailsRepository.save(pd);
+ return responseList;
}
void buildUnAssignResponse(List<GeneratedName> generatedNames, NameGenResponse response) {
}
void validateRequest(NameGenRequest request) throws Exception {
- List<Map<String, String>> elems = request.getElements();
- if (elems != null && !elems.isEmpty()) {
- boolean error = false;
- Set<String> externalKeySet = elems.stream().map(s -> s.get("external-key")).collect(Collectors.toSet());
- if (externalKeySet.size() != request.getElements().size()) {
- error = true;
- }
- for (String externalKey : externalKeySet) {
- if (externalKey == null || externalKeyValidator.isPresent(externalKey)) {
- error = true;
- }
- }
- if (error) {
- throw new NengException("External Key is required and must be unique");
- }
- }
}
private PolicyFinder findPolicyFinderImpl(NameGenRequest request) {
}
return this.policyFinder;
}
+
+ private boolean isUpdateRequest(NameGenRequest request) throws Exception {
+ for (Map<String, String> reqElement : request.getElements()) {
+ String resourceValue = PolicyReader.value(reqElement, "resource-value");
+ if (resourceValue != null && !Pattern.matches("\\$\\{.*\\}.*", resourceValue)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import java.util.Map;
import javax.validation.Valid;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
@POST
@Path("/v1/addPolicy")
@Produces({MediaType.APPLICATION_JSON})
- public Map<String, Object> addPolicyToDb(Object request) throws Exception;
+ public Response addPolicyToDb(Object request) throws Exception;
/**
* Heart-beat/ping API.
import java.util.logging.Logger;
import javax.validation.Valid;
import javax.ws.rs.core.Response;
+import org.onap.ccsdk.apps.ms.neng.core.exceptions.NengException;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.HelloWorld;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenRequest;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenResponse;
@Component
public class RestServiceImpl implements RestService {
private static Logger log = Logger.getLogger(RestServiceImpl.class.getName());
+ private static final String INTERNAL_ERROR_MSG = "Internal error occured while processing the request.";
@Autowired SpringService service;
@Override
public Response generateNetworkElementName(@RequestBody @Valid NameGenRequest request) {
log.info("Received request: " + request.toString());
+ Map<String, Object> response = new HashMap<>();
try {
- NameGenResponse resp = service.genNetworkElementName(request);
- return Response.ok().entity(resp).build();
+ NameGenResponse resp = service.generateOrUpdateName(request);
+ return buildResponse(resp);
+ } catch (NengException e) {
+ log.warning(e.getMessage());
+ response.put("error", buildErrorResponse("NELGEN-0003", e.getMessage()));
+ return buildErrorResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- return Response.status(500).entity("{ \"error\": \"" + e.getMessage() + "\" }").build();
+ response.put("error", buildErrorResponse("err-0500", INTERNAL_ERROR_MSG));
+ return buildErrorResponse(response);
}
}
@Override
public Response releaseNetworkElementName(NameGenRequest request) {
NameGenResponse resp;
+ Map<String, Object> response = new HashMap<>();
try {
resp = service.releaseNetworkElementName(request);
- return Response.ok().entity(resp).build();
+ return buildResponse(resp);
+ } catch (NengException e) {
+ log.warning(e.getMessage());
+ response.put("error", buildErrorResponse("NELGEN-0002", e.getMessage()));
+ return buildErrorResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- return Response.status(500).entity("{ \"error\": \"" + e.getMessage() + "\" }").build();
+ response.put("error", buildErrorResponse("err-0500", INTERNAL_ERROR_MSG));
+ return buildErrorResponse(response);
}
}
* API to add a naming policy to the database cache in this micro-service.
*/
@Override
- public Map<String, Object> addPolicyToDb(Object request) throws Exception {
- Map<String, Object> respMap = new HashMap<>();
+ public Response addPolicyToDb(Object request) throws Exception {
+ Map<String, Object> response = new HashMap<>();
try {
service.addPolicy(request);
- respMap.put("status", "Policy added successfully");
+ response.put("status", "Policy added successfully");
+ return buildResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- respMap.put("status", "Failed");
+ response.put("error", buildErrorResponse("err-0500", e.getMessage()));
+ return buildErrorResponse(response);
}
- return respMap;
+ }
+
+ Response buildResponse(Object response) {
+ return Response.ok().entity(response).build();
+ }
+
+ Response buildErrorResponse(Map<String, Object> response) {
+ return Response.status(500).entity(response).build();
+ }
+
+ Map<String,Object> buildErrorResponse(String errorCode, String message) {
+ Map<String,Object> error = new HashMap<>();
+ error.put("errorId", errorCode);
+ error.put("message", message);
+ return error;
}
}
*/
public List<GeneratedName> findByExternalId(String externalId);
+ /*
+ * Finds entities for a given external system ID and element type, ignoring any special characters in names.
+ */
+ @Query(value = "select * from Generated_Name g where g.external_Id=:externalId and "
+ + "REPLACE(REPLACE(REPLACE(element_type,'NAME',''),'-',''),'_','')=:elementType",
+ nativeQuery = true)
+ public GeneratedName findByExternalIdAndRelaxedElementType(@Param("externalId")String externalId,
+ @Param("elementType")String elementType);
+
/*
* Finds the maximum sequence number used for a given prefix and suffix.
*/
@Query("select g from GeneratedName g where g.elementType=:elementType "
+ "and g.name=:name and (g.isReleased is null or g.isReleased ='N')")
public GeneratedName findUnReleased(@Param("elementType") String elementType, @Param("name") String name);
+
+
}
import com.fasterxml.jackson.databind.ObjectMapper;
import java.net.URI;
import java.util.logging.Logger;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSession;
import org.apache.http.client.HttpClient;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.client.HttpClientBuilder;
<include file="db/changelog/scripts/rel_18_10/create_message_table.sql" />
<include file="db/changelog/scripts/rel_18_10/10_identifier_map_upd_dml.sql" />
+ <include file="db/changelog/scripts/rel_18_10/11_identifier_map_upd_dml.sql" />
</databaseChangeLog>
delete from IDENTIFIER_MAP where POLICY_FN_NAME='UUID';
-INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('UUID','genUUID', 'Initial');
+INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('UUID','genUuid', 'Initial');
delete from IDENTIFIER_MAP where POLICY_FN_NAME='TIMESTAMP';
-INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('TIMESTAMP','getISODateString', 'Initial');
+INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('TIMESTAMP','getIsoDateString', 'Initial');
--- /dev/null
+--liquibase formatted sql
+--changeset 11_identifier_map_update_sql_recipefunction:18_10.identifier_map_upd_dml.sql
+
+delete from IDENTIFIER_MAP where POLICY_FN_NAME='UUID';
+
+INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('UUID','genUuid', 'Initial');
+
+delete from IDENTIFIER_MAP where POLICY_FN_NAME='TIMESTAMP';
+
+INSERT INTO IDENTIFIER_MAP(POLICY_FN_NAME, JS_FN_NAME, CREATED_BY) VALUES ('TIMESTAMP','getIsoDateString', 'Initial');
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), anyInt())).thenReturn(1L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement1, allElements, earlierNames, policyCache);
+ namePresister, requestElement1, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp = gen.generate();
assertEquals("vnf-name", resp.get("resource-name"));
assertEquals("abcde001ve1", resp.get("resource-value"));
NameGenerator gen2 = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp2 = gen2.generate();
assertEquals("vm-name", resp2.get("resource-name"));
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), anyInt())).thenReturn(1L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement1, allElements, earlierNames, policyCache);
+ namePresister, requestElement1, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp = gen.generate();
assertEquals("vm-name", resp.get("resource-name"));
assertEquals("abcde001ve1mts001", resp.get("resource-value"));
NameGenerator gen2 = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp2 = gen2.generate();
assertEquals("vnf-name", resp2.get("resource-name"));
}).when(namePresister).persist(anyObject());
NameGenerator gen2 = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp2 = gen2.generate();
assertEquals("vm-name", resp2.get("resource-name"));
when(policyFinder.findPolicy(policyName)).thenReturn(null);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
allElements.add(requestElement);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
allElements.add(requestElement);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
allElements.add(requestElement);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), anyInt())).thenReturn(1L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(policyFinder.findPolicy(policyName)).thenReturn(policy);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(policyFinder.findPolicy(policyName)).thenReturn(policy);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(policyFinder.findPolicy(policyName)).thenReturn(policy);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(dbValidator.validate(anyObject(), anyObject())).thenReturn(true);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp = gen.generate();
assertEquals("vnf-name", resp.get("resource-name"));
}).when(namePresister).persist(anyObject());
NameGenerator gen2 = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp2 = gen2.generate();
assertEquals("vm-name", resp2.get("resource-name"));
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(3))).thenReturn(3L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(dbValidator.validate(anyObject(), anyObject())).thenReturn(false);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement2, allElements, earlierNames, policyCache);
+ namePresister, requestElement2, allElements, earlierNames, policyCache, new ArrayList<>());
try {
gen.generate();
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), eq(4))).thenReturn(4L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp = gen.generate();
assertEquals("vnf-name", resp.get("resource-name"));
when(sequenceGenerator.generate(anyObject(), anyObject(), anyObject(), anyObject(), anyInt())).thenReturn(1L);
NameGenerator gen = new NameGenerator(policyFinder, policyParams, sequenceGenerator, dbValidator, aaiValidator,
- namePresister, requestElement, allElements, earlierNames, policyCache);
+ namePresister, requestElement, allElements, earlierNames, policyCache, new ArrayList<>());
Map<String, String> resp = gen.generate();
assertEquals("vnf-name", resp.get("resource-name"));
Map<String, String> props = new HashMap<>();
props.put("property-operation", "to_lower_case()");
PropertyOperator op = new PropertyOperator();
- assertEquals("asdf", op.apply("ASDF", props, params));
+ assertEquals("asdf", op.apply("ASDF", props, params, null));
}
@Test
Map<String, String> props = new HashMap<>();
props.put("property-operation", "to_upper_case()");
PropertyOperator op = new PropertyOperator();
- assertEquals("ASDF", op.apply("asdf", props, params));
+ assertEquals("ASDF", op.apply("asdf", props, params, null));
}
@Test
Map<String, String> props = new HashMap<>();
props.put("property-operation", "sub_str(0,5)");
- assertEquals("01234", op.apply("0123456789", props, params));
+ assertEquals("01234", op.apply("0123456789", props, params, null));
props.put("property-operation", " sub_str(0,4)");
- assertEquals("0123", op.apply("0123456789", props, params));
+ assertEquals("0123", op.apply("0123456789", props, params, null));
props.put("property-operation", "sub_str(1,5)");
- assertEquals("1234", op.apply("0123456789", props, params));
+ assertEquals("1234", op.apply("0123456789", props, params, null));
props.put("property-operation", "sub_str(1)");
- assertEquals("0", op.apply("0", props, params));
+ assertEquals("0", op.apply("0", props, params, null));
props.put("property-operation", "sub_str(-2)");
- assertEquals("89", op.apply("0123456789", props, params));
+ assertEquals("89", op.apply("0123456789", props, params, null));
props.put("property-operation", "sub_str(-3)");
- assertEquals("789", op.apply("0123456789", props, params));
+ assertEquals("789", op.apply("0123456789", props, params, null));
+ }
+
+ @Test
+ public void testApply_non_mapped() throws Exception {
+ String operation = "to_upper_case";
+ PolicyParameters policyParams = mock(PolicyParameters.class);
+ when(policyParams.mapFunction("sub_str")).thenReturn("substring");
+ PropertyOperator op = new PropertyOperator();
+ String resp = op.apply("MyString", operation, policyParams);
+ assertEquals("MYSTRING", resp);
}
}
package org.onap.ccsdk.apps.ms.neng.core.resource.model;
import static org.junit.Assert.assertEquals;
+
import org.junit.Before;
import org.junit.Test;
public class AaiResponseTest {
- private AaiResponse aai;
+ private AaiResponse aai;
- @Before
- public void setup() {
- aai = new AaiResponse();
- }
-
- @Test
+ @Before
+ public void setup() {
+ aai = new AaiResponse();
+ }
+
+ @Test
public void isRecFound() {
- aai.setRecFound(true);
- assertEquals(true, aai.isRecFound());
+ aai.setRecFound(true);
+ assertEquals(true, aai.isRecFound());
}
-
}
+
package org.onap.ccsdk.apps.ms.neng.core.resource.model;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
}
@Test
- public void TestGetSetConfigName() {
+ public void testGetSetConfigName() {
getConfigRequest.setConfigName("configName");
Assert.assertEquals("configName", getConfigRequest.getConfigName());
}
@Test
- public void TestGetSetEcompName() {
+ public void testGetSetEcompName() {
getConfigRequest.setEcompName("ecompName");
Assert.assertEquals("ecompName", getConfigRequest.getEcompName());
}
@Test
- public void TestGetSetPolicyName() {
+ public void testGetSetPolicyName() {
getConfigRequest.setPolicyName("policy");
Assert.assertEquals("policy", getConfigRequest.getPolicyName());
}
@Test
- public void TestIsUniqueFunction() {
+ public void testIsUniqueFunction() {
getConfigRequest.setUnique(true);
Assert.assertTrue(getConfigRequest.isUnique());
}
}
@Test
- public void TestGetSetConfigName() {
+ public void testGetSetConfigName() {
String obj = new String();
getConfigResponse.setResponse(obj);
Assert.assertEquals(obj, getConfigResponse.getResponse());
package org.onap.ccsdk.apps.ms.neng.core.resource.model;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
public class HelloWorldTest {
private HelloWorld helloWorld;
@Test
- public void TestGetSetMessage() {
+ public void testGetSetMessage() {
helloWorld = new HelloWorld();
helloWorld.setMessage("new Message");
Assert.assertEquals("new Message", helloWorld.getMessage());
}
@Test
- public void TestToString() {
+ public void testToString() {
helloWorld = new HelloWorld("new Message");
Assert.assertEquals("message = new Message", helloWorld.toString());
}
package org.onap.ccsdk.apps.ms.neng.core.resource.model;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.util.Map;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
public class NameGenRequestTest {
private NameGenRequest nameGenRequest;
}
@Test
- public void TestGetSetElements() {
+ public void testGetSetElements() {
List<Map<String, String>> list = new ArrayList<Map<String, String>>();
Map<String, String> map = new HashMap<String, String>();
map.put("el1", "el2");
}
@Test
- public void TestToStringFunction() {
+ public void testToStringFunction() {
List<Map<String, String>> list = new ArrayList<Map<String, String>>();
Map<String, String> map = new HashMap<String, String>();
map.put("el1", "el2");
}
@Test
- public void TestGetSetUseDb() {
+ public void testGetSetUseDb() {
nameGenRequest.setUseDb(true);
Assert.assertTrue(nameGenRequest.getUseDb());
}
package org.onap.ccsdk.apps.ms.neng.core.resource.model;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
public class NameGenResponseTest {
private NameGenResponse nameGenResponse;
}
@Test
- public void TestGetSetElements() {
+ public void testGetSetElements() {
List<Map<String, String>> list = new ArrayList<Map<String, String>>();
Map<String, String> map = new HashMap<String, String>();
map.put("el1", "el2");
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.onap.ccsdk.apps.ms.neng.persistence.entity.GeneratedName;
import org.onap.ccsdk.apps.ms.neng.persistence.entity.PolicyDetails;
import org.onap.ccsdk.apps.ms.neng.persistence.repository.ExternalInterfaceRespository;
+import org.onap.ccsdk.apps.ms.neng.persistence.repository.GeneratedNameRespository;
import org.onap.ccsdk.apps.ms.neng.persistence.repository.PolicyDetailsRepository;
import org.onap.ccsdk.apps.ms.neng.persistence.repository.ServiceParameterRepository;
import org.onap.ccsdk.apps.ms.neng.service.extinf.impl.AaiServiceImpl;
RestServiceImpl restServiceImpl;
@Autowired
ExternalInterfaceRespository extIntRepo;
+ @Autowired
+ GeneratedNameRespository repository;
@Before
public void setup() {
name.setExternalId("EXT-11");
namePersister.persist(name);
- name = namePersister.findBy("VNF", "abcd6ytx", null);
+ name = namePersister.findByElementTypeAndNameAndReleased("VNF", "abcd6ytx", null);
assertNotNull(name);
}
assertNotNull(extIntDb);
assertEquals("nodes/generic-vnfs?vnf-name=",extIntDb.getUrlSuffix());
}
+
+ @Test
+ public void testUpdateNetworkElementName() throws Exception {
+ GeneratedName gn = new GeneratedName();
+ gn.setExternalId("VQA-UN81");
+ gn.setSequenceNumber(1L);
+ gn.setElementType("VNF");
+ gn.setName("DG001ESP");
+ gn.setPrefix("DG");
+ gn.setSuffix("ESP");
+ gn.setCreatedBy("test");
+ gn.setCreatedTime(new Timestamp(System.currentTimeMillis()));
+
+ namePersister.persist(gn);
+ Map<String, String> reqMap = new HashMap<String, String>();
+ reqMap.put("external-key","VQA-UN81");
+ reqMap.put("resource-name", "vnf-name");
+ reqMap.put("resource-value", "DG001ESP1");
+
+ when(aaiServiceImpl.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(true);
+
+ List<Map<String,String>> elList = new ArrayList<>();
+ elList.add(reqMap);
+ NameGenRequest request = new NameGenRequest();
+ request.setElements(elList);
+ restServiceImpl.generateNetworkElementName(request);
+
+ List<GeneratedName> newGn = repository.findByExternalId("VQA-UN81");
+ assertTrue(newGn != null);
+ assertTrue(newGn.size() == 1);
+ assertEquals("DG001ESP1", newGn.get(0).getName());
+ }
}
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
+import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.ccsdk.apps.ms.neng.core.exceptions.NengException;
+import org.onap.ccsdk.apps.ms.neng.core.persistence.NamePersister;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.HelloWorld;
import org.onap.ccsdk.apps.ms.neng.core.resource.model.NameGenRequest;
+import org.onap.ccsdk.apps.ms.neng.core.validator.AaiNameValidator;
import org.onap.ccsdk.apps.ms.neng.core.validator.ExternalKeyValidator;
import org.onap.ccsdk.apps.ms.neng.persistence.entity.GeneratedName;
import org.onap.ccsdk.apps.ms.neng.persistence.entity.PolicyDetails;
PolicyDetailsRepository policyDetailsRepository;
@Mock
GeneratedNameRespository generatedNameRepository;
+ @Mock
+ AaiNameValidator aaiNameValidator;
+ @Mock
+ NamePersister namePersister;
@InjectMocks
SpringServiceImpl springserviceImpl;
Mockito.when(externalKeyValidator.isPresent(req.get("external-key"))).thenReturn(false);
Mockito.when(serviceParamRepo.findByName("use_db_policy")).thenReturn(param);
springserviceImpl.genNetworkElementName(request);
+ }
+
+ @Test
+ public void genNetworkElementNameTest_empty_elements() throws Exception {
+ NameGenRequest request = new NameGenRequest();
+ request.setElements(new ArrayList<>());
+ springserviceImpl.genNetworkElementName(request);
}
+
+ @Test
+ public void genNetworkElementNameTest_extkey_error_3() throws Exception {
+ NameGenRequest request = new NameGenRequest();
+ List<Map<String, String>> rsp = new ArrayList<>();
+ request.setElements(rsp);
+ springserviceImpl.genNetworkElementName(request);
+ }
+
+ @Test(expected = Exception.class)
+ public void genNetworkElementNameTest_useDb() throws Exception {
+ Mockito.when(externalKeyValidator.isPresent(req.get("external-key"))).thenReturn(false);
+ Mockito.when(serviceParamRepo.findByName("use_db_policy")).thenReturn(param);
+ request.setUseDb(true);
+ springserviceImpl.genNetworkElementName(request);
+ }
@Test
public void getPolicyDetailsTest() {
Assert.assertNotNull(springserviceImpl.releaseNetworkElementName(request));
}
- @Test(expected=Exception.class)
+ @Test(expected = Exception.class)
public void releaseNetworkElementNameTestForNull() throws Exception {
- springserviceImpl.releaseNetworkElementName(null);
+ springserviceImpl.releaseNetworkElementName(null);
+ }
+
+ @Test(expected = Exception.class)
+ public void releaseNetworkElementNameTest_exp() throws Exception {
+ GeneratedName gn = new GeneratedName();
+ List<GeneratedName> generatedNameList = new ArrayList<>();
+ generatedNameList.add(gn);
+
+ Mockito.when(generatedNameRepository.findByExternalId(req.get("external-key"))).thenThrow(new Exception());
+ springserviceImpl.releaseNetworkElementName(request);
+ }
+
+ @Test(expected = Exception.class)
+ public void releaseNetworkElementNameTest_exp_neng() throws Exception {
+ GeneratedName gn = new GeneratedName();
+ List<GeneratedName> generatedNameList = new ArrayList<>();
+ generatedNameList.add(gn);
+
+ Mockito.when(generatedNameRepository.findByExternalId(req.get("external-key"))).thenThrow(
+ new NengException("Failed"));
+ springserviceImpl.releaseNetworkElementName(request);
}
@Test
public void testGetQuickHelloForNullMessage() {
Assert.assertTrue(springserviceImpl.getQuickHello("") instanceof HelloWorld);
}
+
+ @Test
+ public void updateNetworkElementName() throws Exception {
+ req.clear();
+ req.put("external-key", "TST-UV1");
+ req.put("resource-name", "vnf-name");
+ req.put("resource-value", "dst1000tv1");
+ req.put("naming-type", "vnf");
+
+ GeneratedName gn = new GeneratedName();
+ gn.setExternalId("TST-UV1");
+ gn.setElementType("VNF");
+ gn.setName("dst1000tv1");
+
+ List<GeneratedName> generatedNameList = new ArrayList<>();
+ generatedNameList.add(gn);
+ Mockito.when(namePersister.findByExternalIdAndElementType(req.get("external-key"), "VNF")).thenReturn(gn);
+ Mockito.when(aaiNameValidator.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(true);
+ Assert.assertNotNull(springserviceImpl.updateNetworkElementName(request));
+ Mockito.verify(namePersister, Mockito.times(1)).persist(gn);
+ }
+
+ @Test(expected = NengException.class)
+ public void updateNetworkElementName_Aai_Fail() throws Exception {
+ req.clear();
+ req.put("external-key", "TST-UV1");
+ req.put("resource-name", "vnf-name");
+ req.put("resource-value", "dst1000tv1");
+ req.put("naming-type", "vnf");
+
+ GeneratedName gn = new GeneratedName();
+ gn.setExternalId("TST-UV1");
+ gn.setElementType("VNF");
+ gn.setName("dst1000tv1");
+
+ Mockito.when(namePersister.findByExternalIdAndElementType(req.get("external-key"), "VNF")).thenReturn(null);
+ Mockito.when(aaiNameValidator.validate(Matchers.anyString(), Matchers.anyString())).thenReturn(false);
+ springserviceImpl.updateNetworkElementName(request);
+ }
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.core.validator;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.onap.ccsdk.apps.ms.neng.persistence.repository.ExternalInterfaceRespository;
+import org.onap.ccsdk.apps.ms.neng.service.extinf.impl.AaiServiceImpl;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AaiNameValidatorTest {
+ @Mock
+ AaiServiceImpl aaiImpl;
+
+ @Mock
+ ExternalInterfaceRespository dbStuff;
+
+ @InjectMocks
+ AaiNameValidator nameValidator;
+
+ @Test
+ public void testValidate() throws Exception {
+ when(dbStuff.getUriByNameType(Matchers.anyString())).thenReturn(null);
+ assertTrue(nameValidator.validate("VNF", "xyz112uyv"));
+ }
+}
+
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.ccsdk.apps.ms.neng.persistence.entity;
import org.junit.Assert;
import org.junit.Test;
public class GeneratedNameTest {
- private GeneratedName generatedName;
-
- @Before
- public void setUp() {
- generatedName = new GeneratedName();
- }
-
- @Test
- public void testGetSetGeneratedNameId() {
- generatedName.setGeneratedNameId(1);
- Integer expected = 1;
- Assert.assertEquals(expected, generatedName.getGeneratedNameId());
- }
-
- @Test
- public void testGetSetSequenceNumber() {
- generatedName.setSequenceNumber(2121314312321L);
- Long expected = 2121314312321L;
- Assert.assertEquals(expected, generatedName.getSequenceNumber());
- }
-
- @Test
- public void testGetSetSequenceNumberEnc() {
- generatedName.setSequenceNumberEnc("TestSequenceNumberEnc");
- String expected = "TestSequenceNumberEnc";
- Assert.assertEquals(expected, generatedName.getSequenceNumberEnc());
- }
-
- @Test
- public void testGetSetElementType() {
- generatedName.setElementType("TestElementType");
- String expected = "TestElementType";
- Assert.assertEquals(expected, generatedName.getElementType());
- }
-
- @Test
- public void testGetSetName() {
- generatedName.setName("TestName");
- String expected = "TestName";
- Assert.assertEquals(expected, generatedName.getName());
- }
-
- @Test
- public void testGetSetPrefix() {
- generatedName.setPrefix("TestPrefix");
- String expected = "TestPrefix";
- Assert.assertEquals(expected, generatedName.getPrefix());
- }
-
- @Test
- public void testGetSetSuffix() {
- generatedName.setSuffix("TestSuffix");
- String expected = "TestSuffix";
- Assert.assertEquals(expected, generatedName.getSuffix());
- }
-
- @Test
- public void testGetSetIsReleased() {
- generatedName.setIsReleased("TestIsReleased");
- String expected = "TestIsReleased";
- Assert.assertEquals(expected, generatedName.getIsReleased());
- }
-
+ private GeneratedName generatedName;
+
+ @Before
+ public void setUp() {
+ generatedName = new GeneratedName();
+ }
+
+ @Test
+ public void testGetSetGeneratedNameId() {
+ generatedName.setGeneratedNameId(1);
+ Integer expected = 1;
+ Assert.assertEquals(expected, generatedName.getGeneratedNameId());
+ }
+
+ @Test
+ public void testGetSetSequenceNumber() {
+ generatedName.setSequenceNumber(2121314312321L);
+ Long expected = 2121314312321L;
+ Assert.assertEquals(expected, generatedName.getSequenceNumber());
+ }
+
+ @Test
+ public void testGetSetSequenceNumberEnc() {
+ generatedName.setSequenceNumberEnc("TestSequenceNumberEnc");
+ String expected = "TestSequenceNumberEnc";
+ Assert.assertEquals(expected, generatedName.getSequenceNumberEnc());
+ }
+
+ @Test
+ public void testGetSetElementType() {
+ generatedName.setElementType("TestElementType");
+ String expected = "TestElementType";
+ Assert.assertEquals(expected, generatedName.getElementType());
+ }
+
+ @Test
+ public void testGetSetName() {
+ generatedName.setName("TestName");
+ String expected = "TestName";
+ Assert.assertEquals(expected, generatedName.getName());
+ }
+
+ @Test
+ public void testGetSetPrefix() {
+ generatedName.setPrefix("TestPrefix");
+ String expected = "TestPrefix";
+ Assert.assertEquals(expected, generatedName.getPrefix());
+ }
+
+ @Test
+ public void testGetSetSuffix() {
+ generatedName.setSuffix("TestSuffix");
+ String expected = "TestSuffix";
+ Assert.assertEquals(expected, generatedName.getSuffix());
+ }
+
+ @Test
+ public void testGetSetIsReleased() {
+ generatedName.setIsReleased("TestIsReleased");
+ String expected = "TestIsReleased";
+ Assert.assertEquals(expected, generatedName.getIsReleased());
+ }
}
+
import org.junit.Test;
public class IdentifierMapTest {
- private IdentifierMap identifierMap;
+ private IdentifierMap identifierMap;
@Before
public void setUp() {
- identifierMap = new IdentifierMap();
+ identifierMap = new IdentifierMap();
}
@Test
public void testGetSetIdentifierMapId() {
- identifierMap.setIdentifierMapId(1);
+ identifierMap.setIdentifierMapId(1);
Integer expected = 1;
Assert.assertEquals(expected, identifierMap.getIdentifierMapId());
}
@Test
public void testGetSetPolicyFnName() {
- identifierMap.setPolicyFnName("PolicyFnName");
+ identifierMap.setPolicyFnName("PolicyFnName");
String expected = "PolicyFnName";
Assert.assertEquals(expected, identifierMap.getPolicyFnName());
}
@Test
public void testGetSetJsFnName() {
- identifierMap.setJsFnName("JsFnName");
+ identifierMap.setJsFnName("JsFnName");
String expected = "JsFnName";
Assert.assertEquals(expected, identifierMap.getJsFnName());
}
@Test
public void testGetSetCreatedTime() throws ParseException {
- DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Date date = dateFormat.parse("23/09/2007");
long time = date.getTime();
Timestamp timeStamp = new Timestamp(time);
- identifierMap.setCreatedTime(timeStamp);
- Timestamp expected = timeStamp;
+ identifierMap.setCreatedTime(timeStamp);
+ Timestamp expected = timeStamp;
Assert.assertEquals(expected, identifierMap.getCreatedTime());
}
@Test
public void testGetSetCreatedBy() {
- identifierMap.setCreatedBy("Name");
+ identifierMap.setCreatedBy("Name");
String expected = "Name";
Assert.assertEquals(expected, identifierMap.getCreatedBy());
}
@Test
public void testGetSetLastUpdatedTime() throws ParseException {
- DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Date date = dateFormat.parse("23/09/2007");
long time = date.getTime();
Timestamp timeStamp = new Timestamp(time);
- identifierMap.setLastUpdatedTime(timeStamp);
- Timestamp expected = timeStamp;
+ identifierMap.setLastUpdatedTime(timeStamp);
+ Timestamp expected = timeStamp;
Assert.assertEquals(expected, identifierMap.getLastUpdatedTime());
}
@Test
public void testGetSetLastUpdatedBy() {
- identifierMap.setLastUpdatedBy("Name");
+ identifierMap.setLastUpdatedBy("Name");
String expected = "Name";
Assert.assertEquals(expected, identifierMap.getLastUpdatedBy());
}
}
+
package org.onap.ccsdk.apps.ms.neng.persistence.entity;
-
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.ParseException;
import org.junit.Test;
public class PolicyDetailsTest {
- private PolicyDetails policyDetails;
+ private PolicyDetails policyDetails;
@Before
public void setUp() {
- policyDetails = new PolicyDetails();
+ policyDetails = new PolicyDetails();
}
@Test
public void testGetSetPolicyId() {
- policyDetails.setPolicyId(1);
+ policyDetails.setPolicyId(1);
Integer expected = 1;
Assert.assertEquals(expected, policyDetails.getPolicyId());
}
@Test
public void testGetSetPolicyName() {
- policyDetails.setPolicyName("PolicyName");
+ policyDetails.setPolicyName("PolicyName");
String expected = "PolicyName";
Assert.assertEquals(expected, policyDetails.getPolicyName());
}
@Test
public void testGetSetPolicyResponse() {
- policyDetails.setPolicyResponse("PolicyResponse");
+ policyDetails.setPolicyResponse("PolicyResponse");
String expected = "PolicyResponse";
Assert.assertEquals(expected, policyDetails.getPolicyResponse());
}
@Test
public void testGetSetCreatedTime() throws ParseException {
- DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Date date = dateFormat.parse("23/09/2007");
long time = date.getTime();
Timestamp timeStamp = new Timestamp(time);
- policyDetails.setCreatedTime(timeStamp);
- String expected = "PolicyResponse";
+ policyDetails.setCreatedTime(timeStamp);
Assert.assertEquals(timeStamp, policyDetails.getCreatedTime());
}
-
-
}
+
import org.junit.Test;
public class ServiceParameterTest {
- private ServiceParameter serviceParameter;
+ private ServiceParameter serviceParameter;
@Before
public void setUp() {
- serviceParameter = new ServiceParameter();
+ serviceParameter = new ServiceParameter();
}
@Test
public void testGetSetServiceParameterId() {
- serviceParameter.setServiceParameterId(1);
+ serviceParameter.setServiceParameterId(1);
Integer expected = 1;
Assert.assertEquals(expected, serviceParameter.getServiceParameterId());
}
@Test
public void testGetSetName() {
- serviceParameter.setName("Name");
+ serviceParameter.setName("Name");
String expected = "Name";
Assert.assertEquals(expected, serviceParameter.getName());
}
@Test
public void testGetSetValue() {
- serviceParameter.setValue("Value");
+ serviceParameter.setValue("Value");
String expected = "Value";
Assert.assertEquals(expected, serviceParameter.getValue());
}
@Test
public void testGetSetCreatedTime() throws ParseException {
- DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
- Date date = dateFormat.parse("23/09/2007");
- long time = date.getTime();
- Timestamp timeStamp = new Timestamp(time);
- serviceParameter.setCreatedTime(timeStamp);
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ Date date = dateFormat.parse("23/09/2007");
+ long time = date.getTime();
+ Timestamp timeStamp = new Timestamp(time);
+ serviceParameter.setCreatedTime(timeStamp);
Assert.assertEquals(timeStamp, serviceParameter.getCreatedTime());
}
@Test
public void testGetSetCreatedBy() {
- serviceParameter.setCreatedBy("CreatedBy");
+ serviceParameter.setCreatedBy("CreatedBy");
String expected = "CreatedBy";
Assert.assertEquals(expected, serviceParameter.getCreatedBy());
}
@Test
public void testGetSetLastUpdatedBy() {
- serviceParameter.setLastUpdatedBy("LastUpdatedBy");
+ serviceParameter.setLastUpdatedBy("LastUpdatedBy");
String expected = "LastUpdatedBy";
Assert.assertEquals(expected, serviceParameter.getLastUpdatedBy());
}
@Test
public void testGetSetLastUpdatedTime() throws ParseException {
- DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
- Date date = dateFormat.parse("23/09/2007");
- long time = date.getTime();
- Timestamp timeStamp = new Timestamp(time);
- serviceParameter.setLastUpdatedTime(timeStamp);
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ Date date = dateFormat.parse("23/09/2007");
+ long time = date.getTime();
+ Timestamp timeStamp = new Timestamp(time);
+ serviceParameter.setLastUpdatedTime(timeStamp);
Assert.assertEquals(timeStamp, serviceParameter.getLastUpdatedTime());
}
}
+
package org.onap.ccsdk.apps.ms.neng.service.extinf.impl;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.when;
-
@RunWith(MockitoJUnitRunner.class)
public class PolicyFinderServiceImplTest {
@InjectMocks
assertNull(policyFinder.findPolicy("policy"));
}
- @SuppressWarnings("unchecked")
@Test(expected = NengException.class)
- public void testHandleError_NOT_FOUND() throws Exception{
- HttpStatusCodeException e = new HttpClientErrorException(HttpStatus.NOT_FOUND,"",null,StandardCharsets.US_ASCII);
+ public void testHandleError_Not_Found() throws Exception {
+ HttpStatusCodeException e = new HttpClientErrorException(HttpStatus.NOT_FOUND,"",
+ null,StandardCharsets.US_ASCII);
policyFinder.handleError(e);
-
}
+
@SuppressWarnings("unchecked")
@Test
public void testmakeOutboundCall() throws Exception {
configMap.put("config", contentMap);
return configMap;
}
+
+ @SuppressWarnings("unchecked")
+ @Test(expected = NengException.class)
+ public void testmakeOutboundCall_500_statusExp() throws Exception {
+ HttpClientErrorException exp = new HttpClientErrorException(HttpStatus.METHOD_NOT_ALLOWED, "{error}");
+ when(restTemplate.exchange(Matchers.any(RequestEntity.class), Matchers.any(Class.class))).thenThrow(exp);
+ policManProps.setUrl("http://policyManager.onap.org");
+ GetConfigRequest request = new GetConfigRequest();
+ request.setPolicyName("policy");
+ policyFinder.makeOutboundCall(request, GetConfigResponse.class);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test(expected = NengException.class)
+ public void testmakeOutboundCall_500_statusExp_notFound() throws Exception {
+ HttpClientErrorException exp = new HttpClientErrorException(HttpStatus.NOT_FOUND, "{error}");
+ when(restTemplate.exchange(Matchers.any(RequestEntity.class), Matchers.any(Class.class))).thenThrow(exp);
+ policManProps.setUrl("http://policyManager.onap.org");
+ GetConfigRequest request = new GetConfigRequest();
+ request.setPolicyName("policy");
+ policyFinder.makeOutboundCall(request, GetConfigResponse.class);
+ }
+
+ @Test
+ public void testmakeOutboundCall_err_policy() throws Exception {
+ Map<String, Object> configMap = buildPolicyResponse();
+ Object resp = configMap;
+ GetConfigResponse configResp = new GetConfigResponse();
+ configResp.setResponse(resp);
+ doReturn(configResp).when(policyFinder).getConfig("policy");
+ assertNull(policyFinder.findPolicy("policy"));
+ }
+
+ @Test
+ public void testmakeOutboundCall_err_policy_empty() throws Exception {
+ Object resp = Arrays.asList(new Object[]{});
+ GetConfigResponse configResp = new GetConfigResponse();
+ configResp.setResponse(resp);
+ doReturn(configResp).when(policyFinder).getConfig("policy");
+ assertNull(policyFinder.findPolicy("policy"));
+ }
+
}
--- /dev/null
+#!/bin/bash
+#============LICENSE_START=======================================================
+# ONAP : CCSDK.apps
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+#============LICENSE_END=========================================================
+
+#==================================================================================
+# This script does a sanity test on the add-policy API of the micro-service.
+#==================================================================================
+
+. ./env.sh
+URL=web/service/v1/addPolicy
+TEMP_FILE=/tmp/add-policy.$$.$RANDOM
+EXTERNAL_KEY=${1:-123456789}
+
+printf '{ ' > $TEMP_FILE
+printf '"policyName": "vnf-policy-2' >> $TEMP_FILE
+printf '", "policyValue" : "' >> $TEMP_FILE
+cat ./policy-vnf-2.json | sed 's/\"/\\\"/g' | tr '\n' ' ' | tr '\r' ' ' >> $TEMP_FILE
+echo '"}' >> $TEMP_FILE
+
+echo "==================================================="
+echo "====== Adding Policy: ==========================="
+cat $TEMP_FILE
+echo ""
+echo "==================================================="
+
+echo "==================================================="
+curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL
+echo "==================================================="
+
+rm -f $TEMP_FILE
+
--- /dev/null
+#!/bin/bash
+#============LICENSE_START=======================================================
+# ONAP : CCSDK.apps
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+#============LICENSE_END=========================================================
+
+#==================================================================================
+# This script does a sanity test on the add-policy API of the micro-service.
+#==================================================================================
+
+. ./env.sh
+URL=web/service/v1/addPolicy
+TEMP_FILE=/tmp/add-policy.$$.$RANDOM
+EXTERNAL_KEY=${1:-123456789}
+
+printf '{ ' > $TEMP_FILE
+printf '"policyName": "vnf-policy-ts-2' >> $TEMP_FILE
+printf '", "policyValue" : "' >> $TEMP_FILE
+cat ./policy-vnf-ts-2.json | sed 's/\"/\\\"/g' | tr '\n' ' ' | tr '\r' ' ' >> $TEMP_FILE
+echo '"}' >> $TEMP_FILE
+
+echo "==================================================="
+echo "====== Adding Policy: ==========================="
+cat $TEMP_FILE
+echo ""
+echo "==================================================="
+
+echo "==================================================="
+curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL
+echo "==================================================="
+
+rm -f $TEMP_FILE
+
--- /dev/null
+#!/bin/bash
+#============LICENSE_START=======================================================
+# ONAP : CCSDK.apps
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+#============LICENSE_END=========================================================
+
+#==================================================================================
+# This script does a sanity test on the generate-name API of this micro-service.
+#==================================================================================
+
+. ./env.sh
+URL=web/service/v1/genNetworkElementName
+TEMP_FILE=/tmp/gen-name.$$.$RANDOM
+EXTERNAL_KEY=$RANDOM
+
+USE_DB=${1:-'Y'}
+USE_DB_BOOL=$([ "$USE_DB" == "Y" ] && echo "true" || echo "false")
+
+printf '{ "UseDb": "' > $TEMP_FILE
+printf $USE_DB_BOOL >> $TEMP_FILE
+printf '", "elements": [ { "external-key": "sanity-' >> $TEMP_FILE
+printf $EXTERNAL_KEY >> $TEMP_FILE
+printf '", "policy-instance-name": "vnf-policy-2", "NF_NAMING_CODE": "me9", "COMPLEX": "dlstxa", ' >> $TEMP_FILE
+printf '"resource-name": "VNF2", "naming-type": "VNF2" } ] }' >> $TEMP_FILE
+
+echo "==================================================="
+echo "======== Generating name with request: ============"
+echo ""
+echo ""
+cat $TEMP_FILE
+echo ""
+echo ""
+echo ""
+echo "==================================================="
+
+echo "==================================================="
+curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL
+echo ""
+echo ""
+echo "==================================================="
+
+rm -f $TEMP_FILE
+
+
--- /dev/null
+#!/bin/bash
+#============LICENSE_START=======================================================
+# ONAP : CCSDK.apps
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+#============LICENSE_END=========================================================
+
+#==================================================================================
+# This script does a sanity test on the generate-name API of this micro-service.
+#==================================================================================
+
+. ./env.sh
+URL=web/service/v1/genNetworkElementName
+TEMP_FILE=/tmp/gen-name.$$.$RANDOM
+EXTERNAL_KEY=$RANDOM
+
+USE_DB=${1:-'Y'}
+USE_DB_BOOL=$([ "$USE_DB" == "Y" ] && echo "true" || echo "false")
+
+printf '{ "UseDb": "' > $TEMP_FILE
+printf $USE_DB_BOOL >> $TEMP_FILE
+printf '", "elements": [ { "external-key": "sanity-' >> $TEMP_FILE
+printf $EXTERNAL_KEY >> $TEMP_FILE
+printf '", "policy-instance-name": "vnf-policy-ts-2", "NF_NAMING_CODE": "me9", "COMPLEX": "dlstxa", ' >> $TEMP_FILE
+printf '"resource-name": "VNF2", "resource-value": "ASDF' >> $TEMP_FILE
+printf $EXTERNAL_KEY >> $TEMP_FILE
+printf '", "naming-type": "VNF2" } ] }' >> $TEMP_FILE
+
+echo "==================================================="
+echo "======== Generating name with request: ============"
+echo ""
+echo ""
+cat $TEMP_FILE
+echo ""
+echo ""
+echo ""
+echo "==================================================="
+
+echo "==================================================="
+curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL
+echo ""
+echo ""
+echo "==================================================="
+
+rm -f $TEMP_FILE
+
+
--- /dev/null
+#!/bin/bash
+#============LICENSE_START=======================================================
+# ONAP : CCSDK.apps
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+#============LICENSE_END=========================================================
+
+#==================================================================================
+# This script does a sanity test on the generate-name API of this micro-service.
+#==================================================================================
+
+. ./env.sh
+URL=web/service/v1/genNetworkElementName
+TEMP_FILE=/tmp/gen-name.$$.$RANDOM
+EXTERNAL_KEY=$RANDOM
+
+USE_DB=${1:-'Y'}
+USE_DB_BOOL=$([ "$USE_DB" == "Y" ] && echo "true" || echo "false")
+
+printf '{ "UseDb": "' > $TEMP_FILE
+printf $USE_DB_BOOL >> $TEMP_FILE
+printf '", "elements": [ { "external-key": "sanity-' >> $TEMP_FILE
+printf $EXTERNAL_KEY >> $TEMP_FILE
+printf '", "policy-instance-name": "vnf-policy-ts-2", "NF_NAMING_CODE": "me9", "COMPLEX": "dlstxa", ' >> $TEMP_FILE
+printf '"resource-name": "VNF2", "naming-type": "VNF2" } ] }' >> $TEMP_FILE
+
+echo "==================================================="
+echo "======== Generating name with request: ============"
+echo ""
+echo ""
+cat $TEMP_FILE
+echo ""
+echo ""
+echo ""
+echo "==================================================="
+
+echo "==================================================="
+curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL
+echo ""
+echo ""
+echo "==================================================="
+
+rm -f $TEMP_FILE
+
+
--- /dev/null
+[
+ {
+ "config": {
+ "content": {
+ "naming-models":[
+ {
+ "naming-properties":[
+ { "property-name" : "COMPLEX", "property-operation" : "substr(5)" },
+ { "property-name" : "SEQUENCE", "increment-sequence":{
+ "max" : "zzz" , "scope" : "ENTIRETY" , "start-value" : "001" , "length" : "3",
+ "increment" : "1" , "sequence-type" : "alpha-numeric"}
+ },
+ {"property-name" : "NF_NAMING_CODE"}
+ ],
+ "naming-type" : "VNF2",
+ "nfRole" : "vPE",
+ "naming-recipe" : "COMPLEX|SEQUENCE|NF_NAMING_CODE"
+ },
+ {
+ "naming-properties":[
+ {"property-name" : "NF_NAMING_CODE"}
+ ],
+ "naming-type" : "VNF2",
+ "nfRole" : "VNF2",
+ "naming-recipe" : "NF_NAMING_CODE"
+ }
+ ]
+ }
+ },
+ "policyName": "vnf2-policy-1"
+ }
+]
+
--- /dev/null
+[
+ {
+ "config": {
+ "content": {
+ "naming-models":[
+ {
+ "naming-properties":[
+ { "property-name" : "COMPLEX", "property-operation" : "substr(5)" },
+ { "property-name" : "SEQUENCE", "increment-sequence":{
+ "max" : "zzz" , "scope" : "ENTIRETY" , "start-value" : "001" , "length" : "3",
+ "increment" : "1" , "sequence-type" : "alpha-numeric"}
+ },
+ {"property-name" : "NF_NAMING_CODE"}
+ ],
+ "naming-type" : "VNF2",
+ "nfRole" : "vPE",
+ "naming-recipe" : "COMPLEX|UUID|SEQUENCE|NF_NAMING_CODE|TIMESTAMP"
+ },
+ {
+ "naming-properties":[
+ {"property-name" : "NF_NAMING_CODE"}
+ ],
+ "naming-type" : "VNF2",
+ "nfRole" : "VNF2",
+ "naming-recipe" : "NF_NAMING_CODE"
+ }
+ ]
+ }
+ },
+ "policyName": "vnf-policy-2"
+ }
+]
+
Code Review / ccsdk / apps.git / commitdiff