[sdc] - last merges before moving to LF
Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
diff --git a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
index 6a3d117..21b7043 100644
--- a/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
+++ b/asdc-tests/src/main/resources/ci/testSuites/sanity.xml
@@ -152,7 +152,6 @@
</methods>
</class>
</classes>
- </test>
<test name="Catalog">
<classes>
<class name="org.openecomp.sdc.ci.tests.execute.category.CatalogDataApiTest" />
diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/MigrationMenu.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/MigrationMenu.java
index 0c06052..dd9fa86 100644
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/MigrationMenu.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/MigrationMenu.java
@@ -246,29 +246,29 @@
break;
case MIGRATION_1702_1707://this migration is currently not needed, but will be commented out for production env
-// log.info("Start ASDC migration from 1702 to 1707");
-// Migration1707 migration1707 = (Migration1707) context.getBean(operationEnum.getBeanName());
-// isSuccessful = migration1707.migrate();
-// if (isSuccessful) {
-// log.info("SDC migration from 1702 to 1707 was finished successfully");
-// System.exit(0);
-// } else{
-// log.info("SDC migration from 1702 to 1707 has failed");
-// System.exit(2);
-// }
+ log.info("Start ASDC migration from 1702 to 1707");
+ Migration1707 migration1707 = (Migration1707) context.getBean(operationEnum.getBeanName());
+ isSuccessful = migration1707.migrate();
+ if (isSuccessful) {
+ log.info("SDC migration from 1702 to 1707 was finished successfully");
+ System.exit(0);
+ } else{
+ log.info("SDC migration from 1702 to 1707 has failed");
+ System.exit(2);
+ }
System.exit(0);
break;
case VFMODULES_PROPERTIES_ADDING://this migration is currently not needed, but will be commented out for production env
-// log.info("Start adding new properties to vfModules");
-// VfModulesPropertiesAdding migrationVfModulesProperties = (VfModulesPropertiesAdding) context.getBean(operationEnum.getBeanName());
-// isSuccessful = migrationVfModulesProperties.migrate(args[1]);
-// if (isSuccessful) {
-// log.info("Adding new properties to vfModules was finished successfully");
-// System.exit(0);
-// } else{
-// log.info("Adding new properties to vfModules has failed");
-// System.exit(2);
-// }
+ log.info("Start adding new properties to vfModules");
+ VfModulesPropertiesAdding migrationVfModulesProperties = (VfModulesPropertiesAdding) context.getBean(operationEnum.getBeanName());
+ isSuccessful = migrationVfModulesProperties.migrate(args[1]);
+ if (isSuccessful) {
+ log.info("Adding new properties to vfModules was finished successfully");
+ System.exit(0);
+ } else{
+ log.info("Adding new properties to vfModules has failed");
+ System.exit(2);
+ }
System.exit(0);
break;
case MIGRATION_1707_UUID_FIX:
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index f917d60..8d8aa72 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -1632,6 +1632,7 @@
ComponentInstance resResourceInfo = resultOp.left().value();
newComponentInstance.setName(resResourceInfo.getName());
+ newComponentInstance.setInvariantName(resResourceInfo.getInvariantName());
newComponentInstance.setPosX(resResourceInfo.getPosX());
newComponentInstance.setPosY(resResourceInfo.getPosY());
newComponentInstance.setDescription(resResourceInfo.getDescription());
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
index f545548..4f4ad7f 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/InputsBusinessLogic.java
@@ -448,7 +448,7 @@
if (newInputsMap != null && !newInputsMap.isEmpty()) {
int index = 0;
for (Entry<String, List<InputDefinition>> entry : newInputsMap.entrySet()) {
- List<ComponentInstanceInput> inputsValueToCreate = new ArrayList<>();
+
String compInstId = entry.getKey();
Optional<ComponentInstance> op = ciList.stream().filter(ci -> ci.getUniqueId().equals(compInstId)).findAny();
@@ -475,7 +475,7 @@
for (InputDefinition input : inputs) {
- StorageOperationStatus status = addInputsToComponent(componentId, inputsToCreate, allDataTypes.left().value(), resList, index, inputsValueToCreate, compInstId, compInstname, origComponent, input);
+ StorageOperationStatus status = addInputsToComponent(componentId, inputsToCreate, inputsValueToCreateMap, allDataTypes.left().value(), resList, index, compInstId, compInstname, origComponent, input);
if(status != StorageOperationStatus.OK ){
ActionStatus actionStatus = componentsUtils.convertFromStorageResponse(status);
log.debug("Failed to create inputs value under component {}, error: {}", componentId, actionStatus.name());
@@ -485,9 +485,7 @@
}
}
- if(!inputsValueToCreate.isEmpty()){
- inputsValueToCreateMap.put(compInstId, inputsValueToCreate);
- }
+
}
}
@@ -556,8 +554,9 @@
}
- private StorageOperationStatus addInputsToComponent(String componentId, Map<String, InputDefinition> inputsToCreate, Map<String, DataTypeDefinition> allDataTypes, List<InputDefinition> resList, int index,
- List<ComponentInstanceInput> inputsValueToCreate, String compInstId, String compInstname, org.openecomp.sdc.be.model.Component origComponent, InputDefinition input) {
+ private StorageOperationStatus addInputsToComponent(String componentId, Map<String, InputDefinition> inputsToCreate, Map<String, List<ComponentInstanceInput>> inputsValueToCreateMap, Map<String, DataTypeDefinition> allDataTypes, List<InputDefinition> resList, int index,
+ String compInstId, String compInstname, org.openecomp.sdc.be.model.Component origComponent, InputDefinition input) {
+
Either<List<InputDefinition>, ResponseFormat> result;
String innerType = null;
@@ -604,8 +603,23 @@
getInputValues.add(getInputValueDataDefinition);
inputValue.setGetInputValues(getInputValues);
+ List<ComponentInstanceInput> inputsValueToCreate = null;
+
+ if(inputsValueToCreateMap.containsKey(compInstId)){
+ inputsValueToCreate = inputsValueToCreateMap.get(compInstId);
+ }else{
+ inputsValueToCreate = new ArrayList<>();
+ }
inputsValueToCreate.add(inputValue);
- input.setInputs(inputsValueToCreate);
+ inputsValueToCreateMap.put(compInstId, inputsValueToCreate);
+
+
+ inputsValueToCreate.add(inputValue);
+ List<ComponentInstanceInput> inputsValue = input.getInputs();
+ if(inputsValue == null)
+ inputsValue = new ArrayList<>();
+ inputsValue.add(inputValue);
+ input.setInputs(inputsValue);
resList.add(input);
return StorageOperationStatus.OK;
@@ -881,22 +895,25 @@
if(inputsValue != null && !inputsValue.isEmpty()){
for(ComponentInstanceInput inputValue: inputsValue){
+ inputValue.setValue(inputValue.getDefaultValue());
+ List<GetInputValueDataDefinition> getInputsValues = inputValue.getGetInputValues();
+ if(getInputsValues != null && !getInputsValues.isEmpty()){
+ Optional<GetInputValueDataDefinition> op = getInputsValues.stream().filter(gi -> gi.getInputId().equals(inputForDelete.getUniqueId())).findAny();
+ if(op.isPresent()){
+ getInputsValues.remove(op.get());
+ }
+ }
+ inputValue.setGetInputValues(getInputsValues);
List<ComponentInstanceInput> inputList = null;
String ciId = inputValue.getComponentInstanceId();
- if(!insInputsMatToDelete.containsKey(ciId)){
- inputList = new ArrayList<>();
- }else{
- inputList = insInputsMatToDelete.get(ciId);
+ status = toscaOperationFacade.updateComponentInstanceInput(component, ciId, inputValue);
+ if(status != StorageOperationStatus.OK){
+ log.debug("Component id: {} delete component instance input id: {} failed", componentId, inputId);
+ deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
+ return deleteEither;
}
- inputList.add(inputValue);
- insInputsMatToDelete.put(ciId, inputList);
}
- status = toscaOperationFacade.deleteComponentInstanceInputsToComponent(insInputsMatToDelete, component.getUniqueId());
- if(status != StorageOperationStatus.OK){
- log.debug("Component id: {} delete component instance input id: {} failed", componentId, inputId);
- deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
- return deleteEither;
- }
+
}
// US848813 delete service input that relates to VL / CP property
@@ -932,11 +949,7 @@
}
}
propertyValue.setGetInputValues(getInputsValues);
- if(status != StorageOperationStatus.OK){
- log.debug("Component id: {} delete component instance property {} id: {} failed", componentId, propertyValue.getUniqueId(), inputId);
- deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(status), component.getName()));
- return deleteEither;
- }
+
Either<String, TitanOperationStatus> findDefaultValue = propertyOperation.findDefaultValueFromSecondPosition(propertyValue.getPath(), propertyValue.getUniqueId(), propertyValue.getDefaultValue());
if (findDefaultValue.isRight()) {
deleteEither = Either.right(componentsUtils.getResponseFormat(componentsUtils.convertFromStorageResponse(DaoStatusConverter.convertTitanStatusToStorageStatus(findDefaultValue.right().value()))));
@@ -1187,8 +1200,14 @@
List<ComponentInstance> ciList = component.getComponentInstances();
String componentId = component.getUniqueId();
for (Entry<String, List<ComponentInstancePropInput>> entry : newInputsPropsMap.entrySet()) {
- List<ComponentInstanceProperty> propertiesToCreate = new ArrayList<>();
String compInstId = entry.getKey();
+ List<ComponentInstanceProperty> propertiesToCreate = null;
+ if(propertiesToCreateMap.containsKey(compInstId)){
+ propertiesToCreate = propertiesToCreateMap.get(compInstId);
+ }else{
+ propertiesToCreate = new ArrayList<>();
+ }
+
List<ComponentInstancePropInput> properties = entry.getValue();
Optional<ComponentInstance> op = ciList.stream().filter(ci -> ci.getUniqueId().equals(compInstId)).findAny();
@@ -1334,7 +1353,9 @@
}
inputsToCreate.put(input.getName(), input);
- List<ComponentInstanceProperty> propertiesList = new ArrayList<>(); // adding the property with the new value for UI
+ List<ComponentInstanceProperty> propertiesList = input.getProperties();
+ if(propertiesList == null)
+ propertiesList = new ArrayList<>(); // adding the property with the new value for UI
propertiesList.add(prop);
input.setProperties(propertiesList);
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
index 8c0041a..5ed0719 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionCatalogServlet.java
@@ -74,13 +74,14 @@
public class DistributionCatalogServlet extends BeGenericServlet {
private static Logger log = LoggerFactory.getLogger(DistributionCatalogServlet.class.getName());
+ @Context
+ private HttpServletRequest request;
// *******************************************************
// Download (GET) artifacts
// **********************************************************/
/**
*
- * @param request
* @param requestId
* @param instanceIdHeader
* @param accept
@@ -105,7 +106,7 @@
@ApiResponse(code = 404, message = "Specified artifact is not found - SVC4505"),
@ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000")})
- public Response downloadServiceArtifact(@Context final HttpServletRequest request,
+ public Response downloadServiceArtifact(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
@@ -158,7 +159,6 @@
/**
*
- * @param request
* @param requestId
* @param instanceIdHeader
* @param accept
@@ -186,7 +186,7 @@
@ApiResponse(code = 404, message = "Specified artifact is not found - SVC4505"),
@ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000")})
- public Response downloadResourceArtifact(@Context final HttpServletRequest request,
+ public Response downloadResourceArtifact(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
@@ -241,7 +241,6 @@
/**
*
- * @param request
* @param requestId
* @param instanceIdHeader
* @param accept
@@ -268,7 +267,7 @@
@ApiResponse(code = 404, message = "Specified artifact is not found - SVC4505"),
@ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000")})
- public Response downloadResourceInstanceArtifact(@Context final HttpServletRequest request,
+ public Response downloadResourceInstanceArtifact(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
index 6a74906..ab76021 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/distribution/servlet/DistributionServlet.java
@@ -84,10 +84,11 @@
private static Logger log = LoggerFactory.getLogger(DistributionServlet.class.getName());
@Resource
private DistributionBusinessLogic distributionLogic;
+ @Context
+ private HttpServletRequest request;
/**
*
- * @param request
* @param requestId
* @param instanceId
* @param accept
@@ -110,7 +111,7 @@
@ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
@ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000")})
- public Response getUebServerList(@Context final HttpServletRequest request,
+ public Response getUebServerList(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) String instanceId,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
@@ -157,7 +158,6 @@
/**
*
- * @param request
* @param requestId
* @param instanceId
* @param accept
@@ -185,7 +185,7 @@
@ApiResponse(code = 500, message = "The registration failed due to internal SDC problem or Cambria Service failure ECOMP Component should continue the attempts to register for distribution - POL5000")})
//TODO Tal G fix response headers and to check missing header validations with Michael L
@ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.distribution.api.client.RegistrationRequest", paramType = "body", value = "json describe the artifact")})
- public Response registerForDistribution(@Context final HttpServletRequest request,
+ public Response registerForDistribution(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) String instanceId,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
@@ -223,7 +223,6 @@
* Returns list of valid artifact types for validation done in the distribution client.<br>
* The list is the representation of the values of the enum ArtifactTypeEnum.
*
- * @param request
* @param requestId
* @param instanceId
* @param authorization
@@ -242,7 +241,7 @@
@ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
@ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution ( POST,PUT,DELETE will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The registration failed due to internal SDC problem or Cambria Service failure ECOMP Component should continue the attempts to register for distribution - POL5000")})
- public Response getValidArtifactTypes(@Context final HttpServletRequest request,
+ public Response getValidArtifactTypes(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) String instanceId,
@ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
@@ -266,7 +265,6 @@
/**
* Removes from subscription for distribution notifications
*
- * @param request
* @param requestId
* @param instanceId
* @param accept
@@ -294,7 +292,7 @@
@ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution ( PUT,DELETE,GET will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The registration failed due to internal SDC problem or Cambria Service failure ECOMP Component should continue the attempts to register for distribution - POL5000")})
@ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.distribution.api.client.RegistrationRequest", paramType = "body", value = "json describe the artifact")})
- public Response unRegisterForDistribution(@Context final HttpServletRequest request,
+ public Response unRegisterForDistribution(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) String instanceId,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
index fea300a..74eea8b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/ArtifactExternalServlet.java
@@ -58,6 +58,8 @@
import com.jcabi.aspects.Loggable;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
@@ -87,18 +89,50 @@
/**
* Uploads an artifact to resource or service
*
+ * @param contenType
+ * @param checksum
+ * @param userId
+ * @param requestId
+ * @param instanceIdHeader
+ * @param accept
+ * @param authorization
* @param assetType
* @param uuid
+ * @param data
* @return
*/
@POST
@Path("/{assetType}/{uuid}/artifacts")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "uploads of artifact to a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact uploaded"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response uploadArtifact(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @ApiParam(value = "json describe the artifact", required = true) String data,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "uploads of artifact to a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact uploaded", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Artifact name given in input already exists in the context of the asset - SVC4125"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 400, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 400, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.model.ArtifactDefinition", paramType = "body", value = "json describe the artifact")})
+ public Response uploadArtifact(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The value for this header must be the MD5 checksum over the whole json body", required = true)@HeaderParam(value = Constants.MD5_HEADER) String checksum,
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ String data) {
+
init(log);
Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
@@ -162,12 +196,35 @@
@POST
@Path("/{assetType}/{uuid}/resourceInstances/{resourceInstanceName}/artifacts")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "uploads an artifact to a resource instance", httpMethod = "POST", notes = "uploads an artifact to a resource instance", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact uploaded"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response uploadArtifactToInstance(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @PathParam("resourceInstanceName") final String resourceInstanceName,
- @ApiParam(value = "json describe the artifact", required = true) String data,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "uploads an artifact to a resource instance", httpMethod = "POST", notes = "uploads an artifact to a resource instance")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact uploaded", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Artifact name given in input already exists in the context of the asset - SVC4125"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 400, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 400, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.model.ArtifactDefinition", paramType = "body", value = "json describe the artifact")})
+ public Response uploadArtifactToInstance(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The value for this header must be the MD5 checksum over the whole json body", required = true)@HeaderParam(value = Constants.MD5_HEADER) String checksum,
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The component instance name (as publishedin the response of the detailed query)", required = true)@PathParam("resourceInstanceName") final String resourceInstanceName,
+ String data) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -223,22 +280,51 @@
}
/**
- * updates an artifact on a resource or service
*
+ * @param contenType
+ * @param checksum
+ * @param userId
+ * @param requestId
+ * @param instanceIdHeader
+ * @param accept
+ * @param authorization
* @param assetType
* @param uuid
* @param artifactUUID
+ * @param data
* @return
*/
@POST
@Path("/{assetType}/{uuid}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "updates an artifact on a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact Updated"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response updateArtifact(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @PathParam("artifactUUID") final String artifactUUID,
- @ApiParam(value = "json describe the artifact", required = true) String data,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "updates an artifact on a resource or service", httpMethod = "POST", notes = "uploads of artifact to a resource or service")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact updated", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 403, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 409, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.model.ArtifactDefinition", paramType = "body", value = "json describe the artifact")})
+ public Response updateArtifact(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The value for this header must be the MD5 checksum over the whole json body", required = true)@HeaderParam(value = Constants.MD5_HEADER) String checksum,
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID,
+ String data) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -305,12 +391,35 @@
@POST
@Path("/{assetType}/{uuid}/resourceInstances/{resourceInstanceName}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "updates an artifact on a resource instance", httpMethod = "POST", notes = "uploads of artifact to a resource or service", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact Updated"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response updateArtifactOnResourceInstance(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @PathParam("resourceInstanceName") final String resourceInstanceName,
- @PathParam("artifactUUID") final String artifactUUID, @ApiParam(value = "json describe the artifact", required = true) String data,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "updates an artifact on a resource instance", httpMethod = "POST", notes = "uploads of artifact to a resource or service")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact updated", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 403, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 409, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.model.ArtifactDefinition", paramType = "body", value = "json describe the artifact")})
+ public Response updateArtifactOnResourceInstance(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The value for this header must be the MD5 checksum over the whole json body", required = true)@HeaderParam(value = Constants.MD5_HEADER) String checksum,
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID,
+ @ApiParam(value = "The component instance name (as publishedin the response of the detailed query)", required = true)@PathParam("resourceInstanceName") final String resourceInstanceName,
+ String data) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -378,10 +487,31 @@
@Path("/{assetType}/{uuid}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "deletes an artifact of a resource or service", httpMethod = "DELETE", notes = "deletes an artifact of a resource or service", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact Deleted"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response deleteArtifact(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @PathParam("artifactUUID") final String artifactUUID,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ /*@ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact Deleted"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
+ @ApiResponse(code = 404, message = "Asset not found") })*/
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact deleted", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 403, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 409, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ public Response deleteArtifact(
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -448,11 +578,30 @@
@Path("{assetType}/{uuid}/resourceInstances/{resourceInstanceName}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_JSON)
@ApiOperation(value = "deletes an artifact of a resource insatnce", httpMethod = "DELETE", notes = "deletes an artifact of a resource insatnce", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact Deleted"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response deleteArtifactOnResourceInstance(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @PathParam("resourceInstanceName") final String resourceInstanceName,
- @PathParam("artifactUUID") final String artifactUUID,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact deleted", response = ArtifactDefinition.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "Invalid artifactType was defined as input - SVC4122"),
+ @ApiResponse(code = 400, message = "Artifact type (mandatory field) is missing in request - SVC4124"),
+ @ApiResponse(code = 400, message = "Invalid MD5 header - SVC4127"),
+ @ApiResponse(code = 400, message = "Artifact name is missing in input - SVC4128"),
+ @ApiResponse(code = 403, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4086"),
+ @ApiResponse(code = 409, message = "Restricted Operation – the user provided does not have role of Designer or the asset is being used by another designer - SVC4301")})
+ public Response deleteArtifactOnResourceInstance(
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID,
+ @ApiParam(value = "The component instance name (as publishedin the response of the detailed query)", required = true)@PathParam("resourceInstanceName") final String resourceInstanceName) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -519,13 +668,25 @@
@GET
@Path("/{assetType}/{uuid}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
- @ApiOperation(value = "Download component artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact downloaded"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Artifact not found") })
+ @ApiOperation(value = "Download component artifact", httpMethod = "GET", notes = "Returns downloaded artifact")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact downloaded", response = String.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 404, message = "Artifact was not found - SVC4505")})
public Response downloadComponentArtifact(
- @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("assetType") final String assetType,
- @PathParam("uuid") final String uuid, @PathParam("artifactUUID") final String artifactUUID,
- @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
@@ -587,12 +748,25 @@
@Path("/{assetType}/{uuid}/resourceInstances/{resourceInstanceName}/artifacts/{artifactUUID}")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@ApiOperation(value = "Download resource instance artifact", httpMethod = "GET", notes = "Returns downloaded artifact", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact downloaded"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Artifact not found") })
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Artifact downloaded", response = String.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Specified resource is not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed: Invalid HTTP method type used (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem or Cambria Service failure. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 404, message = "Artifact was not found - SVC4505")})
public Response downloadResourceInstanceArtifact(
- @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("assetType") final String assetType,
- @PathParam("uuid") final String uuid, @PathParam("resourceInstanceName") final String resourceInstanceName, @PathParam("artifactUUID") final String artifactUUID,
- @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiParam(value = "The user ID of the DCAE Designer. This user must also have Designer role in SDC", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The uuid of the asset as published in the metadata", required = true)@PathParam("uuid") final String uuid,
+ @ApiParam(value = "The uuid of the artifact as published in the asset detailed metadata or in the response of the upload / update operation", required = true)@PathParam("artifactUUID") final String artifactUUID,
+ @ApiParam(value = "The component instance name (as publishedin the response of the detailed query)", required = true)@PathParam("resourceInstanceName") final String resourceInstanceName) {
Wrapper<Response> responseWrapper = new Wrapper<>();
ResponseFormat responseFormat = null;
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
index f625168..ce8b967 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServlet.java
@@ -21,23 +21,17 @@
package org.openecomp.sdc.be.externalapi.servlet;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
import javax.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -46,47 +40,23 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.elasticsearch.common.Strings;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
import org.openecomp.sdc.be.components.impl.ComponentBusinessLogic;
import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
-import org.openecomp.sdc.be.components.impl.ImportUtils;
-import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
-import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
-import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoBase;
-import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
import org.openecomp.sdc.be.config.BeEcompErrorManager;
import org.openecomp.sdc.be.dao.api.ActionStatus;
-import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
-import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
-import org.openecomp.sdc.be.model.LifecycleStateEnum;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.be.model.category.CategoryDefinition;
-import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
import org.openecomp.sdc.be.servlets.RepresentationUtils;
-import org.openecomp.sdc.be.utils.CommonBeUtils;
import org.openecomp.sdc.common.api.Constants;
-import org.openecomp.sdc.common.config.EcompErrorName;
import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
-import org.openecomp.sdc.common.datastructure.Wrapper;
import org.openecomp.sdc.common.util.GeneralUtility;
-import org.openecomp.sdc.common.util.ValidationUtils;
import org.openecomp.sdc.exception.ResponseFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,26 +90,29 @@
/**
*
+ * @param requestId
+ * @param instanceIdHeader
+ * @param accept
+ * @param authorization
* @param assetType
* @param category
* @param subCategory
* @param distributionStatus
* @param resourceType
- * @param instanceIdHeader
* @return
*/
@GET
@Path("/{assetType}")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Fetch list of assets", httpMethod = "GET", notes = "Returns list of assets", response = AssetMetadata.class, responseContainer="List")
+ @ApiOperation(value = "Fetch list of assets", httpMethod = "GET", notes = "Returns list of assets")
@ApiResponses(value = {
@ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"),
@ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
@ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
@ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
- @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used to register for distribution (PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
@ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
- public Response getAssetList(
+ public Response getAssetListExternal(
@ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
@ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
@ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
@@ -176,7 +149,7 @@
ElementBusinessLogic elementLogic = getElementBL(context);
AssetMetadataConverter assetMetadataUtils = getAssetUtils(context);
- Map<FilterKeyEnum, String> filters = new HashMap<FilterKeyEnum, String>();
+ Map<FilterKeyEnum, String> filters = new EnumMap<>(FilterKeyEnum.class);
if (category != null) {
filters.put(FilterKeyEnum.CATEGORY, category);
@@ -230,20 +203,33 @@
/**
*
+ * @param requestId
+ * @param instanceIdHeader
+ * @param accept
+ * @param authorization
* @param assetType
* @param uuid
- * @param request
- * @param instanceIdHeader
* @return
*/
@GET
@Path("/{assetType}/{uuid}/metadata")
@Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Fetch metadata of asset by uuid", httpMethod = "GET", notes = "Returns metadata of asset", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Assets Fetched"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response getAssetListByUuid(@PathParam("assetType") final String assetType, @PathParam("uuid") final String uuid, @Context final HttpServletRequest request,
- @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "Detailed metadata of asset by uuid", httpMethod = "GET", notes = "Returns detailed metadata of an asset by uuid")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = AssetMetadata.class, responseContainer="List"),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
+ public Response getAssetSpecificMetadataByUuidExternal(
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The requested asset uuid", required = true)@PathParam("uuid") final String uuid) {
Response response = null;
ResponseFormat responseFormat = null;
@@ -252,7 +238,7 @@
String url = request.getMethod() + " " + requestURI;
log.debug("Start handle request of {}", url);
- EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<AuditingFieldsKeysEnum, Object>(AuditingFieldsKeysEnum.class);
+ EnumMap<AuditingFieldsKeysEnum, Object> additionalParam = new EnumMap<>(AuditingFieldsKeysEnum.class);
ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_CONSUMER_ID, instanceIdHeader);
additionalParam.put(AuditingFieldsKeysEnum.AUDIT_DISTRIBUTION_RESOURCE_URL, requestURI);
@@ -306,21 +292,33 @@
/**
*
- * @param uuid
- * @param assetType
- * @param authorization
+ * @param requestId
* @param instanceIdHeader
+ * @param accept
+ * @param authorization
+ * @param assetType
+ * @param uuid
* @return
*/
@GET
@Path("/{assetType}/{uuid}/toscaModel")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
- @ApiOperation(value = "Fetch asset csar", httpMethod = "GET", notes = "Returns asset csar", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Asset Model Fetched"), @ApiResponse(code = 401, message = "Authorization required"), @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 404, message = "Asset not found") })
- public Response getToscaModel(@PathParam("uuid") final String uuid,
- @ApiParam(value = "valid values: resources / services", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam("assetType") final String assetType,
- @HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization, @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
+ @ApiOperation(value = "Fetch assets CSAR", httpMethod = "GET", notes = "Returns asset csar", response = String.class)
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "ECOMP component is authenticated and list of Catalog Assets Metadata is returned", response = String.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000")})
+ public Response getToscaModelExternal(
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ @ApiParam(value = "The requested asset uuid", required = true)@PathParam("uuid") final String uuid) {
String url = request.getRequestURI();
log.debug("Start handle request of {} {}", request.getMethod(), url);
@@ -372,443 +370,4 @@
return response;
}
}
-
- /**
- * Creates a new Resource
- *
- * @param assetType
- * @param data
- * @param userId
- * @param instanceIdHeader
- * @return
- */
- @POST
- @Path("/{assetType}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "creates a resource", httpMethod = "POST", notes = "creates a resource", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Artifact uploaded"),
- @ApiResponse(code = 401, message = "Authorization required"),
- @ApiResponse(code = 403, message = "Restricted operation"),
- @ApiResponse(code = 201, message = "Resource created"), @ApiResponse(code = 400, message = "Invalid content / Missing content"),
- @ApiResponse(code = 409, message = "Resource already exist") })
- public Response createResource(@PathParam("assetType") final String assetType,
- @ApiParam(value = "json describe the artifact", required = true) String data,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
- @HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader) {
-
- init(log);
-
- Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
- String requestURI = request.getRequestURI();
- String url = request.getMethod() + " " + requestURI;
- log.debug("Start handle request of {}", url);
- Resource resource = null;
- User modifier = null;
- EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
- ServletContext context = request.getSession().getServletContext();
- ResourceBusinessLogic resourceBL = getResourceBL(context);
- try {
- // Validate X-ECOMP-InstanceID Header
- if (responseWrapper.isEmpty()) {
- validateXECOMPInstanceIDHeader(instanceIdHeader, responseWrapper);
- }
- // Validate USER_ID Header
- if (responseWrapper.isEmpty()) {
- validateHttpCspUserIdHeader(userId, responseWrapper);
- }
- // Validate assetType
- if (responseWrapper.isEmpty()) {
- if( !AssetTypeEnum.RESOURCES.getValue().equals(assetType) ){
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
- }
- }
- //Validate resource type
- if(responseWrapper.isEmpty()){
- JSONParser parser = new JSONParser();
- JSONObject jsonObj = (JSONObject) parser.parse(data);
- String resourceType = (String) jsonObj.get(FilterKeyEnum.RESOURCE_TYPE.getName());
- if( StringUtils.isEmpty(resourceType) || !ResourceTypeEnum.containsName(resourceType) ){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, (String) jsonObj.get("name"));
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
- }
- }
- // Convert the user json to a resource
- if (responseWrapper.isEmpty()) {
- modifier = new User();
- modifier.setUserId(userId);
- Either<Resource, ResponseFormat> eitherResource = getComponentsUtils()
- .convertJsonToObjectUsingObjectMapper(data, modifier, Resource.class,
- null, ComponentTypeEnum.RESOURCE);
- if( eitherResource.isRight() ){
- responseWrapper.setInnerElement(eitherResource.right().value());
- }
- else{
- resource = eitherResource.left().value();
- }
-
- }
- //validate name exist
- if(responseWrapper.isEmpty()){
- if( Strings.isEmpty(resource.getName())){
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
- ActionStatus.MISSING_COMPONENT_NAME, ComponentTypeEnum.RESOURCE.getValue()));
-
- }
- }
-
- if(responseWrapper.isEmpty()){
- resource.setDerivedFrom(Arrays.asList("tosca.nodes.Root"));
- resource.setSystemName(ValidationUtils.convertToSystemName(resource.getName()));
- resource.setToscaResourceName(CommonBeUtils.generateToscaResourceName(ResourceTypeEnum.VFCMT.name(),
- resource.getSystemName()));
- handleCategories(context, data, resource, responseWrapper);
- }
- // Create the resource in the dataModel
- if (responseWrapper.isEmpty()) {
- Either<Resource, ResponseFormat> eitherCreateResponse = resourceBL.createResource(resource, null,
- modifier, null, null);
- if (eitherCreateResponse.isRight()) {
- responseWrapper.setInnerElement(eitherCreateResponse.right().value());
- } else {
- resource = eitherCreateResponse.left().value();
- }
- }
- Response response;
- //Build Response and store it in the response Wrapper
- if (responseWrapper.isEmpty()) {
- response = buildCreatedResourceResponse(resource, context, responseWrapper);
- }
- else{
- response = buildErrorResponse(responseWrapper.getInnerElement());
- }
- return response;
-
- } catch (Exception e) {
- final String message = "failed to create vfc monitoring template resource";
- BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
- log.debug(message, e);
- return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
- }
- finally{
- prepareAdditionalAudit(resource, additionalParams);
-
- getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
- ComponentTypeEnum.RESOURCE.getValue(), AuditingActionEnum.CREATE_RESOURCE_BY_API.getName(), request,
- additionalParams);
- }
- }
-
- /**
- * Changing the lifecycle of an asset
- * @param jsonChangeInfo The description - request body
- * @param assetType The requested asset type.Valid values are: resources / services (for VFCMT – use "resources")
- * @param uuid The uuid of the desired resource to be changed
- * @param lifecycleTransition The lifecycle operation to be performed on the asset.Valid values are:Checkin / Checkout / CERTIFICATION_REQUEST
- * @param userId
- * @return
- */
- @POST
- @Path("/{assetType}/{uuid}/lifecycleState/{lifecycleOperation}")
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Change Resource lifecycle State", httpMethod = "POST", response = Response.class)
- @ApiResponses(value = { @ApiResponse(code = 200, message = "Resource state changed"), @ApiResponse(code = 403, message = "Asset is already checked-out by another user")})
- public Response changeResourceState(@ApiParam(value = "LifecycleChangeInfo - relevant for checkin", required = false) String jsonChangeInfo,
- @ApiParam(value = "validValues: resources / services ", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam(value = "assetType") final String assetType,
- @ApiParam(value = "id of component to be changed") @PathParam(value = "uuid") final String uuid,
- @ApiParam(allowableValues = "checkout, checkin", required = true) @PathParam(value = "lifecycleOperation") final String lifecycleTransition,
- @HeaderParam(value = Constants.USER_ID_HEADER) final String userId) {
-
- Response response = null;
- EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
-
- init(log);
-
- String requestURI = request.getRequestURI();
- String url = request.getMethod() + " " + requestURI;
- log.debug("Start handle request of {}", url);
-
- //get the business logic
- ServletContext context = request.getSession().getServletContext();
- LifecycleBusinessLogic businessLogic = getLifecycleBL(context);
-
- Wrapper<ResponseFormat> responseWrapper = runValidations(assetType);
- ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
- Component component = null;
- Component responseObject = null;
- User modifier = null;
-
- try{
- if (responseWrapper.isEmpty()) {
- //get user
- Either<User, ResponseFormat> eitherGetUser = getUser(request, userId);
- if (eitherGetUser.isRight()) {
- ResponseFormat responseFormat = eitherGetUser.right().value();
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- }
- modifier = eitherGetUser.left().value();
-
- //get the component id from the uuid
- Either<Component, ResponseFormat> latestVersion = businessLogic.getLatestComponentByUuid(componentType, uuid);
- if (latestVersion.isRight()) {
- ResponseFormat responseFormat = latestVersion.right().value();
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- }
- component = latestVersion.left().value();
- String componentId = component.getUniqueId();
-
- //validate the transition is valid
- Either<LifeCycleTransitionEnum, ResponseFormat> validateEnum = validateTransitionEnum(lifecycleTransition, modifier);
- if (validateEnum.isRight()) {
- ResponseFormat responseFormat = validateEnum.right().value();
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- }
- LifeCycleTransitionEnum transitionEnum = validateEnum.left().value();
-
- //create changeInfo
- LifecycleChangeInfoWithAction changeInfo = new LifecycleChangeInfoWithAction();
- try {
- if (jsonChangeInfo != null && !jsonChangeInfo.isEmpty()) {
- ObjectMapper mapper = new ObjectMapper();
- changeInfo = new LifecycleChangeInfoWithAction(mapper.readValue(jsonChangeInfo, LifecycleChangeInfoBase.class).getUserRemarks());
- }
- }
- catch (Exception e) {
- BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeInvalidJsonInput, "convertJsonToObject");
- BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
- log.debug("failed to convert from json {}", jsonChangeInfo, e);
- ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorAndAudit(modifier, AuditingActionEnum.CHECKOUT_RESOURCE);
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- }
-
- //execute business logic
- Either<? extends Component, ResponseFormat> actionResponse = businessLogic.changeComponentState(componentType, componentId, modifier, transitionEnum, changeInfo, false, true);
- if (actionResponse.isRight()) {
- log.info("failed to change resource state");
- ResponseFormat responseFormat = actionResponse.right().value();
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- }
-
- log.debug("change state successful !!!");
- responseObject = actionResponse.left().value();
- response = buildCreatedResourceResponse(responseObject, context, responseWrapper);
- } else {
- response = buildErrorResponse(responseWrapper.getInnerElement());
- }
-
- return response;
- } catch (Exception e) {
- BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeRestApiGeneralError, "Change Lifecycle State");
- BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Change Lifecycle State");
- log.debug("change lifecycle state failed with exception", e);
- ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
- responseWrapper.setInnerElement(responseFormat);
- return buildErrorResponse(responseFormat);
- } finally{
- auditChnageLifecycleAction(additionalParams, responseWrapper, componentType, component, responseObject, modifier, userId);
- }
- }
-
- private void prepareAdditionalAudit(Resource resource, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, StringUtils.EMPTY);
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, StringUtils.EMPTY);
-
- if( resource != null ){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION);
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resource.getName());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, resource.getUUID());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, resource.getInvariantUUID());
- } else {
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, StringUtils.EMPTY);
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, StringUtils.EMPTY);
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, StringUtils.EMPTY);
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, StringUtils.EMPTY);
- }
- }
-
- private Response buildCreatedResourceResponse(Component resource, ServletContext context,
- Wrapper<ResponseFormat> responseWrapper) throws IOException, JsonGenerationException, JsonMappingException {
- ResponseFormat responseFormat;
- Response response;
- AssetMetadataConverter assetMetadataUtils = getAssetUtils(context);
- Either<? extends AssetMetadata, ResponseFormat> resMetadata = assetMetadataUtils
- .convertToSingleAssetMetadata(resource, request.getRequestURL().toString(),
- true);
- if (resMetadata.isRight()) {
- log.debug("Asset conversion Failed");
- responseFormat = resMetadata.right().value();
- responseWrapper.setInnerElement(responseFormat);
- response = buildErrorResponse(responseFormat);
- }else{
- final AssetMetadata assetData = resMetadata.left().value();
- assetData.setToscaModelURL(null);
-
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.CREATED));
- Object representation = RepresentationUtils.toRepresentation(assetData);
- response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), representation);
- }
- return response;
- }
-
- private void handleCategories(ServletContext context, String data, Resource resource,
- Wrapper<ResponseFormat> responseWrapper) {
- try {
- JSONParser parser = new JSONParser();
- JSONObject jsonObj = (JSONObject) parser.parse(data);
- String category = (String) jsonObj.get(CategoryTypeEnum.CATEGORY.getValue());
- String subcategory = (String) jsonObj.get(CategoryTypeEnum.SUBCATEGORY.getValue());
- if (Strings.isEmpty(category)) {
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
- ActionStatus.COMPONENT_MISSING_CATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
- }
- else if (Strings.isEmpty(subcategory)) {
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
- ActionStatus.COMPONENT_MISSING_SUBCATEGORY));
- }
- if (responseWrapper.isEmpty()) {
- ElementBusinessLogic elementLogic = getElementBL(context);
- // get All Categories
- Either<List<CategoryDefinition>, ActionStatus> allResourceCategories = elementLogic
- .getAllResourceCategories();
- // Error fetching categories
- if (allResourceCategories.isRight()) {
- responseWrapper.setInnerElement(
- getComponentsUtils().getResponseFormat(allResourceCategories.right().value()));
- } else {
- addCategories(resource, category, subcategory, allResourceCategories, responseWrapper);
- }
- }
- } catch (Exception e) {
- log.debug("Exception occured in addCategories: {}", e.getMessage(), e);
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
- }
-
- }
-
- private void addCategories(Resource resource, String category, String subcategory,
- Either<List<CategoryDefinition>, ActionStatus> allResourceCategories,
- Wrapper<ResponseFormat> responseWrapper) {
- Optional<CategoryDefinition> optionalCategory =
- // Stream of all the categories
- allResourceCategories.left().value().stream()
- // filter in only relevant category
- .filter(e -> e.getName().equals(category))
- // get the result
- .findAny();
- if (!optionalCategory.isPresent()) {
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
- ActionStatus.COMPONENT_INVALID_CATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
- } else {
- CategoryDefinition categoryDefinition = optionalCategory.get();
-
- List<SubCategoryDefinition> subCaregories =
- // Stream of all sub-categories of the relevant
- // category
- categoryDefinition.getSubcategories().stream()
- // filter in only relevant sub-category
- .filter(e -> e.getName().equals(subcategory))
- // get the result
- .collect(Collectors.toList());
-
- if( subCaregories.isEmpty() ){
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
- ActionStatus.COMPONENT_INVALID_SUBCATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
- }
- else{
- categoryDefinition.setSubcategories(subCaregories);
- resource.setCategories(Arrays.asList(categoryDefinition));
- }
-
- }
- }
-
-
-
-
- private void auditChnageLifecycleAction(EnumMap<AuditingFieldsKeysEnum, Object> additionalParams,
- Wrapper<ResponseFormat> responseWrapper, ComponentTypeEnum componentType, Component component,
- Component responseObject, User modifier, String userId) {
- if (modifier!=null){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFullName());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
- } else {
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, userId);
- }
-
- if (component!=null){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, component.getName());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, component.getVersion());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, component.getLifecycleState().name());
- } else {
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, "");
- }
-
- if (responseObject!=null){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, responseObject.getVersion());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, responseObject.getUUID());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, responseObject.getInvariantUUID());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,responseObject.getLifecycleState().name());
- } else {
- if (component!=null){
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, component.getVersion());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, component.getUUID());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, component.getInvariantUUID());
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,component.getLifecycleState().name());
- } else {
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, "");
- additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,"");
- }
- }
-
- getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
- componentType.getValue(), AuditingActionEnum.CHANGE_LIFECYCLE_BY_API.getName(), request,
- additionalParams);
- }
-
- private Wrapper<ResponseFormat> runValidations(final String assetType) {
- Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
-
- // Validate X-ECOMP-InstanceID Header
- if (responseWrapper.isEmpty()) {
- String instanceId = request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER);
- validateXECOMPInstanceIDHeader(instanceId,responseWrapper);
- }
- // Validate USER_ID Header
- if (responseWrapper.isEmpty()) {
- validateHttpCspUserIdHeader(request.getHeader(Constants.USER_ID_HEADER),responseWrapper);
- }
- // Validate assetType
- if (responseWrapper.isEmpty()) {
- if( !AssetTypeEnum.RESOURCES.getValue().equals(assetType) && !AssetTypeEnum.SERVICES.getValue().equals(assetType)){
- responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
- }
- }
-
- return responseWrapper;
- }
-
- private Either<LifeCycleTransitionEnum, ResponseFormat> validateTransitionEnum(final String lifecycleTransition, User user) {
- LifeCycleTransitionEnum transitionEnum = LifeCycleTransitionEnum.CHECKOUT;
- try {
- transitionEnum = LifeCycleTransitionEnum.getFromDisplayName(lifecycleTransition);
- } catch (IllegalArgumentException e) {
- log.info("state operation is not valid. operations allowed are: {}", LifeCycleTransitionEnum.valuesAsString());
- ResponseFormat error = getComponentsUtils().getInvalidContentErrorAndAudit(user, AuditingActionEnum.CHECKOUT_RESOURCE);
- return Either.right(error);
- }
- return Either.left(transitionEnum);
- }
-
}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java
new file mode 100644
index 0000000..b88fa90
--- /dev/null
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/externalapi/servlet/CrudExternalServlet.java
@@ -0,0 +1,569 @@
+package org.openecomp.sdc.be.externalapi.servlet;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.inject.Singleton;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jackson.JsonGenerationException;
+import org.codehaus.jackson.map.JsonMappingException;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.elasticsearch.common.Strings;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.openecomp.sdc.be.components.impl.ElementBusinessLogic;
+import org.openecomp.sdc.be.components.impl.ImportUtils;
+import org.openecomp.sdc.be.components.impl.ResourceBusinessLogic;
+import org.openecomp.sdc.be.components.lifecycle.LifecycleBusinessLogic;
+import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoBase;
+import org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction;
+import org.openecomp.sdc.be.config.BeEcompErrorManager;
+import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datamodel.api.CategoryTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.AssetTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
+import org.openecomp.sdc.be.datatypes.enums.FilterKeyEnum;
+import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum;
+import org.openecomp.sdc.be.ecomp.converters.AssetMetadataConverter;
+import org.openecomp.sdc.be.externalapi.servlet.representation.AssetMetadata;
+import org.openecomp.sdc.be.model.Component;
+import org.openecomp.sdc.be.model.LifeCycleTransitionEnum;
+import org.openecomp.sdc.be.model.LifecycleStateEnum;
+import org.openecomp.sdc.be.model.Resource;
+import org.openecomp.sdc.be.model.User;
+import org.openecomp.sdc.be.model.category.CategoryDefinition;
+import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
+import org.openecomp.sdc.be.resources.data.auditing.AuditingActionEnum;
+import org.openecomp.sdc.be.servlets.AbstractValidationsServlet;
+import org.openecomp.sdc.be.servlets.RepresentationUtils;
+import org.openecomp.sdc.be.utils.CommonBeUtils;
+import org.openecomp.sdc.common.api.Constants;
+import org.openecomp.sdc.common.config.EcompErrorName;
+import org.openecomp.sdc.common.datastructure.AuditingFieldsKeysEnum;
+import org.openecomp.sdc.common.datastructure.Wrapper;
+import org.openecomp.sdc.common.util.ValidationUtils;
+import org.openecomp.sdc.exception.ResponseFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.jcabi.aspects.Loggable;
+
+import fj.data.Either;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+@Loggable(prepend = true, value = Loggable.DEBUG, trim = false)
+@Path("/v1/catalog")
+@Api(value = "CRUD External Servlet", description = "This Servlet serves external users for creating assets and changing their lifecycle state")
+@Singleton
+public class CrudExternalServlet extends AbstractValidationsServlet {
+
+ @Context
+ private HttpServletRequest request;
+
+ private static Logger log = LoggerFactory.getLogger(CrudExternalServlet.class.getName());
+
+ /**
+ * Creates a new Resource
+ *
+ * @param assetType
+ * @param data
+ * @param userId
+ * @param instanceIdHeader
+ * @return
+ */
+ @POST
+ @Path("/{assetType}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "creates a resource", httpMethod = "POST", notes = "Creates a resource")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "ECOMP component is authenticated and Asset created", response = Resource.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 400, message = "The name provided for the newly created resource is already in use for another resource in SDC - SVC4050"),
+ @ApiResponse(code = 400, message = "Invalid field format. One of the provided fields does not comply with the field rules - SVC4126"),
+ @ApiResponse(code = 400, message = "Missing request body. The post request did not contain the expected body - SVC4500"),
+ @ApiResponse(code = 400, message = "The resource name is missing in the request body - SVC4062"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT description has wrong format - SVC4064"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT description has wrong format (exceeds limit) - SVC4065"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT tags exceeds character limit - SVC4066"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT vendor name exceeds character limit - SVC4067"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT vendor release exceeds character limit - SVC4068"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT ATT Contact has wrong format - SVC4069"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT name has wrong format - SVC4070"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT vendor name has wrong format - SVC4071"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT vendor release has wrong format - SVC4072"),
+ @ApiResponse(code = 400, message = "Create VFCMT request: VFCMT name exceeds character limit - SVC4073")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.model.Resource", paramType = "body", value = "json describe the created resource")})
+ public Response createResourceExternal(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The user id", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(value = "The requested asset type", required = true, allowableValues = "resources, services")@PathParam("assetType") final String assetType,
+ String data) {
+
+ init(log);
+
+ Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
+ String requestURI = request.getRequestURI();
+ String url = request.getMethod() + " " + requestURI;
+ log.debug("Start handle request of {}", url);
+ Resource resource = null;
+ User modifier = null;
+ EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
+ ServletContext context = request.getSession().getServletContext();
+ ResourceBusinessLogic resourceBL = getResourceBL(context);
+ try {
+ // Validate X-ECOMP-InstanceID Header
+ if (responseWrapper.isEmpty()) {
+ validateXECOMPInstanceIDHeader(instanceIdHeader, responseWrapper);
+ }
+ // Validate USER_ID Header
+ if (responseWrapper.isEmpty()) {
+ validateHttpCspUserIdHeader(userId, responseWrapper);
+ }
+ // Validate assetType
+ if (responseWrapper.isEmpty()) {
+ if( !AssetTypeEnum.RESOURCES.getValue().equals(assetType) ){
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
+ }
+ }
+ //Validate resource type
+ if(responseWrapper.isEmpty()){
+ JSONParser parser = new JSONParser();
+ JSONObject jsonObj = (JSONObject) parser.parse(data);
+ String resourceType = (String) jsonObj.get(FilterKeyEnum.RESOURCE_TYPE.getName());
+ if( StringUtils.isEmpty(resourceType) || !ResourceTypeEnum.containsName(resourceType) ){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, (String) jsonObj.get("name"));
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.INVALID_CONTENT));
+ }
+ }
+ // Convert the user json to a resource
+ if (responseWrapper.isEmpty()) {
+ modifier = new User();
+ modifier.setUserId(userId);
+ Either<Resource, ResponseFormat> eitherResource = getComponentsUtils()
+ .convertJsonToObjectUsingObjectMapper(data, modifier, Resource.class,
+ null, ComponentTypeEnum.RESOURCE);
+ if( eitherResource.isRight() ){
+ responseWrapper.setInnerElement(eitherResource.right().value());
+ }
+ else{
+ resource = eitherResource.left().value();
+ }
+
+ }
+ //validate name exist
+ if(responseWrapper.isEmpty()){
+ if( Strings.isEmpty(resource.getName())){
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
+ ActionStatus.MISSING_COMPONENT_NAME, ComponentTypeEnum.RESOURCE.getValue()));
+
+ }
+ }
+
+ if(responseWrapper.isEmpty()){
+ resource.setDerivedFrom(Arrays.asList("tosca.nodes.Root"));
+ resource.setSystemName(ValidationUtils.convertToSystemName(resource.getName()));
+ resource.setToscaResourceName(CommonBeUtils.generateToscaResourceName(ResourceTypeEnum.VFCMT.name(),
+ resource.getSystemName()));
+ handleCategories(context, data, resource, responseWrapper);
+ }
+ // Create the resource in the dataModel
+ if (responseWrapper.isEmpty()) {
+ Either<Resource, ResponseFormat> eitherCreateResponse = resourceBL.createResource(resource, null,
+ modifier, null, null);
+ if (eitherCreateResponse.isRight()) {
+ responseWrapper.setInnerElement(eitherCreateResponse.right().value());
+ } else {
+ resource = eitherCreateResponse.left().value();
+ }
+ }
+ Response response;
+ //Build Response and store it in the response Wrapper
+ if (responseWrapper.isEmpty()) {
+ response = buildCreatedResourceResponse(resource, context, responseWrapper);
+ }
+ else{
+ response = buildErrorResponse(responseWrapper.getInnerElement());
+ }
+ return response;
+
+ } catch (Exception e) {
+ final String message = "failed to create vfc monitoring template resource";
+ BeEcompErrorManager.getInstance().logBeRestApiGeneralError(message);
+ log.debug(message, e);
+ return buildErrorResponse(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+ }
+ finally{
+ prepareAdditionalAudit(resource, additionalParams);
+
+ getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
+ ComponentTypeEnum.RESOURCE.getValue(), AuditingActionEnum.CREATE_RESOURCE_BY_API.getName(), request,
+ additionalParams);
+ }
+ }
+
+ /**
+ * Changing the lifecycle of an asset
+ * @param jsonChangeInfo The description - request body
+ * @param assetType The requested asset type.Valid values are: resources / services (for VFCMT – use "resources")
+ * @param uuid The uuid of the desired resource to be changed
+ * @param lifecycleTransition The lifecycle operation to be performed on the asset.Valid values are:Checkin / Checkout / CERTIFICATION_REQUEST
+ * @param userId
+ * @return
+ */
+ @POST
+ @Path("/{assetType}/{uuid}/lifecycleState/{lifecycleOperation}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Change Resource lifecycle State", httpMethod = "POST")
+ @ApiResponses(value = {
+ @ApiResponse(code = 200, message = "Resource state changed", response = AssetMetadata.class),
+ @ApiResponse(code = 400, message = "Missing “X-ECOMP-InstanceID” HTTP header - POL5001"),
+ @ApiResponse(code = 401, message = "ECOMP component should authenticate itself and to re-send again HTTP request with its Basic Authentication credentials - POL5002"),
+ @ApiResponse(code = 403, message = "ECOMP component is not authorized - POL5003"),
+ @ApiResponse(code = 404, message = "Error: Requested '%1' (uuid) resource was not found - SVC4063"),
+ @ApiResponse(code = 405, message = "Method Not Allowed : Invalid HTTP method type used ( PUT,DELETE,POST will be rejected) - POL4050"),
+ @ApiResponse(code = 500, message = "The GET request failed either due to internal SDC problem. ECOMP Component should continue the attempts to get the needed information - POL5000"),
+ @ApiResponse(code = 403, message = "Asset is already checked-out by another user - SVC4085"),
+ @ApiResponse(code = 403, message = "Asset is being edited by different user. Only one user can checkout and edit an asset on given time. The asset will be available for checkout after the other user will checkin the asset - SVC4080")})
+ @ApiImplicitParams({@ApiImplicitParam(required = true, dataType = "org.openecomp.sdc.be.components.lifecycle.LifecycleChangeInfoWithAction", paramType = "body", value = "userRemarks - Short description (free text) about the asset version being changed")})
+ public Response changeResourceStateExternal(
+ @ApiParam(value = "Determines the format of the body of the request", required = true)@HeaderParam(value = Constants.CONTENT_TYPE_HEADER) String contenType,
+ @ApiParam(value = "The user id", required = true)@HeaderParam(value = Constants.USER_ID_HEADER) final String userId,
+ @ApiParam(value = "X-ECOMP-RequestID header", required = false)@HeaderParam(value = Constants.X_ECOMP_REQUEST_ID_HEADER) String requestId,
+ @ApiParam(value = "X-ECOMP-InstanceID header", required = true)@HeaderParam(value = Constants.X_ECOMP_INSTANCE_ID_HEADER) final String instanceIdHeader,
+ @ApiParam(value = "Determines the format of the body of the response", required = false)@HeaderParam(value = Constants.ACCEPT_HEADER) String accept,
+ @ApiParam(value = "The username and password", required = true)@HeaderParam(value = Constants.AUTHORIZATION_HEADER) String authorization,
+ @ApiParam(allowableValues = "checkout, checkin", required = true) @PathParam(value = "lifecycleOperation") final String lifecycleTransition,
+ @ApiParam(value = "id of component to be changed") @PathParam(value = "uuid") final String uuid,
+ @ApiParam(value = "validValues: resources / services ", allowableValues = ComponentTypeEnum.RESOURCE_PARAM_NAME + "," + ComponentTypeEnum.SERVICE_PARAM_NAME) @PathParam(value = "assetType") final String assetType,
+ String jsonChangeInfo) {
+
+ Response response = null;
+ EnumMap<AuditingFieldsKeysEnum, Object> additionalParams = new EnumMap<>(AuditingFieldsKeysEnum.class);
+
+ init(log);
+
+ String requestURI = request.getRequestURI();
+ String url = request.getMethod() + " " + requestURI;
+ log.debug("Start handle request of {}", url);
+
+ //get the business logic
+ ServletContext context = request.getSession().getServletContext();
+ LifecycleBusinessLogic businessLogic = getLifecycleBL(context);
+
+ Wrapper<ResponseFormat> responseWrapper = runValidations(assetType);
+ ComponentTypeEnum componentType = ComponentTypeEnum.findByParamName(assetType);
+ Component component = null;
+ Component responseObject = null;
+ User modifier = null;
+
+ try{
+ // Validate X-ECOMP-InstanceID Header
+ if (responseWrapper.isEmpty()) {
+ validateXECOMPInstanceIDHeader(instanceIdHeader, responseWrapper);
+ }
+
+ if (responseWrapper.isEmpty()) {
+ //get user
+ Either<User, ResponseFormat> eitherGetUser = getUser(request, userId);
+ if (eitherGetUser.isRight()) {
+ ResponseFormat responseFormat = eitherGetUser.right().value();
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ }
+ modifier = eitherGetUser.left().value();
+
+ //get the component id from the uuid
+ Either<Component, ResponseFormat> latestVersion = businessLogic.getLatestComponentByUuid(componentType, uuid);
+ if (latestVersion.isRight()) {
+ ResponseFormat responseFormat = latestVersion.right().value();
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ }
+ component = latestVersion.left().value();
+ String componentId = component.getUniqueId();
+
+ //validate the transition is valid
+ Either<LifeCycleTransitionEnum, ResponseFormat> validateEnum = validateTransitionEnum(lifecycleTransition, modifier);
+ if (validateEnum.isRight()) {
+ ResponseFormat responseFormat = validateEnum.right().value();
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ }
+ LifeCycleTransitionEnum transitionEnum = validateEnum.left().value();
+
+ //create changeInfo
+ LifecycleChangeInfoWithAction changeInfo = new LifecycleChangeInfoWithAction();
+ try {
+ if (jsonChangeInfo != null && !jsonChangeInfo.isEmpty()) {
+ ObjectMapper mapper = new ObjectMapper();
+ changeInfo = new LifecycleChangeInfoWithAction(mapper.readValue(jsonChangeInfo, LifecycleChangeInfoBase.class).getUserRemarks());
+ }
+ }
+ catch (Exception e) {
+ BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeInvalidJsonInput, "convertJsonToObject");
+ BeEcompErrorManager.getInstance().logBeInvalidJsonInput("convertJsonToObject");
+ log.debug("failed to convert from json {}", jsonChangeInfo, e);
+ ResponseFormat responseFormat = getComponentsUtils().getInvalidContentErrorAndAudit(modifier, AuditingActionEnum.CHECKOUT_RESOURCE);
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ }
+
+ //execute business logic
+ Either<? extends Component, ResponseFormat> actionResponse = businessLogic.changeComponentState(componentType, componentId, modifier, transitionEnum, changeInfo, false, true);
+ if (actionResponse.isRight()) {
+ log.info("failed to change resource state");
+ ResponseFormat responseFormat = actionResponse.right().value();
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ }
+
+ log.debug("change state successful !!!");
+ responseObject = actionResponse.left().value();
+ response = buildCreatedResourceResponse(responseObject, context, responseWrapper);
+ } else {
+ response = buildErrorResponse(responseWrapper.getInnerElement());
+ }
+
+ return response;
+ } catch (Exception e) {
+ BeEcompErrorManager.getInstance().processEcompError(EcompErrorName.BeRestApiGeneralError, "Change Lifecycle State");
+ BeEcompErrorManager.getInstance().logBeRestApiGeneralError("Change Lifecycle State");
+ log.debug("change lifecycle state failed with exception", e);
+ ResponseFormat responseFormat = getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR);
+ responseWrapper.setInnerElement(responseFormat);
+ return buildErrorResponse(responseFormat);
+ } finally{
+ auditChnageLifecycleAction(additionalParams, responseWrapper, componentType, component, responseObject, modifier, userId);
+ }
+ }
+
+ private void prepareAdditionalAudit(Resource resource, EnumMap<AuditingFieldsKeysEnum, Object> additionalParams) {
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, StringUtils.EMPTY);
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, StringUtils.EMPTY);
+
+ if( resource != null ){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION);
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, resource.getName());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, resource.getUUID());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, resource.getInvariantUUID());
+ } else {
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, StringUtils.EMPTY);
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE, StringUtils.EMPTY);
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, StringUtils.EMPTY);
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, StringUtils.EMPTY);
+ }
+ }
+
+ private Response buildCreatedResourceResponse(Component resource, ServletContext context,
+ Wrapper<ResponseFormat> responseWrapper) throws IOException, JsonGenerationException, JsonMappingException {
+ ResponseFormat responseFormat;
+ Response response;
+ AssetMetadataConverter assetMetadataUtils = getAssetUtils(context);
+ Either<? extends AssetMetadata, ResponseFormat> resMetadata = assetMetadataUtils
+ .convertToSingleAssetMetadata(resource, request.getRequestURL().toString(),
+ true);
+ if (resMetadata.isRight()) {
+ log.debug("Asset conversion Failed");
+ responseFormat = resMetadata.right().value();
+ responseWrapper.setInnerElement(responseFormat);
+ response = buildErrorResponse(responseFormat);
+ }else{
+ final AssetMetadata assetData = resMetadata.left().value();
+ assetData.setToscaModelURL(null);
+
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.CREATED));
+ Object representation = RepresentationUtils.toRepresentation(assetData);
+ response = buildOkResponse(getComponentsUtils().getResponseFormat(ActionStatus.CREATED), representation);
+ }
+ return response;
+ }
+
+ private void handleCategories(ServletContext context, String data, Resource resource,
+ Wrapper<ResponseFormat> responseWrapper) {
+ try {
+ JSONParser parser = new JSONParser();
+ JSONObject jsonObj = (JSONObject) parser.parse(data);
+ String category = (String) jsonObj.get(CategoryTypeEnum.CATEGORY.getValue());
+ String subcategory = (String) jsonObj.get(CategoryTypeEnum.SUBCATEGORY.getValue());
+ if (Strings.isEmpty(category)) {
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
+ ActionStatus.COMPONENT_MISSING_CATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
+ }
+ else if (Strings.isEmpty(subcategory)) {
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
+ ActionStatus.COMPONENT_MISSING_SUBCATEGORY));
+ }
+ if (responseWrapper.isEmpty()) {
+ ElementBusinessLogic elementLogic = getElementBL(context);
+ // get All Categories
+ Either<List<CategoryDefinition>, ActionStatus> allResourceCategories = elementLogic
+ .getAllResourceCategories();
+ // Error fetching categories
+ if (allResourceCategories.isRight()) {
+ responseWrapper.setInnerElement(
+ getComponentsUtils().getResponseFormat(allResourceCategories.right().value()));
+ } else {
+ addCategories(resource, category, subcategory, allResourceCategories, responseWrapper);
+ }
+ }
+ } catch (Exception e) {
+ log.debug("Exception occured in addCategories: {}", e.getMessage(), e);
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.GENERAL_ERROR));
+ }
+
+ }
+
+ private void addCategories(Resource resource, String category, String subcategory,
+ Either<List<CategoryDefinition>, ActionStatus> allResourceCategories,
+ Wrapper<ResponseFormat> responseWrapper) {
+ Optional<CategoryDefinition> optionalCategory =
+ // Stream of all the categories
+ allResourceCategories.left().value().stream()
+ // filter in only relevant category
+ .filter(e -> e.getName().equals(category))
+ // get the result
+ .findAny();
+ if (!optionalCategory.isPresent()) {
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
+ ActionStatus.COMPONENT_INVALID_CATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
+ } else {
+ CategoryDefinition categoryDefinition = optionalCategory.get();
+
+ List<SubCategoryDefinition> subCaregories =
+ // Stream of all sub-categories of the relevant
+ // category
+ categoryDefinition.getSubcategories().stream()
+ // filter in only relevant sub-category
+ .filter(e -> e.getName().equals(subcategory))
+ // get the result
+ .collect(Collectors.toList());
+
+ if( subCaregories.isEmpty() ){
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(
+ ActionStatus.COMPONENT_INVALID_SUBCATEGORY, ComponentTypeEnum.RESOURCE.getValue()));
+ }
+ else{
+ categoryDefinition.setSubcategories(subCaregories);
+ resource.setCategories(Arrays.asList(categoryDefinition));
+ }
+
+ }
+ }
+
+
+
+
+ private void auditChnageLifecycleAction(EnumMap<AuditingFieldsKeysEnum, Object> additionalParams,
+ Wrapper<ResponseFormat> responseWrapper, ComponentTypeEnum componentType, Component component,
+ Component responseObject, User modifier, String userId) {
+ if (modifier!=null){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, modifier.getFullName());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, modifier.getUserId());
+ } else {
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_NAME, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_MODIFIER_UID, userId);
+ }
+
+ if (component!=null){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, component.getName());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, component.getVersion());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, component.getLifecycleState().name());
+ } else {
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_NAME, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_VERSION, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_PREV_STATE, "");
+ }
+
+ if (responseObject!=null){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, responseObject.getVersion());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, responseObject.getUUID());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, responseObject.getInvariantUUID());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,responseObject.getLifecycleState().name());
+ } else {
+ if (component!=null){
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, component.getVersion());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, component.getUUID());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, component.getInvariantUUID());
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,component.getLifecycleState().name());
+ } else {
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_VERSION, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_SERVICE_INSTANCE_ID, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_INVARIANT_UUID, "");
+ additionalParams.put(AuditingFieldsKeysEnum.AUDIT_RESOURCE_CURR_STATE,"");
+ }
+ }
+
+ getComponentsUtils().auditExternalCrudApi(responseWrapper.getInnerElement(),
+ componentType.getValue(), AuditingActionEnum.CHANGE_LIFECYCLE_BY_API.getName(), request,
+ additionalParams);
+ }
+
+ private Wrapper<ResponseFormat> runValidations(final String assetType) {
+ Wrapper<ResponseFormat> responseWrapper = new Wrapper<>();
+
+ // Validate X-ECOMP-InstanceID Header
+ if (responseWrapper.isEmpty()) {
+ String instanceId = request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER);
+ validateXECOMPInstanceIDHeader(instanceId,responseWrapper);
+ }
+ // Validate USER_ID Header
+ if (responseWrapper.isEmpty()) {
+ validateHttpCspUserIdHeader(request.getHeader(Constants.USER_ID_HEADER),responseWrapper);
+ }
+ // Validate assetType
+ if (responseWrapper.isEmpty()) {
+ if( !AssetTypeEnum.RESOURCES.getValue().equals(assetType) && !AssetTypeEnum.SERVICES.getValue().equals(assetType)){
+ responseWrapper.setInnerElement(getComponentsUtils().getResponseFormat(ActionStatus.RESTRICTED_OPERATION));
+ }
+ }
+
+ return responseWrapper;
+ }
+
+ private Either<LifeCycleTransitionEnum, ResponseFormat> validateTransitionEnum(final String lifecycleTransition, User user) {
+ LifeCycleTransitionEnum transitionEnum = LifeCycleTransitionEnum.CHECKOUT;
+ try {
+ transitionEnum = LifeCycleTransitionEnum.getFromDisplayName(lifecycleTransition);
+ } catch (IllegalArgumentException e) {
+ log.info("state operation is not valid. operations allowed are: {}", LifeCycleTransitionEnum.valuesAsString());
+ ResponseFormat error = getComponentsUtils().getInvalidContentErrorAndAudit(user, AuditingActionEnum.CHECKOUT_RESOURCE);
+ return Either.right(error);
+ }
+ return Either.left(transitionEnum);
+ }
+
+}
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
index a7eac1b..65e4266 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java
@@ -42,22 +42,7 @@
import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
import org.openecomp.sdc.be.datatypes.components.ResourceMetadataDataDefinition;
import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
-import org.openecomp.sdc.be.model.ArtifactDefinition;
-import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.ComponentInstance;
-import org.openecomp.sdc.be.model.ComponentInstanceInput;
-import org.openecomp.sdc.be.model.ComponentInstanceProperty;
-import org.openecomp.sdc.be.model.DataTypeDefinition;
-import org.openecomp.sdc.be.model.GroupDefinition;
-import org.openecomp.sdc.be.model.GroupInstance;
-import org.openecomp.sdc.be.model.GroupProperty;
-import org.openecomp.sdc.be.model.InputDefinition;
-import org.openecomp.sdc.be.model.PropertyDefinition;
-import org.openecomp.sdc.be.model.RequirementAndRelationshipPair;
-import org.openecomp.sdc.be.model.RequirementCapabilityRelDef;
-import org.openecomp.sdc.be.model.RequirementDefinition;
-import org.openecomp.sdc.be.model.Resource;
-import org.openecomp.sdc.be.model.Service;
+import org.openecomp.sdc.be.model.*;
import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;
import org.openecomp.sdc.be.model.category.CategoryDefinition;
import org.openecomp.sdc.be.model.jsontitan.operations.ToscaOperationFacade;
@@ -106,7 +91,7 @@
private CapabiltyRequirementConvertor capabiltyRequirementConvertor = CapabiltyRequirementConvertor.getInstance();
private PropertyConvertor propertyConvertor = PropertyConvertor.getInstance();
-
+
private static Logger log = LoggerFactory.getLogger(ToscaExportHandler.class.getName());
public static final String TOSCA_VERSION = "tosca_simple_yaml_1_0";
@@ -121,16 +106,16 @@
public static final String VF_MODULE_TYPE_BASE = "Base";
public static final String VF_MODULE_TYPE_EXPANSION = "Expansion";
public static final List<Map<String, Map<String, String>>> DEFAULT_IMPORTS = ConfigurationManager.getConfigurationManager().getConfiguration().getDefaultImports();
-
-
-
+
+
+
public Either<ToscaRepresentation, ToscaError> exportComponent(Component component) {
Either<ToscaTemplate, ToscaError> toscaTemplateRes = convertToToscaTemplate(component);
if (toscaTemplateRes.isRight()) {
return Either.right(toscaTemplateRes.right().value());
}
-
+
ToscaTemplate toscaTemplate = toscaTemplateRes.left().value();
ToscaRepresentation toscaRepresentation = this.createToscaRepresentation(toscaTemplate);
return Either.left(toscaRepresentation);
@@ -141,15 +126,15 @@
log.debug("convertToToscaTemplate - failed to get Default Imports section from configuration");
return Either.right(ToscaError.GENERAL_ERROR);
}
-
+
ToscaTemplate toscaTemplate = new ToscaTemplate(TOSCA_VERSION);
toscaTemplate.setImports(new ArrayList<>(DEFAULT_IMPORTS));
Map<String, ToscaNodeType> nodeTypes = new HashMap<>();
Either<ToscaTemplate, ToscaError> toscaTemplateRes = convertInterfaceNodeType(component, toscaTemplate, nodeTypes);
if (toscaTemplateRes.isRight()) {
return Either.right(toscaTemplateRes.right().value());
- }
-
+ }
+
toscaTemplate = toscaTemplateRes.left().value();
ToscaRepresentation toscaRepresentation = this.createToscaRepresentation(toscaTemplate);
return Either.left(toscaRepresentation);
@@ -179,10 +164,10 @@
ToscaRepresentation toscaRepresentation = new ToscaRepresentation();
toscaRepresentation.setMainYaml(sb.toString());
toscaRepresentation.setDependencies(toscaTemplate.getDependencies());
-
+
return toscaRepresentation;
}
-
+
public Either<ToscaTemplate, ToscaError> getDependencies(Component component) {
ToscaTemplate toscaTemplate = new ToscaTemplate(null);
Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports = fillImports(component,
@@ -198,7 +183,7 @@
log.debug("convertToToscaTemplate - failed to get Default Imports section from configuration");
return Either.right(ToscaError.GENERAL_ERROR);
}
-
+
log.trace("start tosca export for {}", component.getUniqueId());
ToscaTemplate toscaTemplate = new ToscaTemplate(TOSCA_VERSION);
@@ -353,10 +338,10 @@
case SERVICE:
toscaMetadata.setType(component.getComponentType().getValue());
if (!isInstance) {
- // DE268546
+ // DE268546
toscaMetadata.setServiceEcompNaming(((Service)component).isEcompGeneratedNaming());
toscaMetadata.setEcompGeneratedNaming(((Service)component).isEcompGeneratedNaming());
- toscaMetadata.setNamingPolicy(((Service)component).getNamingPolicy());
+ toscaMetadata.setNamingPolicy(((Service)component).getNamingPolicy());
}
break;
default:
@@ -367,26 +352,26 @@
private Either<ImmutablePair<ToscaTemplate, Map<String, Component>>, ToscaError> fillImports(Component component,
ToscaTemplate toscaTemplate) {
-
+
if(null == DEFAULT_IMPORTS) {
log.debug("convertToToscaTemplate - failed to get Default Imports section from configuration");
return Either.right(ToscaError.GENERAL_ERROR);
}
-
+
Map<String, Component> componentCache = new HashMap<>();
if (!ToscaUtils.isAtomicType(component)) {
List<ComponentInstance> componentInstances = component.getComponentInstances();
if (componentInstances != null && !componentInstances.isEmpty()) {
-
- List<Map<String, Map<String, String>>> additionalImports =
+
+ List<Map<String, Map<String, String>>> additionalImports =
toscaTemplate.getImports() == null ? new ArrayList<>(DEFAULT_IMPORTS) : new ArrayList<>(toscaTemplate.getImports());
-
+
List<Triple<String, String, Component>> dependecies = new ArrayList<>();
Map<String, ArtifactDefinition> toscaArtifacts = component.getToscaArtifacts();
ArtifactDefinition artifactDefinition = toscaArtifacts.get(ToscaExportHandler.ASSET_TOSCA_TEMPLATE);
-
+
Map<String, Map<String, String>> importsListMember = new HashMap<>();
Map<String, String> interfaceFiles = new HashMap<>();
interfaceFiles.put(IMPORTS_FILE_KEY, getInterfaceFilename(artifactDefinition.getArtifactName()));
@@ -397,7 +382,7 @@
keyNameBuilder.append("-interface");
importsListMember.put(keyNameBuilder.toString(), interfaceFiles);
additionalImports.add(importsListMember);
-
+
componentInstances.forEach(ci -> {
createDependency(componentCache, additionalImports, dependecies, ci);
});
@@ -406,7 +391,7 @@
}
} else {
log.debug("currently imports supported for VF and service only");
- }
+ }
return Either.left(new ImmutablePair<ToscaTemplate, Map<String, Component>>(toscaTemplate, componentCache));
}
@@ -440,7 +425,7 @@
imports.add(importsListMember);
dependecies.add(new ImmutableTriple<String, String, Component>(artifactName,
artifactDefinition.getEsId(), fetchedComponent));
-
+
if(!ToscaUtils.isAtomicType(componentRI)) {
importsListMember = new HashMap<>();
Map<String, String> interfaceFiles = new HashMap<>();
@@ -481,7 +466,7 @@
//Extracted to method for code reuse
return convertReqCapAndTypeName(component, toscaNode, nodeTypes, toscaNodeType, dataTypes);
}
-
+
private Either<ToscaTemplate, ToscaError> convertInterfaceNodeType(Component component, ToscaTemplate toscaNode,
Map<String, ToscaNodeType> nodeTypes) {
log.debug("start convert node type for {}", component.getUniqueId());
@@ -494,7 +479,7 @@
}
Map<String, DataTypeDefinition> dataTypes = dataTypesEither.left().value();
-
+
List<InputDefinition> inputDef = component.getInputs();
Map<String, ToscaProperty> inputs = new HashMap<>();
@@ -530,7 +515,7 @@
toscaNodeType = requirements.left().value();
log.debug("Requirements converted for {}", component.getUniqueId());
-
+
String toscaResourceName;
switch (component.getComponentType()) {
case RESOURCE:
@@ -570,7 +555,7 @@
nodeTemplate.setType(componentInstance.getToscaComponentName());
Either<ToscaNodeTemplate, ToscaError> requirements = convertComponentInstanceRequirements(component,
- componentInstance, component.getComponentInstancesRelations(), nodeTemplate);
+ componentInstance, component.getComponentInstancesRelations(), nodeTemplate, componentCache.get(componentInstance.getComponentUid()));
if (requirements.isRight()) {
convertNodeTemplatesRes = Either.right(requirements.right().value());
break;
@@ -583,15 +568,15 @@
Component componentOfInstance = componentCache.get(componentInstance.getComponentUid());
nodeTemplate.setMetadata(convertMetadata(componentOfInstance, true, componentInstance));
- Either<ToscaNodeTemplate, ToscaError> capabilties = capabiltyRequirementConvertor
+ Either<ToscaNodeTemplate, ToscaError> capabilities = capabiltyRequirementConvertor
.convertComponentInstanceCapabilties(componentInstance, dataTypes, nodeTemplate);
- if (capabilties.isRight()) {
+ if (capabilities.isRight()) {
convertNodeTemplatesRes = Either.right(requirements.right().value());
break;
}
- log.debug("Component instance Capabilties converted for instance {}", instanceUniqueId);
+ log.debug("Component instance Capabilities converted for instance {}", instanceUniqueId);
- nodeTemplate = capabilties.left().value();
+ nodeTemplate = capabilities.left().value();
Map<String, Object> props = new HashMap<>();
if (componentOfInstance.getComponentType() == ComponentTypeEnum.RESOURCE) {
@@ -786,7 +771,7 @@
} else {
Object value = null;
String type = gp.getType();
-
+
switch (type) {
case "integer":
if (gp.getValue() != null) {
@@ -798,7 +783,7 @@
value = Boolean.valueOf(gp.getValue());
}
break;
-
+
default:
value = gp.getValue();
break;
@@ -818,46 +803,46 @@
}
toscaNodeType.setDescription(component.getDescription()); // or name??
} else {
- String derivedFrom = null != component.getDerivedFromGenericType()? component.getDerivedFromGenericType() : "tosca.nodes.Root";
+ String derivedFrom = null != component.getDerivedFromGenericType()? component.getDerivedFromGenericType() : "tosca.nodes.Root";
toscaNodeType.setDerived_from(derivedFrom);
}
return toscaNodeType;
}
-
+
+ //TODO save the capability(type or name) info on relation data
private Either<ToscaNodeTemplate, ToscaError> convertComponentInstanceRequirements(Component component,
- ComponentInstance componentInstance, List<RequirementCapabilityRelDef> relations,
- ToscaNodeTemplate nodeTypeTemplate) {
+ ComponentInstance componentInstance, List<RequirementCapabilityRelDef> relations,
+ ToscaNodeTemplate nodeTypeTemplate, Component originComponent) {
List<ComponentInstance> instancesList = component.getComponentInstances();
List<Map<String, ToscaTemplateRequirement>> toscaRequirements = new ArrayList<>();
- Map<String, List<RequirementDefinition>> reqMap = componentInstance.getRequirements();
+ Map<String, List<RequirementDefinition>> reqMap = originComponent.getRequirements();
- relations.stream().filter(p -> componentInstance.getUniqueId().equals(p.getFromNode())).forEach(req -> {
+ relations.stream().filter(p -> componentInstance.getUniqueId().equals(p.getFromNode())).forEach(rel -> {
ComponentInstance toComponentInstance = instancesList.stream()
- .filter(i -> req.getToNode().equals(i.getUniqueId())).findFirst().orElse(null);
+ .filter(i -> rel.getToNode().equals(i.getUniqueId())).findFirst().orElse(null);
if (toComponentInstance == null) {
- log.debug("Faild to create relation between node {} to node {}", componentInstance.getName(),
- req.getToNode());
+ log.debug("Failed to find relation between node {} to node {}", componentInstance.getName(),
+ rel.getToNode());
return;
-
}
- RequirementAndRelationshipPair reqAndRelationshopPair = req.getRelationships().get(0);
+ RequirementAndRelationshipPair reqAndRelationshipPair = rel.getRelationships().get(0);
ToscaTemplateRequirement toscaRequirement = new ToscaTemplateRequirement();
- toscaRequirement.setRelationship(reqAndRelationshopPair.getRelationship().getType());
toscaRequirement.setNode(toComponentInstance.getName());
Optional<RequirementDefinition> findAny = reqMap.values().stream().flatMap(e -> e.stream())
- .filter(e -> e.getName().equals(reqAndRelationshopPair.getRequirement())).findAny();
+ .filter(e -> e.getName().equals(reqAndRelationshipPair.getRequirement())).findAny();
if (findAny.isPresent()) {
- RequirementDefinition regDefinition = findAny.get();
- toscaRequirement.setCapability(regDefinition.getCapability());
+ RequirementDefinition reqDefinition = findAny.get();
+ toscaRequirement.setCapability(reqDefinition.getCapability());
+ toscaRequirement.setRelationship(reqDefinition.getRelationship());
} else {
- log.debug("Faild to find relation between node {} to node {}", componentInstance.getName(),
- req.getToNode());
+ // reqMap represents calculated requirements! if not found there, export data directly from the relation definition
+ log.debug("Failed to find requirement {} definition for node {}", reqAndRelationshipPair.getRequirement(), componentInstance.getName());
return;
}
- Map<String, ToscaTemplateRequirement> reqmap = new HashMap<String, ToscaTemplateRequirement>();
- reqmap.put(reqAndRelationshopPair.getRequirement(), toscaRequirement);
- toscaRequirements.add(reqmap);
+ Map<String, ToscaTemplateRequirement> toscaReqMap = new HashMap<>();
+ toscaReqMap.put(reqAndRelationshipPair.getRequirement(), toscaRequirement);
+ toscaRequirements.add(toscaReqMap);
});
@@ -868,9 +853,10 @@
return Either.left(nodeTypeTemplate);
}
+
private Either<SubstitutionMapping, ToscaError> convertCapabilities(Component component, SubstitutionMapping substitutionMapping, Map<String, DataTypeDefinition> dataTypes) {
Map<String, String[]> toscaCapabilities = capabiltyRequirementConvertor.convertSubstitutionMappingCapabilities(component, dataTypes);
-
+
if (!toscaCapabilities.isEmpty()) {
substitutionMapping.setCapabilities(toscaCapabilities);
}
diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index b559d1b..9b7a55a 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -91,7 +91,7 @@
<init-param>
<param-name>swagger.api.title</param-name>
- <param-value>jersey1InternalAPIs</param-value>
+ <param-value>Internal API's</param-value>
</init-param>
<init-param>
@@ -114,7 +114,7 @@
</servlet>
<servlet>
- <servlet-name>ExternalAndDistribution-APIs-Configurations</servlet-name>
+ <servlet-name>External and Distribution API's</servlet-name>
<servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
<init-param>
@@ -124,7 +124,7 @@
<init-param>
<param-name>swagger.api.title</param-name>
- <param-value>jersey2DistributionAndExternalAPIs</param-value>
+ <param-value>DistributionAndExternalAPIs</param-value>
</init-param>
<init-param>
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
index 4251749..640a9d2 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/externalapi/servlet/AssetsDataServletTest.java
@@ -188,7 +188,7 @@
@Override
protected Application configure() {
- ResourceConfig resourceConfig = new ResourceConfig(AssetsDataServlet.class);
+ ResourceConfig resourceConfig = new ResourceConfig(CrudExternalServlet.class);
forceSet(TestProperties.CONTAINER_PORT, "0");
resourceConfig.register(new AbstractBinder() {
diff --git a/catalog-fe/src/main/webapp/WEB-INF/web.xml b/catalog-fe/src/main/webapp/WEB-INF/web.xml
index ac2e3bc..9c81055 100644
--- a/catalog-fe/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-fe/src/main/webapp/WEB-INF/web.xml
@@ -86,7 +86,7 @@
<async-supported>true</async-supported>
<init-param>
<param-name>mimeTypes</param-name>
- <param-value>text/html,text/plain,text/css,application/javascript,application/json</param-value>
+ <param-value>*/*</param-value>
</init-param>
<init-param>
<param-name>methods</param-name>
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java
index 407d711..d29f989 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/jsontitan/operations/BaseOperation.java
@@ -1350,7 +1350,7 @@
}
protected String buildGroupInstanceName(String instanceName, String groupName) {
- return ValidationUtils.normaliseComponentName(instanceName) + ".." + groupName;
+ return ValidationUtils.normalizeComponentInstanceName(instanceName) + ".." + groupName;
}
protected String generateCustomizationUUID() {
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
index bd57689..d282ecf 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/GroupInstanceOperation.java
@@ -878,7 +878,7 @@
}
private String buildGroupInstanceLogicalName(String instanceName, String groupName) {
- return instanceName + ".." + groupName;
+ return ValidationUtils.normalizeComponentInstanceName(instanceName) + ".." + groupName;
}
/**
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
index d8198da..f3189ee 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/tosca/converters/ToscaListValueConverter.java
@@ -109,19 +109,15 @@
asJsonArray.forEach(e -> {
Object convertedValue = null;
if (isScalarF) {
- String jsonAsString = e.toString();
- log.debug("try to convert scalar value {}", jsonAsString);
- if ( jsonAsString == null) {
- convertedValue = null;
+ if (e.isJsonPrimitive()) {
+ String jsonAsString = e.getAsString();
+ log.debug("try to convert scalar value {}", jsonAsString);
+ convertedValue = innerConverterFinal.convertToToscaValue(jsonAsString, innerType,
+ dataTypes);
} else {
- JsonElement singleElement = jsonParser.parse(jsonAsString);
- if (singleElement.isJsonPrimitive()) {
- convertedValue = innerConverterFinal.convertToToscaValue(jsonAsString, innerType,
- dataTypes);
- } else {
- convertedValue = handleComplexJsonValue(singleElement);
- }
+ convertedValue = handleComplexJsonValue(e);
}
+
} else {
JsonObject asJsonObject = e.getAsJsonObject();
Set<Entry<String, JsonElement>> entrySet = asJsonObject.entrySet();
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ResourceInstanceOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ResourceInstanceOperationTest.java
index 4f9488c..e631f6c 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ResourceInstanceOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/operations/impl/ResourceInstanceOperationTest.java
@@ -421,7 +421,7 @@
resourceInstance.setComponentUid(respurceUid);
resourceInstance.setCreationTime(System.currentTimeMillis());
resourceInstance.setModificationTime(System.currentTimeMillis());
- resourceInstance.setNormalizedName(normaliseComponentName(name));
+ resourceInstance.setNormalizedName(normaliseComponentInstanceName(name));
// Map<String, RequirementInstance> requirements = new HashMap<String,
// RequirementInstance>();
diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml
index 9923a6b..0505d91 100644
--- a/catalog-ui/pom.xml
+++ b/catalog-ui/pom.xml
@@ -47,9 +47,29 @@
</excludes>
<followSymlinks>false</followSymlinks>
</fileset>
+ <fileset>
+ <directory>${basedir}/node_modules</directory>
+ </fileset>
</filesets>
</configuration>
</execution>
+ <!-- <execution>
+ <id>clean.dist.folder</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/node_modules</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/dist</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </execution> -->
</executions>
</plugin>
@@ -80,9 +100,12 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.4</version>
-
+
+ <configuration>
+ <installDirectory>${project.parent.basedir}</installDirectory>
+ </configuration>
+
<executions>
-
<execution>
<id>install node and npm</id>
<goals>
@@ -94,6 +117,16 @@
<npmVersion>3.10.10</npmVersion>
</configuration>
</execution>
+
+ <execution>
+ <id>npm set progress off</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>set progress=false</arguments>
+ </configuration>
+ </execution>
<execution>
<id>npm install</id>
diff --git a/catalog-ui/src/app/app.ts b/catalog-ui/src/app/app.ts
index 7f85bb9..305327c 100644
--- a/catalog-ui/src/app/app.ts
+++ b/catalog-ui/src/app/app.ts
@@ -583,6 +583,8 @@
ng1appModule.value('PropertyNameValidationPattern', /^[a-zA-Z0-9_:-]{1,50}$/);// DE210977
ng1appModule.value('TagValidationPattern', /^[\s\w_.-]{1,50}$/);
ng1appModule.value('VendorValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,25}$/);
+ng1appModule.value('VendorNameValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,60}$/);
+ng1appModule.value('VendorModelNumberValidationPattern', /^[\x20-\x21\x23-\x29\x2B-\x2E\x30-\x39\x3B\x3D\x40-\x5B\x5D-\x7B\x7D-\xFF]{1,65}$/);
ng1appModule.value('ContactIdValidationPattern', /^[\s\w-]{1,50}$/);
ng1appModule.value('UserIdValidationPattern', /^[\s\w-]{1,50}$/);
ng1appModule.value('ProjectCodeValidationPattern', /^[\s\w-]{5,50}$/);
diff --git a/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts b/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts
index 971daba..87acab6 100644
--- a/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts
+++ b/catalog-ui/src/app/directives/graphs-v2/common/style/component-instances-nodes-style.ts
@@ -1,4 +1,7 @@
import {GraphColors} from "app/utils/constants";
+import constant = require("lodash/constant");
+import {ImagesUrl} from "app/utils/constants";
+import {AngularJSBridge} from "app/services/angular-js-bridge-service";
/**
* Created by obarda on 12/18/2016.
*/
@@ -215,7 +218,7 @@
type: "default",
single: false,
nodeTypeNames: ["basic-node"],
- imageUrl: '/assets/styles/images/resource-icons/' + 'canvasPlusIcon.png',
+ imageUrl: AngularJSBridge.getAngularConfig().imagesPath + ImagesUrl.CANVAS_PLUS_ICON,
lineWidth: 2,
lineStyle: 'dashed'
@@ -232,7 +235,7 @@
type: "default",
single: false,
nodeTypeNames: ["basic-small-node"],
- imageUrl: '/assets/styles/images/resource-icons/' + 'canvasPlusIcon.png',
+ imageUrl: AngularJSBridge.getAngularConfig().imagesPath + ImagesUrl.CANVAS_PLUS_ICON,
lineWidth: 2,
lineStyle: 'dashed'
}
@@ -248,7 +251,7 @@
type: "default",
single: false,
nodeTypeNames: ["ucpe-cp-node"],
- imageUrl: '/assets/styles/images/resource-icons/' + 'canvasPlusIcon.png',
+ imageUrl: AngularJSBridge.getAngularConfig().imagesPath + ImagesUrl.CANVAS_PLUS_ICON,
lineWidth: 2,
lineStyle: 'dashed'
}
diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html
index 37b076f..3a47206 100644
--- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html
+++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.html
@@ -67,7 +67,7 @@
</div>
<div class="add-map-item" data-ng-class="{'schema-data-type':isSchemaTypeDataType}">
<div class="add-btn" data-tests-id="add-map-item"
- data-ng-class="{'disabled': readOnly || !schemaProperty.type || mapKeys.indexOf('')>-1}" data-ng-click="addMapItemFields()">Add</div>
+ data-ng-class="{'disabled': readOnly || !schemaProperty.type || mapKeys.indexOf('')>-1 || !isMapKeysUnique}" data-ng-click="addMapItemFields()">Add</div>
</div>
</div>
diff --git a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
index fa71e47..03690b6 100644
--- a/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
+++ b/catalog-ui/src/app/directives/property-types/type-map/type-map-directive.ts
@@ -9,6 +9,7 @@
export interface ITypeMapScope extends ng.IScope {
parentFormObj:ng.IFormController;
schemaProperty:SchemaProperty;
+ isMapKeysUnique:boolean;
isSchemaTypeDataType:boolean;
valueObjRef:any;
mapKeys:Array<string>;//array of map keys
@@ -54,6 +55,7 @@
link = (scope:ITypeMapScope, element:any, $attr:any) => {
scope.MapKeyValidationPattern = this.MapKeyValidationPattern;
+ scope.isMapKeysUnique = true;
//reset valueObjRef and mapKeys when schema type is changed
scope.$watchCollection('schemaProperty.type', (newData:any):void => {
@@ -93,8 +95,10 @@
let existsKeyIndex = Object.keys(scope.valueObjRef).indexOf(newKey);
if (existsKeyIndex > -1 && existsKeyIndex != index) {
scope.parentFormObj[fieldName].$setValidity('keyExist', false);
+ scope.isMapKeysUnique = false;
} else {
scope.parentFormObj[fieldName].$setValidity('keyExist', true);
+ scope.isMapKeysUnique = true;
if (!scope.parentFormObj[fieldName].$invalid) {
//To preserve the order of the keys, delete each one and recreate
let newObj = {};
diff --git a/catalog-ui/src/app/models.ts b/catalog-ui/src/app/models.ts
index 838137b..a37df50 100644
--- a/catalog-ui/src/app/models.ts
+++ b/catalog-ui/src/app/models.ts
@@ -28,6 +28,8 @@
export * from './models/properties-inputs/property-fe-model';
export * from './models/properties-inputs/property-fe-map';
export * from './models/properties-inputs/derived-fe-property';
+export * from './models/properties-inputs/property-declare-api-model';
+export * from './models/properties-inputs/property-input-detail';
export * from './models/properties-inputs/input-fe-model';
export * from './models/properties-inputs/simple-flat-property';
export * from './models/data-types-map';
diff --git a/catalog-ui/src/app/models/properties-inputs/input-be-model.ts b/catalog-ui/src/app/models/properties-inputs/input-be-model.ts
index 6767bce..72afd77 100644
--- a/catalog-ui/src/app/models/properties-inputs/input-be-model.ts
+++ b/catalog-ui/src/app/models/properties-inputs/input-be-model.ts
@@ -3,10 +3,13 @@
* Created by rc2122 on 6/1/2017.
*/
export class InputBEModel extends PropertyBEModel {
- properties: Array<ComponentInstanceModel>;
+
+ inputPath: string;
inputs: Array<ComponentInstanceModel>;
instanceUniqueId: string;
+ ownerId: string;
propertyId: string;
+ properties: Array<ComponentInstanceModel>;
constructor(input?: InputBEModel) {
super(input);
@@ -14,10 +17,10 @@
this.propertyId = input.propertyId;
this.properties = input.properties;
this.inputs = input.inputs;
+ this.ownerId = input.ownerId;
+ this.inputPath = input.inputPath;
}
-
-
public toJSON = (): any => {
};
diff --git a/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts b/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts
index 3af4431..f79a7e6 100644
--- a/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts
+++ b/catalog-ui/src/app/models/properties-inputs/input-fe-model.ts
@@ -5,42 +5,19 @@
export class InputFEModel extends InputBEModel {
isSimpleType: boolean;
- relatedProperty: SimpleRelatedProperty;
+ relatedPropertyValue: any;
+ relatedPropertyName: string;
constructor(input?: InputBEModel) {
super(input);
if (input) {
this.isSimpleType = PROPERTY_DATA.SIMPLE_TYPES.indexOf(this.type) > -1;
- this.relatedProperty = new SimpleRelatedProperty(input);
+ let relatedProperty = input.properties && input.properties[0] || input.inputs && input.inputs[0];
+ if (relatedProperty) {
+ this.relatedPropertyValue = relatedProperty.value;
+ this.relatedPropertyName = relatedProperty.name;
+ }
}
}
-}
-
-export class SimpleRelatedProperty {
- name: string;
- value: string;
- nestedPath: string;
-
- constructor(input: InputBEModel) {
- if(!input.instanceUniqueId){
- return;
- }
- //Check if input is on DerivedFEProperty level, in which case we want to set a nested path
- let instanceName = input.instanceUniqueId.split('.').pop();
- if (input.inputPath && input.inputPath.indexOf('#') > -1
- && instanceName + "_" + input.inputPath.split('#').join('_') == input.name) { //Ignore inputPath for a complex child on VL that was declared within VF, that was then dragged into service. For that case, input.name will be missing the vl name, so we'll know to ignore the path and fall into else case.
- this.nestedPath = input.inputPath;
- this.name = input.inputPath.substring(0, input.inputPath.indexOf('#'));
- } else { //PropertyFEModel level. Can parse input name to get prop name.
- let propNameLength = input.name.length - instanceName.length + 1;
- this.name = input.name.substr(instanceName.length + 1, propNameLength);
- }
-
- //In declare response, input contains nested property, and we need to extract value so we can update our prop.
- let nestedProperty = input.properties && input.properties[0] || input.inputs && input.inputs[0];
- if (nestedProperty) {
- this.value = nestedProperty.value;
- }
- }
-};
+}
\ No newline at end of file
diff --git a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
index f5cd409..0f22d53 100644
--- a/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
+++ b/catalog-ui/src/app/models/properties-inputs/property-be-model.ts
@@ -1,4 +1,4 @@
-import { SchemaPropertyGroupModel, SchemaProperty } from "../aschema-property";
+import { PropertyInputDetail, SchemaPropertyGroupModel, SchemaProperty } from "app/models";
import { PROPERTY_DATA, PROPERTY_TYPES } from 'app/utils';
export enum DerivedPropertyType {
SIMPLE,
@@ -10,8 +10,10 @@
export class PropertyBEModel {
defaultValue: string;
+ definition: boolean;
description: string;
fromDerived: boolean;
+ getInputValues: Array<PropertyInputDetail>
name: string;
parentUniqueId: string;
password: boolean;
@@ -20,13 +22,8 @@
type: string;
uniqueId: string;
value: string;
- definition: boolean;
- inputPath: string;
- propertiesName: string;
- ownerId: string;
- input: PropertyBEModel;
- constructor(property?: PropertyBEModel, childProperty?:PropertyBEModel) {
+ constructor(property?: PropertyBEModel) {
if (property) {
this.defaultValue = property.defaultValue;
this.description = property.description;
@@ -40,16 +37,7 @@
this.uniqueId = property.uniqueId;
this.value = property.value ? property.value : property.defaultValue;
this.definition = property.definition;
- this.ownerId = property.ownerId;
- if (property.inputPath) {
- this.inputPath = property.inputPath;
- }
- }
- if (childProperty) {
- this.input = childProperty;
- this.propertiesName = childProperty.propertiesName;
- } else {
- this.propertiesName = this.name;
+ this.getInputValues = property.getInputValues;
}
if (!this.schema || !this.schema.property) {
diff --git a/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts b/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts
new file mode 100644
index 0000000..ddb7bd4
--- /dev/null
+++ b/catalog-ui/src/app/models/properties-inputs/property-declare-api-model.ts
@@ -0,0 +1,18 @@
+'use strict';
+import { PropertyBEModel, PropertyFEModel, DerivedFEProperty } from "../../models";
+
+
+export class PropertyDeclareAPIModel extends PropertyBEModel{
+ input: PropertyBEModel;
+ propertiesName: string;
+
+
+ constructor(property: PropertyFEModel, childProperty?: DerivedFEProperty) {
+ super(property);
+ if (childProperty) {
+ this.input = childProperty;
+ this.propertiesName = childProperty.propertiesName;
+ }
+ }
+
+}
diff --git a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts
index cfbe6d6..bfb6462 100644
--- a/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts
+++ b/catalog-ui/src/app/models/properties-inputs/property-fe-model.ts
@@ -6,11 +6,12 @@
export class PropertyFEModel extends PropertyBEModel {
expandedChildPropertyId: string;
- flattenedChildren: Array<DerivedFEProperty>; //[parentPath] : Array<DerivedFEProp>
+ flattenedChildren: Array<DerivedFEProperty>;
isDeclared: boolean;
isDisabled: boolean;
isSelected: boolean;
isSimpleType: boolean; //for convenience only - we can really just check if derivedDataType == derivedPropertyTypes.SIMPLE to know if the prop is simple
+ propertiesName: string;
uniqueId: string;
valueObj: any; //this is the only value we relate to in the html templates
derivedDataType: DerivedPropertyType;
@@ -21,6 +22,7 @@
this.setNonDeclared();
this.derivedDataType = this.getDerivedPropertyType();
this.flattenedChildren = [];
+ this.propertiesName = this.name;
}
@@ -29,7 +31,7 @@
//TODO: handle this.derivedDataType == DerivedPropertyType.MAP
if (this.derivedDataType == DerivedPropertyType.LIST && this.schema.property.type == PROPERTY_TYPES.JSON) {
try {
- return JSON.stringify(this.valueObj.map(item => JSON.parse(item)));
+ return JSON.stringify(this.valueObj.map(item => (typeof item == 'string')? JSON.parse(item) : item));
} catch (e){}
}
@@ -37,7 +39,7 @@
}
public setNonDeclared = (childPath?: string): void => {
- if (!childPath) { //declaring a child prop
+ if (!childPath) { //un-declaring a child prop
this.isDeclared = false;
} else {
let childProp: DerivedFEProperty = this.flattenedChildren.find(child => child.propertiesName == childPath);
@@ -51,6 +53,7 @@
this.isDeclared = true;
} else {
let childProp: DerivedFEProperty = this.flattenedChildren.find(child => child.propertiesName == childNameToDeclare);
+ if (!childProp) { console.log("ERROR: Unabled to find child: " + childNameToDeclare, this); return; }
childProp.isSelected = false;
childProp.isDeclared = true;
}
diff --git a/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts b/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts
new file mode 100644
index 0000000..03f7b40
--- /dev/null
+++ b/catalog-ui/src/app/models/properties-inputs/property-input-detail.ts
@@ -0,0 +1,6 @@
+export class PropertyInputDetail {
+ inputId: string;
+ inputName: string;
+ inputPath: string;
+ list: boolean;
+}
diff --git a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.less b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.less
index a9174fd..4befa2c 100644
--- a/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.less
+++ b/catalog-ui/src/app/ng2/components/hierarchy-navigtion/hierarchy-navigation.component.less
@@ -6,6 +6,7 @@
border: 1px dotted;
border-right: none;
border-bottom: none;
+ width: 100%;
}
.node-item:last-child {
diff --git a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.html b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.html
index 5467c94..331415c 100644
--- a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.html
+++ b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.html
@@ -2,8 +2,8 @@
<loader [display]="isLoading" size="large" [relative]="false"></loader>
<div class="table-header">
<div class="table-cell col1">Property Name</div>
+ <div class="table-cell col3">From Instance</div>
<div class="table-cell col2">Type</div>
- <div class="table-cell col3">ES</div>
<div class="table-cell valueCol">Value</div>
</div>
<div class="table-body">
@@ -16,12 +16,16 @@
class="property-description-icon sprite-new show-desc"
tooltip="{{input.description}}" tooltipDelay="0"></span>
</div>
+ <div class="table-cell col3">
+ <div class="inner-cell-div" tooltip="{{instanceNamesMap[input.instanceUniqueId]}}">
+ <span>{{instanceNamesMap[input.instanceUniqueId]}}</span>
+ </div>
+ </div>
<div class="table-cell col2">
<div class="inner-cell-div" tooltip="{{input.type | contentAfterLastDot}}">
<span>{{input.type | contentAfterLastDot}}</span>
</div>
</div>
- <div class="table-cell col3">{{input.schema && input.schema.property && input.schema.property.type ? (input.schema.property.type | contentAfterLastDot) : ''}}</div>
<div class="table-cell valueCol input-value-col" [class.inner-table-container]="input.childrenProperties || !input.isSimpleType">
<dynamic-element class="value-input"
*ngIf="input.isSimpleType"
@@ -33,7 +37,7 @@
[readonly]="readonly">
</dynamic-element>
<div class="delete-button-container">
- <span *ngIf="!input.ownerId && !readonly" class="sprite-new delete-btn" (click)="openDeleteModal(input)"></span>
+ <span *ngIf="input.instanceUniqueId && !readonly" class="sprite-new delete-btn" (click)="openDeleteModal(input)"></span>
</div>
</div>
diff --git a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts
index 83c0bda..f2cac21 100644
--- a/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts
+++ b/catalog-ui/src/app/ng2/components/inputs-table/inputs-table.component.ts
@@ -13,6 +13,7 @@
export class InputsTableComponent {
@Input() inputs: Array<InputFEModel>;
+ @Input() instanceNamesMap: Map<string, string>;
@Input() readonly:boolean;
@Input() isLoading:boolean;
@Output() inputValueChanged: EventEmitter<any> = new EventEmitter<any>();
diff --git a/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.html b/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.html
index 5aa0052..92948b3 100644
--- a/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.html
+++ b/catalog-ui/src/app/ng2/components/properties-table/dynamic-property/dynamic-property.component.html
@@ -38,7 +38,7 @@
<ng-container *ngIf="!property.isDeclared">
<a *ngIf="(propType == derivedPropertyTypes.LIST || propType == derivedPropertyTypes.MAP) && !property.isChildOfListOrMap" class="property-icon add-item" (click)="createNewChildProperty();" [ngClass]="{'disabled':readonly}">Add value to list</a>
<span *ngIf="property.isChildOfListOrMap" (click)="deleteItem.emit(property);" class="property-icon sprite-new delete-item-icon" [ngClass]="{'disabled':readonly}"></span>
- <span *ngIf="!isPropertyFEModel && (propType == derivedPropertyTypes.COMPLEX || ((propType == derivedPropertyTypes.LIST || propType == derivedPropertyTypes.MAP) && hasChildren()))" (click)="expandChildById(propPath)" class="property-icon sprite-new round-expand-icon" [class.open]="propPath == expandedChildId"></span>
+ <span *ngIf="!isPropertyFEModel && (propType == derivedPropertyTypes.COMPLEX || ((propType == derivedPropertyTypes.LIST || propType == derivedPropertyTypes.MAP) && hasChildren()))" (click)="expandChildById(propPath)" class="property-icon sprite-new round-expand-icon" [class.open]="expandedChildId.indexOf(propPath) == 0"></span>
</ng-container>
</div>
diff --git a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.html b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.html
index f3259ab..c57998a 100644
--- a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.html
+++ b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.html
@@ -7,14 +7,14 @@
<div class="table-cell valueCol">Value</div>
</div>
<div class="table-body">
- <div class="no-data" *ngIf="!feInstancesNames || !feInstancesNames.length">No data to display</div>
+ <div class="no-data" *ngIf="!fePropertiesMap || !(fePropertiesMap | keys).length">No data to display</div>
- <ng-container *ngFor="let instanceName of feInstancesNames; trackBy:instanceName">
- <div class="table-rows-header white-sub-header">{{instanceName | contentAfterLastDot}}</div>
+ <ng-container *ngFor="let instanceId of fePropertiesMap | keys; trackBy:instanceId">
+ <div class="table-rows-header white-sub-header">{{feInstanceNamesMap[instanceId]}}</div>
<div class="table-row"
- *ngFor="let property of fePropertiesMap[instanceName] | searchFilter:'name':searchTerm; trackBy:property?.name"
- (click)="onClickPropertyRow(property, instanceName, $event)"
+ *ngFor="let property of fePropertiesMap[instanceId] | searchFilter:'name':searchTerm; trackBy:property?.name"
+ (click)="onClickPropertyRow(property, instanceId, $event)"
[ngClass]="{'selected': selectedPropertyId && selectedPropertyId === property.name }">
<div class="table-cell col1" [ngClass]="{'filtered':property.name === propertyNameSearchText}" [class.round-checkbox]="property.isDeclared">
@@ -49,7 +49,7 @@
[readonly]="readonly"
(valueChanged)="propValueChanged(property);"
(expandChild)="property.updateExpandedChildPropertyId($event)"
- (clickOnPropertyRow)="onClickPropertyInnerRow($event, instanceName)"
+ (clickOnPropertyRow)="onClickPropertyInnerRow($event, instanceId)"
(checkProperty)="propertyChecked(property, $event)"
>
</dynamic-property>
diff --git a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
index 463de4f..f1721c0 100644
--- a/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
+++ b/catalog-ui/src/app/ng2/components/properties-table/properties-table.component.ts
@@ -12,6 +12,7 @@
export class PropertiesTableComponent {
@Input() fePropertiesMap: InstanceFePropertiesMap;
+ @Input() feInstanceNamesMap: Map<string, string>;
@Input() selectedPropertyId: string;
@Input() displayDeleteButton: boolean;
@Input() propertyNameSearchText:string;
@@ -24,23 +25,10 @@
@Output() updateCheckedPropertyCount: EventEmitter<boolean> = new EventEmitter<boolean>();
//@Output() selectInstanceRow: EventEmitter<string> = new EventEmitter<string>();
- feInstancesNames: Array<string>;
constructor ( private propertiesService:PropertiesService ){
}
- /**
- * Update feInstancesNames when fePropertiesMap: InstanceFePropertiesMap change (after getting response from server)
- */
- ngOnChanges(changes: SimpleChanges) {
- if (changes['fePropertiesMap']) {
- if (changes['fePropertiesMap'].currentValue) {
- let keysPipe = new KeysPipe();
- let fiteredArr = keysPipe.transform(changes['fePropertiesMap'].currentValue,[]);
- this.feInstancesNames = fiteredArr;
- }
- }
- }
propValueChanged = (property) => {
!property.isDeclared && this.valueChanged.emit(property);
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.html b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.html
index fa3270e..0b50357 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.html
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.html
@@ -5,6 +5,7 @@
<tab tabTitle="Properties">
<properties-table class="properties-table"
[fePropertiesMap]="instanceFePropertiesMap"
+ [feInstanceNamesMap]="componentInstanceNamesMap"
[searchTerm]="searchQuery"
[selectedPropertyId]="selectedFlatProperty.path"
[propertyNameSearchText]="searchPropertyName"
@@ -22,6 +23,7 @@
<inputs-table class="properties-table"
[readonly]="isReadonly"
[inputs]="inputs | searchFilter:'name':searchQuery"
+ [instanceNamesMap]="componentInstanceNamesMap"
[isLoading]="loadingInputs"
(deleteInput)="deleteInput($event)"
(inputValueChanged)="inputValueChanged($event)"></inputs-table>
@@ -29,10 +31,10 @@
</tabs>
<div class="header">
<div class="search-filter-container" [class.without-filter]="isInpusTabSelected">
+ <span *ngIf="displayClearSearch && !isInpusTabSelected" (click)="clickOnClearSearch()" class="clear-filter">Clear All</span>
<input type="text" class="search-box" placeholder="Search" [(ngModel)]="searchQuery" />
<span class="sprite search-icon"></span>
<filter-properties-assignment *ngIf="!isInpusTabSelected" #advanceSearch class="advance-search" [componentType]="component.componentType" (searchProperties)="searchPropertiesInstances($event)"></filter-properties-assignment>
- <span *ngIf="displayClearSearch && !isInpusTabSelected" (click)="clickOnClearSearch()" class="clear-filter">Clear All</span>
</div>
<button class="tlv-btn blue declare-button" [disabled]="!checkedPropertiesCount || isReadonly" (click)="declareProperties()">Declare</button>
</div>
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less
index 8df479f..15244e5 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.less
@@ -98,17 +98,13 @@
}
}
- .advance-search{
-
- }
+
.clear-filter{
cursor: pointer;
- color: @main_color_c;
- font-family: @font-omnes-medium-italic;
+ color:#009fdb;
text-decoration: underline;
- position: relative;
- top: 4px;
- right: 16px;
+ padding-right:10px;
+ font-size:12px;
}
.declare-button{
@@ -170,8 +166,7 @@
}
.hierarchy-nav-container {
- flex:1;
- overflow: auto;
+ display:flex;
flex-direction: column;
height: 100%;
}
@@ -187,6 +182,8 @@
}
.hierarchy-nav {
+ flex:1;
+ overflow:auto;
display: grid;
margin-top: 1em;
margin-left: 1em;
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts
index e66ed59..3efe866 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties-assignment.page.component.ts
@@ -22,7 +22,8 @@
export class PropertiesAssignmentComponent {
title = "Properties & Inputs";
- component:ComponentData;
+ component: ComponentData;
+ componentInstanceNamesMap: Map<string, string> = new Map<string, string>();//instanceUniqueId, name
propertiesNavigationData = [];
instancesNavigationData = [];
@@ -80,7 +81,7 @@
.getComponentInputs(this.component)
.subscribe(response => {
_.forEach(response.inputs, (input: InputBEModel) => {
- this.inputs.push(new InputFEModel(input));
+ this.inputs.push(new InputFEModel(input)); //only push items that were declared via SDC
});
this.loadingInputs = false;
@@ -92,6 +93,7 @@
_.forEach(this.instances, (instance) => {
this.instancesNavigationData.push(instance);
+ this.componentInstanceNamesMap[instance.uniqueId] = instance.name;
});
this.loadingInstances = false;
if (this.instancesNavigationData[0] == undefined) {
@@ -129,12 +131,12 @@
this.selectedInstanceType = resourceInstance.originType;
this.loadingProperties = true;
- if(resourceInstance.originType === ResourceType.VF) {
+ if(this.isInput(resourceInstance.originType)) {
this.componentInstanceServiceNg2
.getComponentInstanceInputs(this.component, resourceInstance)
.subscribe(response => {
instanceBePropertiesMap[resourceInstance.uniqueId] = response;
- this.processInstancePropertiesResponse(instanceBePropertiesMap);
+ this.processInstancePropertiesResponse(instanceBePropertiesMap, true);
this.loadingProperties = false;
});
@@ -143,7 +145,7 @@
.getComponentInstanceProperties(this.component, resourceInstance.uniqueId)
.subscribe(response => {
instanceBePropertiesMap[resourceInstance.uniqueId] = response;
- this.processInstancePropertiesResponse(instanceBePropertiesMap);
+ this.processInstancePropertiesResponse(instanceBePropertiesMap, false);
this.loadingProperties = false;
});
}
@@ -159,8 +161,8 @@
/**
* Entry point handling response from server
*/
- processInstancePropertiesResponse = (instanceBePropertiesMap:InstanceBePropertiesMap) => {
- this.instanceFePropertiesMap = this.propertiesUtils.convertPropertiesMapToFEAndCreateChildren(instanceBePropertiesMap, this.inputs); //create flattened children, disable declared props, and init values
+ processInstancePropertiesResponse = (instanceBePropertiesMap: InstanceBePropertiesMap, originTypeIsVF: boolean) => {
+ this.instanceFePropertiesMap = this.propertiesUtils.convertPropertiesMapToFEAndCreateChildren(instanceBePropertiesMap, originTypeIsVF, this.inputs); //create flattened children, disable declared props, and init values
this.checkedPropertiesCount = 0;
};
@@ -171,7 +173,7 @@
// Copying the actual value from the object ref into the value if it's from a complex type
event.value = event.getJSONValue();
- if (this.selectedInstanceData.originType === ResourceType.VF) {
+ if (this.isInput(this.selectedInstanceData.originType)) {
console.log("I want to update input value on the resource instance");
let inputToUpdate = new PropertyBEModel(event);
this.componentInstanceServiceNg2
@@ -279,7 +281,7 @@
});
let inputsToCreate: InstancePropertiesAPIMap;
- if (this.selectedInstanceType !== ResourceType.VF) {
+ if (!this.isInput(this.selectedInstanceType)) {
inputsToCreate = new InstancePropertiesAPIMap(null, selectedProperties);
} else {
inputsToCreate = new InstancePropertiesAPIMap(selectedProperties, null);
@@ -301,12 +303,12 @@
updatePropertyValueAfterDeclare = (input: InputFEModel) => {
if (this.instanceFePropertiesMap[input.instanceUniqueId]) {
let propertyForUpdatindVal = _.find(this.instanceFePropertiesMap[input.instanceUniqueId], (feProperty: PropertyFEModel) => {
- return feProperty.name == input.relatedProperty.name;
+ return feProperty.name == input.relatedPropertyName;
});
-
- propertyForUpdatindVal.setAsDeclared(input.relatedProperty.nestedPath); //set prop as declared before assigning value
- this.propertiesService.disableRelatedProperties(propertyForUpdatindVal, input.relatedProperty.nestedPath);
- this.propertiesUtils.resetPropertyValue(propertyForUpdatindVal, input.relatedProperty.value, input.relatedProperty.nestedPath);
+ let inputPath = (input.inputPath && input.inputPath != propertyForUpdatindVal.name) ? input.inputPath : undefined;
+ propertyForUpdatindVal.setAsDeclared(inputPath); //set prop as declared before assigning value
+ this.propertiesService.disableRelatedProperties(propertyForUpdatindVal, inputPath);
+ this.propertiesUtils.resetPropertyValue(propertyForUpdatindVal, input.relatedPropertyValue, inputPath);
}
}
@@ -357,7 +359,7 @@
.filterComponentInstanceProperties(this.component, filterData)
.subscribe(response => {
- this.processInstancePropertiesResponse(response);
+ this.processInstancePropertiesResponse(response, false);
this.hierarchyPropertiesDisplayOptions.searchText = filterData.propertyName;//mark results in tree
this.searchPropertyName = filterData.propertyName;//mark in table
this.renderer.invokeElementMethod(this.hierarchyNavTabs, 'triggerTabChange', ['Composition']);
@@ -373,6 +375,7 @@
this.hierarchyPropertiesDisplayOptions.searchText = "";
this.displayClearSearch = false;
this.advanceSearch.clearAll();
+ this.searchQuery = '';
};
clickOnClearSearch = () => {
@@ -382,4 +385,8 @@
this.hierarchyNavTabs, 'triggerTabChange', ['Composition']);
};
+ private isInput = (instanceType:string):boolean =>{
+ return instanceType === ResourceType.VF || instanceType === ResourceType.PNF;
+ }
+
}
diff --git a/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts b/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts
index bdfbc4c..bd62993 100644
--- a/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts
+++ b/catalog-ui/src/app/ng2/pages/properties-assignment/properties.utils.ts
@@ -18,10 +18,9 @@
* 3. Initialize valueObj (which also creates any new list/map flattened children as needed)
* Returns InstanceFePropertiesMap
*/
- public convertPropertiesMapToFEAndCreateChildren = (instancePropertiesMap:InstanceBePropertiesMap, inputs:Array<InputFEModel>): InstanceFePropertiesMap => {
+ public convertPropertiesMapToFEAndCreateChildren = (instancePropertiesMap:InstanceBePropertiesMap, isVF:boolean, inputs?:Array<InputFEModel>): InstanceFePropertiesMap => {
let instanceFePropertiesMap:InstanceFePropertiesMap = new InstanceFePropertiesMap();
angular.forEach(instancePropertiesMap, (properties:Array<PropertyBEModel>, instanceId:string) => {
- let instanceInputs: Array<InputFEModel> = inputs.filter(input => input.instanceUniqueId == instanceId);
let propertyFeArray: Array<PropertyFEModel> = [];
_.forEach(properties, (property: PropertyBEModel) => {
@@ -34,12 +33,19 @@
if (newFEProp.derivedDataType == DerivedPropertyType.COMPLEX) { //Create children if prop is not simple, list, or map.
newFEProp.flattenedChildren = this.createFlattenedChildren(newFEProp.type, newFEProp.name);
}
- if (instanceInputs.length) { //if this prop (or any children) are declared, set isDeclared and disable checkbox on parents/children
- instanceInputs.filter(input => input.relatedProperty.name == newFEProp.name).forEach((input) => {
- newFEProp.setAsDeclared(input.relatedProperty.nestedPath); //if a path was sent, its a child prop. this param is optional
- this.propertiesService.disableRelatedProperties(newFEProp, input.relatedProperty.nestedPath);
+ if (newFEProp.getInputValues && newFEProp.getInputValues.length) { //if this prop (or any children) are declared, set isDeclared and disable checkbox on parents/children
+ newFEProp.getInputValues.forEach(propInputDetail => {
+ let inputPath = propInputDetail.inputPath;
+ if (!isVF && !inputPath) { //TODO: this is a workaround until Marina adds inputPath
+ let input = inputs.find(input => input.uniqueId == propInputDetail.inputId);
+ if (!input) { console.log("CANNOT FIND INPUT FOR " + propInputDetail.inputId); return; }
+ else inputPath = input.inputPath;
+ }
+ if (isVF || inputPath == newFEProp.name) inputPath = undefined;
+ newFEProp.setAsDeclared(inputPath); //if a path is sent, its a child prop. this param is optional
+ this.propertiesService.disableRelatedProperties(newFEProp, inputPath);
});
- }
+ }
this.initValueObjectRef(newFEProp); //initialize valueObj.
propertyFeArray.push(newFEProp);
newFEProp.updateExpandedChildPropertyId(newFEProp.name); //display only the first level of children
@@ -51,19 +57,8 @@
});
return instanceFePropertiesMap;
}
- private createListOrMapChildrenFromValueObj = (property: PropertyFEModel) => {
- if ((property.derivedDataType == DerivedPropertyType.LIST || property.derivedDataType == DerivedPropertyType.MAP)
- && Object.keys(property.valueObj).length) {
- Object.keys(property.valueObj).forEach((key) => {
- let newProps: Array<DerivedFEProperty> = this.createListOrMapChildren(property, key, property.valueObj[key]);
- property.flattenedChildren.push(...newProps);
- });
-
- }
- }
-
- public createListOrMapChildren = (property:PropertyBEModel, key: string, valueObj: any): Array<DerivedFEProperty> => {
+ public createListOrMapChildren = (property:PropertyFEModel | DerivedFEProperty, key: string, valueObj: any): Array<DerivedFEProperty> => {
let newProps: Array<DerivedFEProperty> = [];
let parentProp = new DerivedFEProperty(property, property.propertiesName, true, key, valueObj);
newProps.push(parentProp);
@@ -101,10 +96,12 @@
} else {
property.valueObj = _.merge({}, JSON.parse(property.defaultValue || '{}'), JSON.parse(property.value || '{}')); //value object should be merged value and default value. Value takes higher precendence. Set valueObj to empty obj if undefined.
}
- if (property.derivedDataType == DerivedPropertyType.COMPLEX) {
- this.assignFlattenedChildrenValues(property.valueObj, property.flattenedChildren, property.name);
+ if ((property.derivedDataType == DerivedPropertyType.LIST || property.derivedDataType == DerivedPropertyType.MAP) && Object.keys(property.valueObj).length) {
+ Object.keys(property.valueObj).forEach((key) => {
+ property.flattenedChildren.push(...this.createListOrMapChildren(property, key, property.valueObj[key]))
+ });
} else {
- this.createListOrMapChildrenFromValueObj(property);
+ this.assignFlattenedChildrenValues(property.valueObj, property.flattenedChildren, property.name);
}
}
}
@@ -116,6 +113,7 @@
*/
public assignFlattenedChildrenValues = (parentValueJSON: any, derivedPropArray: Array<DerivedFEProperty>, parentName: string) => {
if (!derivedPropArray || !parentName) return;
+ let propsToPushMap: Map<number, Array<DerivedFEProperty>> = new Map<number, Array<DerivedFEProperty>>();
derivedPropArray.forEach((prop, index) => {
let propNameInObj = prop.propertiesName.substring(prop.propertiesName.indexOf(parentName) + parentName.length + 1).split('#').join('.'); //extract everything after parent name
@@ -124,20 +122,27 @@
if ((prop.derivedDataType == DerivedPropertyType.SIMPLE || prop.isDeclared) && typeof prop.valueObj == 'object') { //Stringify objects that should be strings
prop.valueObj = JSON.stringify(prop.valueObj);
} else { //parse strings that should be objects
- if ((prop.derivedDataType == DerivedPropertyType.COMPLEX || prop.derivedDataType == DerivedPropertyType.MAP) && typeof prop.valueObj != 'object') {
+ if (prop.derivedDataType == DerivedPropertyType.COMPLEX && typeof prop.valueObj != 'object') {
prop.valueObj = JSON.parse(prop.valueObj || '{}');
} else if (prop.derivedDataType == DerivedPropertyType.LIST && typeof prop.valueObj != 'object') {
prop.valueObj = JSON.parse(prop.valueObj || '[]');
- }
- if ((prop.derivedDataType == DerivedPropertyType.LIST || prop.derivedDataType == DerivedPropertyType.MAP) && Object.keys(prop.valueObj).length) {
+ } else if (prop.derivedDataType == DerivedPropertyType.MAP && typeof prop.valueObj != 'object' && (!prop.isChildOfListOrMap || !prop.schema.property.isSimpleType)) { //dont parse values for children of map of simple
+ prop.valueObj = JSON.parse(prop.valueObj || '{}');
+ }
+ if ((prop.derivedDataType == DerivedPropertyType.LIST || prop.derivedDataType == DerivedPropertyType.MAP) && typeof prop.valueObj == 'object' && Object.keys(prop.valueObj).length) {
let newProps: Array<DerivedFEProperty> = [];
Object.keys(prop.valueObj).forEach((key) => {
newProps.push(...this.createListOrMapChildren(prop, key, prop.valueObj[key]));//create new children, assign their values, and then add to array
});
- derivedPropArray.splice(index + 1, 0, ...newProps);
+ propsToPushMap[index + 1] = newProps;
}
}
});
+
+ //add props after we're done looping (otherwise our loop gets messed up). Push in reverse order, so we dont mess up indexes.
+ Object.keys(propsToPushMap).reverse().forEach((indexToInsert) => {
+ derivedPropArray.splice(+indexToInsert, 0, ...propsToPushMap[indexToInsert]); //slacker parsing
+ });
}
public resetPropertyValue = (property: PropertyFEModel, newValue: string, nestedPath?: string): void => {
diff --git a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
index aebbdbf..7a85909 100644
--- a/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
+++ b/catalog-ui/src/app/ng2/services/http.interceptor.service.ts
@@ -8,6 +8,8 @@
import {Cookie2Service} from "./cookie.service";
import {UUID} from "angular2-uuid";
import {Dictionary} from "../../utils/dictionary/dictionary";
+import {SEVERITY} from "../../utils/constants";
+import {IServerMessageModalModel} from "../../view-models/modals/message-modal/message-server-modal/server-message-modal-view-model";
export class HttpInterceptor implements Interceptor {
@@ -27,17 +29,22 @@
*/
request.options.headers.append(this.cookieService.getUserIdSuffix(), this.cookieService.getUserId());
- var uuidValue = this.getUuidValue(request.url);
- if(uuidValue!= ''){
- request.options.headers.set('X-ECOMP-ServiceID',uuidValue);
- }
- request.options.headers.set('X-ECOMP-RequestID', UUID.UUID());
+ request.options.withCredentials = true;
+ var uuidValue = this.getUuidValue(request.url);
+ if (uuidValue != '') {
+ request.options.headers.set('X-ECOMP-ServiceID', uuidValue);
+ }
+ request.options.headers.set('X-ECOMP-RequestID', UUID.UUID());
return request;
}
- public interceptAfter(response: InterceptedResponse): InterceptedResponse {
-
+ public interceptAfter(response:InterceptedResponse):InterceptedResponse {
+
+ if (response.response.status !== 200 && response.response.status !== 201) {
+ this.responseError(response.response.json());
+ //console.log("Error from BE:",response);
+ }
return response;
}
@@ -52,6 +59,88 @@
});
}
return '';
- }
+ };
+ public formatMessageArrays = (message:string, variables:Array<string>)=> {
+ return message.replace(/\[%(\d+)\]/g, function (_, m) {
+ let tmp = [];
+ let list = variables[--m].split(";");
+ list.forEach(function (item) {
+ tmp.push("<li>" + item + "</li>");
+ });
+ return "<ul>" + tmp.join("") + "</ul>";
+ });
+ };
+
+ public responseError = (rejection:any)=> {
+
+ let text:string;
+ let variables;
+ let messageId:string = "";
+ let isKnownException = false;
+
+ if (rejection && rejection.serviceException) {
+ text = rejection.serviceException.text;
+ variables = rejection.serviceException.variables;
+ messageId = rejection.serviceException.messageId;
+ isKnownException = true;
+ } else if (rejection && rejection.requestError && rejection.requestError.serviceException) {
+ text = rejection.requestError.serviceException.text;
+ variables = rejection.requestError.serviceException.variables;
+ messageId = rejection.requestError.serviceException.messageId;
+ isKnownException = true;
+ } else if (rejection && rejection.requestError && rejection.requestError.policyException) {
+ text = rejection.requestError.policyException.text;
+ variables = rejection.requestError.policyException.variables;
+ messageId = rejection.requestError.policyException.messageId;
+ isKnownException = true;
+ } else if (rejection) {
+ text = 'Wrong error format from server';
+ console.error(text);
+ isKnownException = false;
+ }
+
+ let data:IServerMessageModalModel;
+ if (isKnownException) {
+ // Remove the "Error: " text at the begining
+ if (text.trim().indexOf("Error:") === 0) {
+ text = text.replace("Error:", "").trim();
+ }
+
+ //mshitrit DE199895 bug fix
+ let count:number = 0;
+ variables.forEach(function (item) {
+ variables[count] = item ? item.replace('<', '<').replace('>', '>') : '';
+ count++;
+ });
+
+ // Format the message in case has array to <ul><li>
+ text = this.formatMessageArrays(text, variables);
+
+ // Format the message %1 %2
+ text = text.format(variables);
+
+ // Need to inject the MessageService manually to prevent circular dependencies (because MessageService use $templateCache that use $http).
+ data = {
+ title: 'Error',
+ message: text,
+ messageId: messageId,
+ status: rejection.status,
+ severity: SEVERITY.ERROR
+ };
+ } else {
+ // Need to inject the MessageService manually to prevent circular dependencies (because MessageService use $templateCache that use $http).
+ data = {
+ title: 'Error',
+ message: rejection.status !== -1 ? rejection.statusText : "Error getting response from server",
+ messageId: messageId,
+ status: rejection.status,
+ severity: SEVERITY.ERROR
+ };
+ }
+ // let modalsHandler = this.$injector.get('ModalsHandler');
+
+ // this.modalsHandler.openServerMessageModal(data);
+ console.error('ERROR data',data);
+ }
}
diff --git a/catalog-ui/src/app/ng2/services/properties.service.ts b/catalog-ui/src/app/ng2/services/properties.service.ts
index a22e2ae..3a02e50 100644
--- a/catalog-ui/src/app/ng2/services/properties.service.ts
+++ b/catalog-ui/src/app/ng2/services/properties.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models";
+import { DataTypeModel, PropertyFEModel, PropertyBEModel, SchemaProperty, PropertyDeclareAPIModel, DerivedFEProperty, DerivedFEPropertyMap, DerivedPropertyType, InputFEModel} from "app/models";
import { DataTypeService } from "./data-type.service";
import { PROPERTY_TYPES } from "app/utils";
import { ContentAfterLastDotPipe } from "../pipes/contentAfterLastDot.pipe";
@@ -48,14 +48,14 @@
}
public getCheckedProperties = (properties: Array<PropertyFEModel>): Array<PropertyBEModel> => {
- let selectedProps: Array<PropertyBEModel> = [];
+ let selectedProps: Array<PropertyDeclareAPIModel> = [];
properties.forEach(prop => {
if (prop.isSelected && !prop.isDeclared && !prop.isDisabled) {
- selectedProps.push(new PropertyBEModel(prop));
+ selectedProps.push(new PropertyDeclareAPIModel(prop));
} else if (prop.flattenedChildren) {
prop.flattenedChildren.forEach((child) => {
if (child.isSelected && !child.isDeclared && !child.isDisabled) {
- let childProp = new PropertyBEModel(prop, child); //create it from the parent
+ let childProp = new PropertyDeclareAPIModel(prop, child); //create it from the parent
selectedProps.push(childProp);
}
})
diff --git a/catalog-ui/src/app/utils/constants.ts b/catalog-ui/src/app/utils/constants.ts
index 7426c7c..0f4fde2 100644
--- a/catalog-ui/src/app/utils/constants.ts
+++ b/catalog-ui/src/app/utils/constants.ts
@@ -24,6 +24,7 @@
static CP = 'CP';
static VFC = 'VFC';
static VFCMT = 'VFCMT';
+ static PNF = 'PNF';
}
export class ComponentState {
@@ -79,6 +80,10 @@
public static JSON = 'json';
public static MAP = 'map';
public static LIST = 'list';
+ public static SCALAR = 'scalar-unit';
+ public static SCALAR_FREQUENCY = 'scalar-unit.frequency';
+ public static SCALAR_SIZE = 'scalar-unit.size';
+ public static SCALAR_TIME = 'scalar-unit.time';
}
export class SOURCES {
@@ -88,8 +93,8 @@
}
export class PROPERTY_DATA {
- public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP];
- public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON];
+ public static TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME, PROPERTY_TYPES.LIST, PROPERTY_TYPES.MAP];
+ public static SIMPLE_TYPES = [PROPERTY_TYPES.STRING, PROPERTY_TYPES.INTEGER, PROPERTY_TYPES.FLOAT, PROPERTY_TYPES.BOOLEAN, PROPERTY_TYPES.JSON, PROPERTY_TYPES.SCALAR, PROPERTY_TYPES.SCALAR_FREQUENCY, PROPERTY_TYPES.SCALAR_SIZE, PROPERTY_TYPES.SCALAR_TIME];
public static ROOT_DATA_TYPE = "tosca.datatypes.Root";
public static OPENECOMP_ROOT = "org.openecomp.datatypes.Root";
public static SUPPLEMENTAL_DATA = "supplemental_data";
@@ -210,6 +215,7 @@
export class EVENTS {
static RESOURCE_LEFT_PALETTE_UPDATE_EVENT = "resourceLeftPanelUpdateEvent";
+ static RESOURCE_PNF_LEFT_PALETTE_UPDATE_EVENT = "resourcePNFLeftPanelUpdateEvent";
static SERVICE_LEFT_PALETTE_UPDATE_EVENT = "serviceLeftPanelUpdateEvent";
static PRODUCT_LEFT_PALETTE_UPDATE_EVENT = "productLeftPanelUdateEvent";
static VL_LEFT_PALETTE_UPDATE_EVENT = "vlLeftPanelUdateEvent";
diff --git a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
index 13e9e8d..a58756b 100644
--- a/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
+++ b/catalog-ui/src/app/view-models/forms/property-forms/module-property-modal/module-property-model.ts
@@ -173,7 +173,7 @@
if (isNaN(minPropertyValue) || minPropertyValue == null) {
isValid = propertyValue >= initialCountPropertyValue;
} else {
- isValid = !propertyValue || (propertyValue >= minPropertyValue && propertyValue >= initialCountPropertyValue);
+ isValid = isNaN(propertyValue) || (propertyValue >= minPropertyValue && propertyValue >= initialCountPropertyValue);
}
this.$scope.forms.editForm["value"].$setValidity('minValidation', isValid);
if (this.component.isService()) {
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
index 5d03563..f12e95c 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model.ts
@@ -221,7 +221,7 @@
if (artifact.artifactGroupType === ArtifactGroupType.INFORMATION) {//fix DE256847
return this.$scope.currentComponent.artifacts && (!this.$scope.currentComponent.artifacts[artifact.artifactLabel] || !this.$scope.currentComponent.artifacts[artifact.artifactLabel].artifactName);
}
- return this.$scope.currentComponent.deploymentArtifacts && (!this.$scope.currentComponent.deploymentArtifacts[artifact.artifactLabel]);//fix DE251314
+ return this.$scope.currentComponent.selectedInstance && this.$scope.currentComponent.selectedInstance.deploymentArtifacts && this.$scope.currentComponent.selectedInstance.deploymentArtifacts[artifact.artifactLabel];
};
this.$scope.addOrUpdate = (artifact:ArtifactModel):void => {
diff --git a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
index 5df6b5c..2cc0778 100644
--- a/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
+++ b/catalog-ui/src/app/view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view.html
@@ -36,7 +36,7 @@
</div>
<div data-ng-repeat-end="" data-ng-if="artifact.selected" class="item-opened" data-tests-id="details-{{$index}}">
<div><span class="details-title">Label:</span> {{artifact.artifactLabel}}</div>
- <div><span class="details-title">UUID:</span> {{artifact.uniqueId}}</div>
+ <div><span class="details-title">UUID:</span> {{artifact.artifactUUID}}</div>
<div><span class="details-title">Description:</span> {{artifact.description}}</div>
diff --git a/catalog-ui/src/assets/languages/en_US.json b/catalog-ui/src/assets/languages/en_US.json
index 5f75233..2957f8a 100644
--- a/catalog-ui/src/assets/languages/en_US.json
+++ b/catalog-ui/src/assets/languages/en_US.json
@@ -24,6 +24,9 @@
"GENERAL_LABEL_CREATION_DATE": "Creation Date:",
"GENERAL_LABEL_AUTHOR": "Author:",
"GENERAL_LABEL_CONTACT_ID": "Contact ID:",
+ "GENERAL_LABEL_RESOURCE_MODEL_NUMBER":"Vendor Model Number:",
+ "GENERAL_LABEL_SERVICE_TYPE": "Service Type:",
+ "GENERAL_LABEL_SERVICE_ROLE": "Service Role:",
"GENERAL_LABEL_STATUS": "Status:",
"GENERAL_LABEL_PROJECT_CODE": "Project code:",
"GENERAL_LABEL_DESCRIPTION": "Description:",
@@ -38,6 +41,10 @@
"GENERAL_LABEL_DISTRIBUTION_STATUS": "Distribution Status:",
"GENERAL_LABEL_SYSTEM_NAME": "System Name:",
+ "=========== GENERAL_TAB ===========": "",
+ "GENERAL_TAB_LABEL_RESOURCE_MODEL_NUMBER":"Vendor Model Number",
+ "GENERAL_TAB_LABEL_SERVICE_TYPE": "Service Type",
+ "GENERAL_TAB_LABEL_SERVICE_ROLE": "Service Role",
"=========== GENERAL ERROR PAGES ===========": "",
"GENERAL_ERROR_403_TITLE": "SDC",
@@ -341,7 +348,7 @@
"=========== USER_MANAGEMENT SCREEN ===========": "",
"USER_MANAGEMENT": "User Management",
- "USER_MANAGEMENT_TABLE_HEADER_USER_ID": "User id",
+ "USER_MANAGEMENT_TABLE_HEADER_USER_ID": "User ID",
"USER_MANAGEMENT_SEARCH_LABEL": "Search user by name, user id, email or role",
"USER_MANAGEMENT_SEARCH_TEXT": "Enter user id",
"CATEGORY_MANAGEMENT": "Category Management",
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
index b6f9b82..b9eb4e4 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java
@@ -24,6 +24,7 @@
import org.openecomp.sdc.be.datatypes.enums.OriginTypeEnum;
import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
+import org.openecomp.sdc.common.util.ValidationUtils;
public class ComponentInstanceDataDefinition extends ToscaDataDefinition implements Serializable {
@@ -155,7 +156,7 @@
public void setName(String name) {
if(invariantName == null){
- invariantName = name;
+ invariantName = ValidationUtils.normalizeComponentInstanceName(name);
}
this.name = name;
}
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index 2d1b62c..b145b38 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -111,6 +111,7 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -119,7 +120,7 @@
import java.util.zip.ZipOutputStream;
public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductManager {
- private static final String VALIDATION_VSP_ID = "validationOnlyVspId";
+ private static String VALIDATION_VSP_ID = "validationOnlyVspId";
private static final String VALIDATION_VSP_NAME = "validationOnlyVspName";
//private static final String VALIDATION_VSP_USER = "validationOnlyVspUser";
@@ -412,15 +413,15 @@
}
VspDetails validationVsp = new VspDetails();
validationVsp.setName(VALIDATION_VSP_NAME);
- validationVsp.setId(VALIDATION_VSP_ID);
- Version version = versioningManager.create(
- VendorSoftwareProductConstants.VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE,
- validationVsp.getId(),
- user);
- validationVsp.setVersion(version);
vspInfoDao.create(validationVsp);
+ Version version = versioningManager.create(
+ VendorSoftwareProductConstants.VENDOR_SOFTWARE_PRODUCT_VERSIONABLE_TYPE,
+ validationVsp.getId(), user);
+ validationVsp.setVersion(version);
+
createUniqueName(VALIDATION_VSP_NAME);
+ VALIDATION_VSP_ID = validationVsp.getId();
return VALIDATION_VSP_ID;
}
@@ -792,16 +793,24 @@
private Map<String, List<ErrorMessage>> validateUploadData(UploadDataEntity uploadData)
throws IOException {
+
+ Map<String, List<ErrorMessage>> validationErrors = new HashMap<>();
if (uploadData == null || uploadData.getContentData() == null) {
return null;
}
- FileContentHandler fileContentMap =
- CommonUtil.loadUploadFileContent(uploadData.getContentData().array());
- //todo - check
+ FileContentHandler fileContentMap = new FileContentHandler();
+
+ try {
+ fileContentMap =
+ CommonUtil.loadUploadFileContent(uploadData.getContentData().array());
+ } catch (Exception e){
+ ErrorMessage errorMessage = new ErrorMessage(ErrorLevel.ERROR, e.getMessage());
+ validationErrors.put("Upload file", Arrays.asList(errorMessage));
+ }
ValidationManager validationManager =
ValidationManagerUtil.initValidationManager(fileContentMap);
- Map<String, List<ErrorMessage>> validationErrors = validationManager.validate();
+ validationErrors.putAll(validationManager.validate());
return
MapUtils.isEmpty(MessageContainerUtil.getMessageByLevel(ErrorLevel.ERROR, validationErrors))
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
index 5057608..d5a87ad 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionService.java
@@ -1706,7 +1706,7 @@
//todo - define list of type which will match the node property type (instead of string)
addPropertyInputParameter(propertyType, substitutionServiceTemplate, propertyDefinition
.getEntry_schema(),
- parameterId, unifiedCompositionEntity);
+ parameterId, unifiedCompositionEntity, context);
}
}
}
@@ -1782,7 +1782,7 @@
addPropertyInputParameter(propertyType, substitutionServiceTemplate, enrichNodeType
.getProperties().get(enrichPropertyName).getEntry_schema(),
- Optional.of(inputParamId), compositionEntity);
+ Optional.of(inputParamId), compositionEntity, context);
}
}
@@ -1814,8 +1814,16 @@
private void addPropertyInputParameter(String propertyType,
ServiceTemplate substitutionServiceTemplate,
EntrySchema entrySchema, Optional<String> parameterId,
- UnifiedCompositionEntity unifiedCompositionEntity) {
- if (isPropertySimpleType(propertyType)) {
+ UnifiedCompositionEntity unifiedCompositionEntity,
+ TranslationContext context) {
+ if(parameterId.isPresent() &&
+ isParameterBelongsToEnrichedPortProperties(parameterId.get(), context)){
+ addInputParameter(parameterId.get(),
+ propertyType,
+ propertyType.equals(PropertyType.LIST.getDisplayName()) ? entrySchema : null ,
+ substitutionServiceTemplate);
+ }
+ else if (isPropertySimpleType(propertyType)) {
parameterId
.ifPresent(parameterIdValue -> addInputParameter(parameterIdValue,
PropertyType.LIST.getDisplayName(),
@@ -1842,6 +1850,19 @@
}
}
+ private boolean isParameterBelongsToEnrichedPortProperties(String parameterId,
+ TranslationContext context){
+ List enrichPortResourceProperties = context.getEnrichPortResourceProperties();
+
+ for(int i = 0; i < enrichPortResourceProperties.size(); i++){
+ if(parameterId.contains((CharSequence) enrichPortResourceProperties.get(i))){
+ return true;
+ }
+ }
+
+ return false;
+ }
+
private boolean isPropertySimpleType(String propertyType) {
return !Objects.isNull(propertyType) &&
(propertyType.equalsIgnoreCase(PropertyType.STRING.getDisplayName())
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bcfbf4b..0711fb8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -480,29 +472,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -903,29 +887,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -1273,4 +1249,4 @@
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- - UNBOUNDED
\ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
index a5dbe1e..81cefe6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml
@@ -205,4 +205,4 @@
- packet_internal_network
- abstract_pd_server_0
- abstract_pd_server_1
- - abstract_pd_server_2
\ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
index b6e9416..b1f51f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
index f60da6f..a6d8533 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
index e049254..828bcb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2235143..e928f3b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -486,29 +478,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -909,29 +893,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -1279,4 +1255,4 @@
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- - UNBOUNDED
\ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 3606a51..544cc80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -196,8 +196,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -241,8 +240,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -281,8 +279,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -303,4 +300,4 @@
- network_policy_server
- abstract_pd_server_0
- abstract_pd_server_1
- - abstract_pd_server_2
\ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
index eeff915f..8a8b360 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -308,4 +300,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
index f60da6f..a6d8533 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
index e049254..828bcb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
index db3a684..0711fb8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -480,29 +472,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -903,29 +887,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
index b6e9416..b1f51f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
index f60da6f..a6d8533 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
index e049254..828bcb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -299,4 +291,4 @@
- dependency
dependency_pd_server:
- pd_server
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f7162f0..0c89db4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -927,17 +927,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -955,29 +951,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -1002,11 +990,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
server_group:
type: string
required: true
@@ -1082,11 +1068,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -1526,11 +1510,9 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -1606,17 +1588,13 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -1628,11 +1606,9 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -1656,29 +1632,21 @@
entry_schema:
type: json
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
1c1_scalling_instance_1c1_t1_port_tenant_id:
type: list
@@ -2125,21 +2093,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -2157,11 +2121,9 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -2203,23 +2165,17 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2231,17 +2187,13 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
@@ -2687,17 +2639,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2717,17 +2665,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -2739,17 +2683,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2793,17 +2733,13 @@
entry_schema:
type: json
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -3261,11 +3197,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3273,27 +3207,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3309,17 +3237,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3331,11 +3255,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3389,11 +3311,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -3835,11 +3755,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3847,27 +3765,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3883,17 +3795,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3905,11 +3813,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3957,11 +3863,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -4403,17 +4307,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -4433,17 +4333,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -4455,17 +4351,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4503,11 +4395,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_b_single_1b_metadata:
type: list
required: true
@@ -4515,11 +4405,9 @@
entry_schema:
type: json
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index 92c2247..d7fa0ce 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -166,8 +166,7 @@
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_network_role_tag:
- - ppds
+ port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
@@ -410,8 +409,7 @@
is_required: false
compute_1c2_catalog_instance_user_data_format:
- RAW1
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -468,8 +466,7 @@
- get_attribute:
- abstract_1c2_catalog_instance_0
- 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -662,8 +659,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1a_t2_port_network_role_tag:
- - ppds
+ port_1a_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1a_t2_port_network:
@@ -901,8 +897,7 @@
- get_attribute:
- abstract_a_single_1a
- a_single_1a_1a_t1_port_tenant_id
- port_1b_t1_port_network_role_tag:
- - oam
+ port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -1037,4 +1032,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 5879c89..2469e9c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -91,15 +89,11 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -109,10 +103,8 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -132,25 +124,17 @@
entry_schema:
type: json
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
1c1_scalling_instance_1c1_t1_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 351bfc7..f09ccb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -117,10 +103,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f8..2872bb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
index d2b0814..15e3f83 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml
@@ -22,18 +22,14 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -48,10 +44,8 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -86,20 +80,14 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -109,15 +97,11 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 1e323d8..6929834 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -94,20 +82,16 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_b_single_1b_metadata:
type: list
required: true
entry_schema:
type: json
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 089fcb5..d71a80a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -99,15 +87,11 @@
entry_schema:
type: json
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index f96fc7e..0b0de80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
server_group:
hidden: false
immutable: false
@@ -165,10 +151,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cd7dff0..ed4765e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -923,17 +923,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -951,29 +947,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -998,11 +986,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
server_group:
type: string
required: true
@@ -1074,11 +1060,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -1518,11 +1502,9 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -1598,17 +1580,13 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -1620,11 +1598,9 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -1642,29 +1618,21 @@
required: true
status: SUPPORTED
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
1c1_scalling_instance_instance_name:
type: list
@@ -2100,21 +2068,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -2132,11 +2096,9 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -2178,23 +2140,17 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2206,17 +2162,13 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
@@ -2662,17 +2614,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2692,17 +2640,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -2714,17 +2658,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2762,17 +2702,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -3230,11 +3166,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3242,27 +3176,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3278,17 +3206,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3300,11 +3224,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3352,11 +3274,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -3798,11 +3718,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3810,27 +3728,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3846,17 +3758,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3868,11 +3776,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3920,11 +3826,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -4453,11 +4357,9 @@
entry_schema:
type: json
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -4471,11 +4373,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -4485,11 +4385,9 @@
required: true
status: SUPPORTED
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_ip_requirements:
type: list
required: true
@@ -4501,11 +4399,9 @@
required: true
status: SUPPORTED
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4517,17 +4413,13 @@
entry_schema:
type: string
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_vlan_requirements:
type: list
required: true
@@ -4551,17 +4443,13 @@
entry_schema:
type: string
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
b_single_1b_instance_name:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
index f165f9d..a3c2dfd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml
@@ -138,8 +138,7 @@
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_network_role_tag:
- - ppds
+ port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
@@ -315,8 +314,7 @@
is_required: false
compute_1c2_catalog_instance_user_data_format:
- RAW1
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -377,8 +375,7 @@
- get_attribute:
- abstract_1c2_catalog_instance_0
- 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -589,8 +586,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1a_t2_port_network_role_tag:
- - ppds
+ port_1a_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1a_t2_port_network:
@@ -800,8 +796,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_network_role_tag:
- - oam
+ port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -943,4 +938,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index fae0d48..e318ce1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -91,15 +89,11 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -109,10 +103,8 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -127,25 +119,17 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
1c1_scalling_instance_1c1_t1_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index fd02764..a658c2b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f8..2872bb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
index 595d5d0..9730b31 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_a_single_1aServiceTemplate.yaml
@@ -17,18 +17,14 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -43,10 +39,8 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -81,20 +75,14 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -104,15 +92,11 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 28a98f3..5c28d30 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -32,10 +32,8 @@
entry_schema:
type: json
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -47,10 +45,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -58,10 +54,8 @@
type: string
required: true
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_ip_requirements:
type: list
required: true
@@ -71,10 +65,8 @@
type: string
required: true
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -84,15 +76,11 @@
entry_schema:
type: string
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_vlan_requirements:
type: list
required: true
@@ -112,15 +100,11 @@
entry_schema:
type: string
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
b_single_1b:
type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 35b6ab9..85181a6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -94,15 +82,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
index 973ca85..6f2b5a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
server_group:
hidden: false
immutable: false
@@ -161,10 +147,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9589304..cb3099c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -923,17 +923,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -951,29 +947,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -998,11 +986,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
server_group:
type: string
required: true
@@ -1074,11 +1060,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -1518,11 +1502,9 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -1598,17 +1580,13 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -1620,11 +1598,9 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -1642,29 +1618,21 @@
required: true
status: SUPPORTED
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
1c1_scalling_instance_instance_name:
type: list
@@ -2100,21 +2068,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -2132,11 +2096,9 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -2178,23 +2140,17 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2206,17 +2162,13 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
@@ -2662,17 +2614,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -2692,17 +2640,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -2714,17 +2658,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -2762,17 +2702,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -3230,11 +3166,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3242,27 +3176,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3278,17 +3206,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3300,11 +3224,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3352,11 +3274,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -3798,11 +3718,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -3810,27 +3728,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -3846,17 +3758,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -3868,11 +3776,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -3920,11 +3826,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -4390,11 +4294,9 @@
entry_schema:
type: json
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -4408,11 +4310,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -4422,11 +4322,9 @@
required: true
status: SUPPORTED
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_ip_requirements:
type: list
required: true
@@ -4438,11 +4336,9 @@
required: true
status: SUPPORTED
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4454,17 +4350,13 @@
entry_schema:
type: string
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_vlan_requirements:
type: list
required: true
@@ -4488,17 +4380,13 @@
entry_schema:
type: string
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
b_single_1b_instance_name:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 2b3b7f6..286c01c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -134,8 +134,7 @@
compute_1c1_scalling_instance_user_data_format:
- RAW2
- RAW1
- port_1c1_t2_port_network_role_tag:
- - ppds
+ port_1c1_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1c1_t1_port_ip_requirements:
@@ -294,8 +293,7 @@
is_required: false
compute_1c2_catalog_instance_user_data_format:
- RAW1
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -352,8 +350,7 @@
- get_attribute:
- abstract_1c2_catalog_instance_0
- 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -510,8 +507,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1a_t2_port_network_role_tag:
- - ppds
+ port_1a_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1a_t2_port_network:
@@ -713,8 +709,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1b_t1_port_network_role_tag:
- - oam
+ port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -849,4 +844,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index fae0d48..e318ce1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -25,10 +25,8 @@
entry_schema:
type: string
port_1c1_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -91,15 +89,11 @@
constraints:
- greater_or_equal: 0
port_1c1_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c1_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -109,10 +103,8 @@
entry_schema:
type: string
port_1c1_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t2_port_name:
type: list
required: true
@@ -127,25 +119,17 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
1c1_scalling_instance_1c1_t1_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index fd02764..a658c2b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 22a98f8..2872bb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
index 595d5d0..9730b31 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_a_single_1aServiceTemplate.yaml
@@ -17,18 +17,14 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -43,10 +39,8 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -81,20 +75,14 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -104,15 +92,11 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
index 28a98f3..5c28d30 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -32,10 +32,8 @@
entry_schema:
type: json
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t2_port_vlan_requirements:
type: list
required: true
@@ -47,10 +45,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -58,10 +54,8 @@
type: string
required: true
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_ip_requirements:
type: list
required: true
@@ -71,10 +65,8 @@
type: string
required: true
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -84,15 +76,11 @@
entry_schema:
type: string
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_vlan_requirements:
type: list
required: true
@@ -112,15 +100,11 @@
entry_schema:
type: string
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
b_single_1b:
type: org.openecomp.resource.vfc.nodes.heat.b_single_1b
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 35b6ab9..85181a6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -94,15 +82,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
index 973ca85..6f2b5a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
server_group:
hidden: false
immutable: false
@@ -161,10 +147,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2f8d03a..4dbd5cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -993,23 +993,17 @@
entry_schema:
type: string
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_1c12_scalling_instance_availability_zone:
type: list
required: true
@@ -1023,11 +1017,9 @@
entry_schema:
type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
1c12_scalling_instance_1c1_t1_port_tenant_id:
type: list
@@ -1451,23 +1443,17 @@
entry_schema:
type: json
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c1_t1_port_network:
type: list
required: true
@@ -1475,11 +1461,9 @@
entry_schema:
type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
1c11_scalling_instance_instance_name:
type: list
@@ -1831,17 +1815,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -1859,29 +1839,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -1906,11 +1878,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
server_group:
type: string
required: true
@@ -1986,11 +1956,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -2438,17 +2406,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_a_single_2a_scheduler_hints:
type: list
required: true
@@ -2456,11 +2420,9 @@
entry_schema:
type: json
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_a_single_2a_availability_zone:
type: list
required: true
@@ -2482,11 +2444,9 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_a_single_2a_name:
type: list
required: true
@@ -2855,11 +2815,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -2867,27 +2825,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -2903,17 +2855,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -2925,11 +2873,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -2977,11 +2923,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -3430,21 +3374,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -3462,11 +3402,9 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -3508,23 +3446,17 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -3536,17 +3468,13 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
@@ -3992,11 +3920,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -4004,27 +3930,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -4040,17 +3960,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -4062,11 +3978,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -4114,11 +4028,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -4560,17 +4472,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -4590,17 +4498,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -4612,17 +4516,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -4660,11 +4560,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_b_single_1b_metadata:
type: list
required: true
@@ -4672,11 +4570,9 @@
entry_schema:
type: json
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -5128,11 +5024,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -5140,27 +5034,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -5176,17 +5064,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -5198,11 +5082,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -5256,11 +5138,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -5702,11 +5582,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
@@ -5714,27 +5592,21 @@
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
status: SUPPORTED
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -5750,17 +5622,13 @@
required: true
status: SUPPORTED
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -5772,11 +5640,9 @@
required: true
status: SUPPORTED
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -5824,11 +5690,9 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
@@ -6265,17 +6129,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -6307,33 +6167,25 @@
entry_schema:
type: json
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_b_single_2b_availability_zone:
type: list
required: true
@@ -6377,17 +6229,13 @@
entry_schema:
type: string
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -6828,17 +6676,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -6858,17 +6702,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -6880,17 +6720,13 @@
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -6934,17 +6770,13 @@
entry_schema:
type: json
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -7402,17 +7234,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -7438,33 +7266,25 @@
entry_schema:
type: json
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_b_single_2b_availability_zone:
type: list
required: true
@@ -7514,17 +7334,13 @@
entry_schema:
type: string
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index 2c5b8ab..9407798 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -354,8 +354,7 @@
- get_attribute:
- abstract_1c2_catalog_instance_1
- 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -412,8 +411,7 @@
- get_attribute:
- abstract_1c2_catalog_instance_0
- 1c2_catalog_instance_instance_name
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -537,8 +535,7 @@
is_required: false
compute_1c2_catalog_instance_user_data_format:
- RAW1
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -593,8 +590,7 @@
is_required: false
compute_1c2_catalog_instance_user_data_format:
- RAW1
- port_1c2_t1_port_network_role_tag:
- - oam
+ port_1c2_t1_port_network_role_tag: oam
port_1c2_t1_port_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -754,8 +750,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_1a_t2_port_network_role_tag:
- - ppds
+ port_1a_t2_port_network_role_tag: ppds
vm_flavor_name:
get_input: pd_flavor_name
port_1a_t2_port_network:
@@ -933,8 +928,7 @@
- a_single_1a_1a_t1_port_tenant_id
compute_b_single_2b_user_data_format:
- RAW
- port_1b_t1_port_network_role_tag:
- - oam
+ port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -1563,8 +1557,7 @@
- get_attribute:
- abstract_a_single_1a
- a_single_1a_1a_t1_port_tenant_id
- port_1b_t1_port_network_role_tag:
- - oam
+ port_1b_t1_port_network_role_tag: oam
port_1b_t1_port_mac_requirements:
mac_count_required:
is_required: false
@@ -2020,4 +2013,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
index 4e16efb..4b6aed7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c11_scalling_instanceServiceTemplate.yaml
@@ -71,30 +71,22 @@
entry_schema:
type: json
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network:
type: list
required: true
entry_schema:
type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
1c11_scalling_instance:
type: org.openecomp.resource.vfc.nodes.heat.1c11_scalling_instance
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index 195f916..101a1fd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -66,20 +66,14 @@
entry_schema:
type: string
port_1c1_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c1_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_1c12_scalling_instance_availability_zone:
type: list
required: true
@@ -91,10 +85,8 @@
entry_schema:
type: string
port_1c1_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
1c12_scalling_instance_1c1_t1_port:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
index 351bfc7..f09ccb2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_0ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -117,10 +103,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
index 767c177..ac0d816 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_1ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
index 172cfbb..576a555 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_2ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
index dc50360..32a9dee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c2_catalog_instance_3ServiceTemplate.yaml
@@ -12,33 +12,25 @@
topology_template:
inputs:
port_1c2_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_1c2_catalog_instance_availability_zone:
type: list
required: true
entry_schema:
type: string
port_1c2_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1c2_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_vlan_requirements:
type: list
required: true
@@ -51,15 +43,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1c2_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1c2_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_ip_requirements:
type: list
required: true
@@ -69,10 +57,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_1c2_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t2_port_network:
type: list
required: true
@@ -112,10 +98,8 @@
entry_schema:
type: string
port_1c2_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1c2_t1_port_ip_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
index d2b0814..15e3f83 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_1aServiceTemplate.yaml
@@ -22,18 +22,14 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
port_1a_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_network:
type: list
required: true
@@ -48,10 +44,8 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -86,20 +80,14 @@
constraints:
- greater_or_equal: 0
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1a_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -109,15 +97,11 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_1a_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_a_single_1a_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
index b82ccec..364ee2a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_a_single_2aServiceTemplate.yaml
@@ -32,25 +32,19 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1a_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1a_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_a_single_2a_scheduler_hints:
type: list
required: true
entry_schema:
type: json
port_1a_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_a_single_2a_availability_zone:
type: list
required: true
@@ -68,10 +62,8 @@
entry_schema:
type: string
port_1a_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_a_single_2a_name:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
index a33804d..3c27b07 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -99,15 +87,11 @@
entry_schema:
type: json
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
index 32b8575..d49088c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_1b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -36,15 +32,11 @@
type: string
required: true
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_b_single_1b_user_data_format:
type: list
required: true
@@ -54,15 +46,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -94,20 +82,16 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_b_single_1b_metadata:
type: list
required: true
entry_schema:
type: json
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
index 462ec03..c268a09 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_0ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -41,28 +37,20 @@
entry_schema:
type: json
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_b_single_2b_availability_zone:
type: list
required: true
@@ -104,15 +92,11 @@
entry_schema:
type: string
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index 3d7c15c..c894808 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_1b_t1_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t1_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -46,28 +42,20 @@
entry_schema:
type: json
port_1b_t2_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_1b_t2_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_1b_t2_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t2_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_b_single_2b_availability_zone:
type: list
required: true
@@ -104,15 +92,11 @@
entry_schema:
type: string
port_1b_t1_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_1b_t1_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
index f96fc7e..0b0de80 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
server_group:
hidden: false
immutable: false
@@ -165,10 +151,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 977b81a..92ea0fa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,17 +9,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -37,29 +33,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -84,11 +72,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -156,11 +142,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -584,17 +568,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -612,29 +592,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -659,11 +631,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -731,11 +701,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 7203c34..6ca8ae7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 2cf7197..aaf4005 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 3e8521f..e7c81c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,11 +9,9 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
p1:
type: string
description: UID of OAM network
@@ -25,11 +23,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -47,29 +43,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -94,11 +82,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -166,11 +152,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -599,45 +583,35 @@
required: true
status: SUPPORTED
port_oam_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
required: true
status: SUPPORTED
port_oam_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_oam_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
oam_server_name:
type: string
description: oam server name
required: true
status: SUPPORTED
port_oam_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_oam_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_oam_port_1_ip_requirements:
type: list
required: true
@@ -649,17 +623,13 @@
required: true
status: SUPPORTED
port_oam_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_oam_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_oam_port_1_vlan_requirements:
type: list
required: true
@@ -706,11 +676,9 @@
required: true
status: SUPPORTED
port_oam_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_oam_port_0_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
index e297848..b19b647 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml
@@ -481,4 +481,4 @@
description: |
Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
members:
- - abstract_oam_server_1
\ No newline at end of file
+ - abstract_oam_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
index ccd5ed5..ede031c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -17,10 +17,8 @@
type: string
description: UID of OAM network
port_oam_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -28,15 +26,11 @@
type: string
description: availabilityzone name
port_oam_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_oam_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
oam_server_name:
label: oam server name
hidden: false
@@ -44,15 +38,11 @@
type: string
description: oam server name
port_oam_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_oam_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_oam_port_1_ip_requirements:
type: list
required: true
@@ -62,15 +52,11 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_oam_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_oam_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_oam_port_1_vlan_requirements:
type: list
required: true
@@ -122,10 +108,8 @@
type: string
description: CPS network ip
port_oam_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_oam_port_0_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 6309367..65d3a22 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,10 +12,8 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
p1:
hidden: false
immutable: false
@@ -27,10 +25,8 @@
type: string
description: UID of OAM network
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -49,25 +45,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -93,10 +81,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -167,10 +153,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 8bd3381..e09581b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,22 +9,18 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
metadata:
type: string
description: metadata
required: true
status: SUPPORTED
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -42,29 +38,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -89,11 +77,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -171,11 +157,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -599,17 +583,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -627,29 +607,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
oam_image_name:
type: string
description: oam image name
@@ -674,11 +646,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -746,11 +716,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_oam_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
index e2ba8d9..b645ce5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml
@@ -395,4 +395,4 @@
- abstract_compute
- abstract_pcm_server_0
- abstract_oam_server_0
- - abstract_pcm_server_1
\ No newline at end of file
+ - abstract_pcm_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 96968c1..7c6d447 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: oam server name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
oam_image_name:
label: image name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
server_oam:
type: org.openecomp.resource.vfc.nodes.heat.oam_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index ff362fd..31ff033 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,10 +12,8 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
metadata:
label: metadata
hidden: false
@@ -23,10 +21,8 @@
type: string
description: metadata
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -45,25 +41,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -89,10 +77,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -175,10 +161,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 54adda6..6131194 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,22 +9,18 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
metadata:
type: string
description: metadata
required: true
status: SUPPORTED
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -42,29 +38,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -89,11 +77,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -166,11 +152,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -594,17 +578,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -622,29 +602,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
oam_image_name:
type: string
description: oam image name
@@ -669,11 +641,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -741,11 +711,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_oam_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index 96eb3c5..d434ddd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -408,4 +408,4 @@
value:
get_attribute:
- abstract_pcm_server_0
- - server_pcm_id
\ No newline at end of file
+ - server_pcm_id
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
index 96968c1..7c6d447 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: oam server name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
oam_image_name:
label: image name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
server_oam:
type: org.openecomp.resource.vfc.nodes.heat.oam_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
index 25e983f..9c59aae 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,10 +12,8 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
metadata:
label: metadata
hidden: false
@@ -23,10 +21,8 @@
type: string
description: metadata
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -45,25 +41,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -89,10 +77,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -169,10 +155,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 83a3760..16dda32 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,17 +9,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -37,29 +33,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -84,11 +72,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -156,11 +142,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -590,11 +574,9 @@
entry_schema:
type: string
port_compute_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -620,11 +602,9 @@
required: true
status: SUPPORTED
port_compute_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -636,11 +616,9 @@
entry_schema:
type: string
port_compute_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_compute_metadata:
type: list
required: true
@@ -648,11 +626,9 @@
entry_schema:
type: json
port_compute_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_compute_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -1002,4 +978,4 @@
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
occurrences:
- 1
- - UNBOUNDED
\ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
index 77a2573..f0cf923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml
@@ -208,8 +208,7 @@
get_input: compute_image_name
port_compute_port_network:
- get_input: port_net_name
- port_compute_port_network_role_tag:
- - port
+ port_compute_port_network_role_tag: port
compute_compute_metadata:
- get_attribute:
- abstract_pcm_server_0
@@ -240,4 +239,4 @@
members:
- packet_mirror_network
- abstract_compute
- - abstract_pcm_server_0
\ No newline at end of file
+ - abstract_pcm_server_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
index 0695e7d..7a9311c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml
@@ -17,10 +17,8 @@
entry_schema:
type: string
port_compute_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -42,10 +40,8 @@
type: string
required: true
port_compute_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -55,20 +51,16 @@
entry_schema:
type: string
port_compute_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_compute_metadata:
type: list
required: true
entry_schema:
type: json
port_compute_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_compute_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -317,4 +309,4 @@
- link
dependency_compute:
- compute
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
index 7da1206..3041772 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -461,4 +445,4 @@
- dependency
dependency_pcm_port_1:
- pcm_port_1
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4214d0d..060e2ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -20,34 +20,26 @@
required: true
status: SUPPORTED
port_pcm_1port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_image_name:
type: string
description: PCRF CM image name
required: true
status: SUPPORTED
port_pcm_1port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_1port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_2port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_2port_1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -82,28 +74,22 @@
required: true
status: SUPPORTED
port_pcm_2port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
oam_net_gw:
type: string
description: CPS network gateway
required: true
status: SUPPORTED
port_pcm_1port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_2port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
security_group_name:
type: string
description: the name of security group
@@ -150,11 +136,9 @@
required: true
status: SUPPORTED
port_pcm_2port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_2port_1_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 017b37c..71b5124 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -23,10 +23,8 @@
type: string
description: availabilityzone name
port_pcm_1port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_image_name:
label: image name
hidden: false
@@ -34,20 +32,14 @@
type: string
description: PCRF CM image name
port_pcm_1port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_1port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_2port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_2port_1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -81,10 +73,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_pcm_2port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
oam_net_gw:
label: CPS network gateway
hidden: false
@@ -92,15 +82,11 @@
type: string
description: CPS network gateway
port_pcm_1port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_2port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
security_group_name:
label: security group name
hidden: false
@@ -152,10 +138,8 @@
type: string
description: CPS network mask
port_pcm_2port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_2port_1_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ab26251..e084f23 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -766,4 +766,4 @@
type: tosca.capabilities.OperatingSystem
occurrences:
- 1
- - UNBOUNDED
\ No newline at end of file
+ - UNBOUNDED
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
index 1dc9eeb..4f83013 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml
@@ -249,4 +249,4 @@
members:
- server_pd_1
- server_pcm_1
- - compute_port_0
\ No newline at end of file
+ - compute_port_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
index 6508815..d03bd42 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -543,4 +543,4 @@
- dependency
dependency_pcm_port_1:
- pcm_port_1
- - dependency
\ No newline at end of file
+ - dependency
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 61a8efa..c1c907f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,17 +9,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -37,29 +33,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -84,11 +72,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -156,11 +142,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -584,17 +568,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -612,29 +592,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -659,11 +631,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -731,11 +701,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -1159,17 +1127,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -1187,29 +1151,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -1234,11 +1190,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -1306,11 +1260,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 7203c34..6ca8ae7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
index 2cf7197..aaf4005 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
index 6d48142..fbd0228 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 038d880..86e1869 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,17 +9,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -37,29 +33,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -84,11 +72,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -156,11 +142,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
@@ -584,17 +568,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -612,29 +592,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -659,11 +631,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -731,11 +701,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
index 85e96b6..8d68beb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml
@@ -189,4 +189,4 @@
- compute_port_0
- abstract_pcm_server_0
- abstract_pcm_server_1
- - abstract_pcm_server_1_0
\ No newline at end of file
+ - abstract_pcm_server_1_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5d82785..3041772 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
index 2742d5d..7abe24c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 508e2c0..35bb849 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -9,17 +9,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -37,29 +33,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -84,11 +72,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -156,11 +142,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
index bb37b60..7c18440 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml
@@ -193,4 +193,4 @@
- compute_port_0
- abstract_compute
- abstract_pcm_server_0
- - abstract_pcm_server_1
\ No newline at end of file
+ - abstract_pcm_server_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5d82785..3041772 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -39,25 +35,17 @@
type: string
description: PCRF CM image name
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -83,10 +71,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -157,10 +143,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5895576..a1c235a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 3977cda..9bcbf7f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -93,4 +93,4 @@
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 848d275..9d1ce05 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 04f247d..d2f6cfb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
index 0ef1092..53569c0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml
@@ -117,4 +117,4 @@
- network_policy_server_pd_01
- network_policy_server_pd_02
- network_policy_port0
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 92f4074..69f28f1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1b491a0..d4331da 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
index 02d0a4d..cfa575c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml
@@ -115,4 +115,4 @@
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
index f2732b8..77ab1d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 94f3282..712c687 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
index e953b93..b35fcd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml
@@ -87,4 +87,4 @@
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
index 40d90a9..baaf517 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 46624ff..0d04a1e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,29 +69,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
index 9264448..32b9d60 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -128,4 +128,4 @@
members:
- jsa_security_group
- resource_with_dependOn
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index 4b78ba7..138ca69 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -61,25 +61,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5895576..a1c235a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
index 289e675..62c9c11 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -151,4 +151,4 @@
members:
- packet_mirror_network
- pd01_volume
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 848d275..9d1ce05 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 6d23833..ddf141a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,29 +69,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
index 93d1198..9bb3ae9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml
@@ -108,4 +108,4 @@
name: Policy_BE_Affinity
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
index a3c069e..2934512 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml
@@ -61,25 +61,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c717839..837e03c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
index 718d6e9..8e24e46 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -112,4 +112,4 @@
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv6
\ No newline at end of file
+ - pd_server_accessIPv6
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 033f1bb..7a768a2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2ef7b49..ef0e8f7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -444,11 +436,9 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -480,21 +470,17 @@
required: true
status: SUPPORTED
port_ps01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
status: SUPPORTED
port_ps01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_replacement_policy:
type: list
required: true
@@ -518,11 +504,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
index 7d67ee6..2c5b6f8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml
@@ -164,4 +164,4 @@
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
\ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 848d275..9d1ce05 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
index e0afd0e..ca933c2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml
@@ -17,10 +17,8 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -47,18 +45,14 @@
type: string
required: true
port_ps01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
port_ps01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_replacement_policy:
type: list
required: true
@@ -78,10 +72,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
index a40e88e..0764496 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -63,29 +63,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -450,11 +442,9 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -486,21 +476,17 @@
required: true
status: SUPPORTED
port_ps01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
status: SUPPORTED
port_ps01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_replacement_policy:
type: list
required: true
@@ -524,11 +510,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
index 4f92e3e..dfb0641 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml
@@ -168,4 +168,4 @@
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
\ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
index 24150fe..84d41a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
index 5f9292d..f336c3e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml
@@ -17,10 +17,8 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -47,18 +45,14 @@
type: string
required: true
port_ps01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
port_ps01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_replacement_policy:
type: list
required: true
@@ -78,10 +72,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7beb5be..b484bfb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,23 +41,17 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -85,33 +79,25 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
index cb7fd89..4382027 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
vm_flavor_name:
get_input: pd_flavor_name
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -456,8 +455,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -477,4 +475,4 @@
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
index f66e9f4..f066fe3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/Nested_pd_serverServiceTemplate.yaml
@@ -38,20 +38,14 @@
type: string
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -74,38 +68,28 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 71ecda1..b88f5d8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,11 +25,9 @@
entry_schema:
type: string
port_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -51,11 +49,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -73,11 +69,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -99,11 +93,9 @@
entry_schema:
type: string
port_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_smp_scheduler_hints:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
index f171a22..c325682 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml
@@ -129,4 +129,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
index 53479a1..61eebac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/Nested_smpServiceTemplate.yaml
@@ -25,10 +25,8 @@
entry_schema:
type: string
port_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -47,10 +45,8 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_flavor_name:
type: string
required: true
@@ -65,10 +61,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -86,10 +80,8 @@
entry_schema:
type: string
port_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_smp_scheduler_hints:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index e945040..087649f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -37,11 +37,9 @@
entry_schema:
type: json
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -63,11 +61,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -97,17 +93,13 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -127,27 +119,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -155,11 +141,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index 134050d..077dfc9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -108,8 +108,7 @@
get_input: pd_flavor_name
port_pd01_port_security_groups:
- - jsa_security_group
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -138,8 +137,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
service_template_filter:
@@ -159,4 +157,4 @@
members:
- resources_with_dependOn
- jsa_security_group
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index b488a50..6890c36 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -35,10 +35,8 @@
entry_schema:
type: json
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -56,10 +54,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -84,15 +80,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -109,33 +101,25 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9fc8547..9be0ebf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -31,11 +31,9 @@
required: true
status: SUPPORTED
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -57,11 +55,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -91,17 +87,13 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -115,27 +107,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -143,11 +129,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 7588e02..482b763 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -170,4 +170,4 @@
members:
- packet_mirror_network
- pd01_volume
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 2a5afbf..89092ee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -30,10 +30,8 @@
type: string
required: true
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -51,10 +49,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -79,15 +75,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_vlan_requirements:
type: list
required: true
@@ -99,33 +91,25 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 331b527..3bdd9e6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -31,11 +31,9 @@
entry_schema:
type: json
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_pd_server_availability_zone:
type: list
required: true
@@ -59,39 +57,29 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
@@ -105,11 +93,9 @@
entry_schema:
type: string
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -125,11 +111,9 @@
constraints:
- greater_or_equal: 0
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_0_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
index cbda546..055edbc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml
@@ -121,14 +121,12 @@
get_input: pd_flavor_name
vm_image_name:
get_input: pd_image_name
- port_pd01_port_1_network_role_tag:
- - oam
+ port_pd01_port_1_network_role_tag: oam
port_pd01_port_1_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
- RAW
- port_pd01_port_0_network_role_tag:
- - oam
+ port_pd01_port_0_network_role_tag: oam
port_pd01_port_1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -159,4 +157,4 @@
members:
- resources_with_dependOn
- jsa_security_group
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index 87e0494..b112335 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -30,10 +30,8 @@
entry_schema:
type: json
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_pd_server_availability_zone:
type: list
required: true
@@ -53,33 +51,23 @@
type: string
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
@@ -91,10 +79,8 @@
entry_schema:
type: string
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -108,10 +94,8 @@
constraints:
- greater_or_equal: 0
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_0_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 2d2089d..50a0b6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,11 +25,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_pd_server_availability_zone:
type: list
required: true
@@ -53,39 +51,29 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
@@ -99,11 +87,9 @@
entry_schema:
type: string
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
constraints:
- greater_or_equal: 0
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_0_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 4fd079f..5931d12 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -182,4 +182,4 @@
- packet_mirror_network
- pd01_volume
- packet_internal_network
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 5fc3677..2de5078 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -25,10 +25,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_pd_server_availability_zone:
type: list
required: true
@@ -48,33 +46,23 @@
type: string
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
@@ -86,10 +74,8 @@
entry_schema:
type: string
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -103,10 +89,8 @@
constraints:
- greater_or_equal: 0
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_0_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
index fb81c9e..023b48b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,23 +41,17 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -85,33 +79,25 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -560,17 +544,13 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
availabilityzone_name:
type: string
description: availabilityzone name
@@ -593,29 +573,21 @@
required: true
status: SUPPORTED
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
pcm_server_name:
type: string
description: PCRF CM server name
@@ -640,11 +612,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -717,11 +687,9 @@
required: true
status: SUPPORTED
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
attributes:
server_pcm_id:
type: string
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
index 1da54cc..48d9735 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml
@@ -466,8 +466,7 @@
is_required: false
vm_flavor_name:
get_input: pd_flavor_name
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -487,8 +486,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -509,4 +507,4 @@
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_pcm_server_0
\ No newline at end of file
+ - abstract_pcm_server_0
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
index f66e9f4..f066fe3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml
@@ -38,20 +38,14 @@
type: string
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -74,38 +68,28 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
index 5530999..73aad65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -12,15 +12,11 @@
topology_template:
inputs:
port_pcm_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
availabilityzone_name:
label: availabilityzone name
hidden: false
@@ -45,25 +41,17 @@
type: string
description: CPS network ip
port_pcm_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pcm_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
pcm_server_name:
label: PCRF CM server name
hidden: false
@@ -89,10 +77,8 @@
type: string
description: OAM network name
port_pcm_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pcm_port_0_ip_requirements:
type: list
required: true
@@ -169,10 +155,8 @@
type: string
description: CPS network mask
port_pcm_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
node_templates:
pcm_port_1:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 754b59c..5278a65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,17 +25,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -63,11 +59,9 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -77,17 +71,13 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -99,11 +89,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -113,11 +101,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
@@ -125,11 +111,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index 1aa6188..4715d0e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_0_network_role_tag:
- - oam
+ port_pd01_port_0_network_role_tag: oam
port_pd01_port_1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -456,8 +455,7 @@
is_required: false
vm_image_name:
get_input: pd_image_name
- port_pd01_port_1_network_role_tag:
- - oam
+ port_pd01_port_1_network_role_tag: oam
port_pd01_port_1_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -477,4 +475,4 @@
heat_file: ../Artifacts/hot-mog-0108-bs1271.yml
description: heat template that creates MOG stack
members:
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
index 17c2a7b..72b3354 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/Nested_pd_serverServiceTemplate.yaml
@@ -25,15 +25,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -57,10 +53,8 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -68,15 +62,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -86,10 +76,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -97,20 +85,16 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4cb3976..f78767a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,23 +41,17 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -85,33 +79,25 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index bc00a0f..20504bc 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
vm_flavor_name:
get_input: pd_flavor_name
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -456,8 +455,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -496,4 +494,4 @@
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv4
\ No newline at end of file
+ - pd_server_accessIPv4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 099ad6c..cab0a44 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -38,20 +38,14 @@
type: string
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -74,38 +68,28 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b367277..27c09dd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,23 +41,17 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -85,33 +79,25 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
index d5fd0f2..697a93c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
vm_flavor_name:
get_input: pd_flavor_name
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -456,8 +455,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
port_pd02_port_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -493,4 +491,4 @@
members:
- network_policy_port
- network_policy_server
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
index 957e59f..21e3150 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -38,20 +38,14 @@
type: string
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -74,38 +68,28 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7beb5be..b484bfb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -41,23 +41,17 @@
required: true
status: SUPPORTED
port_pd02_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -85,33 +79,25 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
@@ -119,11 +105,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index 1138730..a33dea1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -437,8 +437,7 @@
get_attribute:
- network_policy_server
- name
- port_pd02_port_network_role_tag:
- - oam
+ port_pd02_port_network_role_tag: oam
port_pd01_port_mac_requirements:
mac_count_required:
is_required: false
@@ -485,4 +484,4 @@
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index f66e9f4..f066fe3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -38,20 +38,14 @@
type: string
required: true
port_pd02_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd02_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -74,38 +68,28 @@
entry_schema:
type: string
port_pd02_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd02_port_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 754b59c..5278a65 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,17 +25,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -63,11 +59,9 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -77,17 +71,13 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -99,11 +89,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -113,11 +101,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
@@ -125,11 +111,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index 489dcba..07ce00a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -87,8 +87,6 @@
is_required: false
vm_image_name:
get_input: pd_image_name
- port_pd01_port_1_network_role_tag:
- - oam
port_pd01_port_1_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -114,4 +112,4 @@
description: heat template that creates MOG stack
members:
- network_policy_server
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 17c2a7b..72b3354 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -25,15 +25,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -57,10 +53,8 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -68,15 +62,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -86,10 +76,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -97,20 +85,16 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 5f072b9..5b0d254 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,17 +25,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -63,11 +59,9 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -77,17 +71,13 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -99,11 +89,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -113,11 +101,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
@@ -125,11 +111,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
index 561a5e2..8b195d0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_0_network_role_tag:
- - oam
+ port_pd01_port_0_network_role_tag: oam
port_pd01_port_1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -456,8 +455,7 @@
is_required: false
vm_image_name:
get_input: pd_image_name
- port_pd01_port_1_network_role_tag:
- - oam
+ port_pd01_port_1_network_role_tag: oam
port_pd01_port_1_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -501,4 +499,4 @@
- network_policy_port0
- network_policy_server
- network_policy_port1
- - abstract_pd_server
\ No newline at end of file
+ - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 6780cde..a55c9d4 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -25,15 +25,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -57,10 +53,8 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -68,15 +62,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -86,10 +76,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -97,20 +85,16 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c5b6091..0ef3218 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -25,17 +25,13 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -63,11 +59,9 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -77,17 +71,13 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -99,11 +89,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -113,11 +101,9 @@
required: true
status: SUPPORTED
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
@@ -125,11 +111,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
index 09a422b..4295d6f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml
@@ -435,8 +435,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_pd01_port_0_network_role_tag:
- - oam
+ port_pd01_port_0_network_role_tag: oam
port_pd01_port_1_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -456,8 +455,7 @@
is_required: false
vm_image_name:
get_input: pd_image_name
- port_pd01_port_1_network_role_tag:
- - oam
+ port_pd01_port_1_network_role_tag: oam
port_pd01_port_1_network:
- get_input: oam_net_name
compute_pd_server_user_data_format:
@@ -496,4 +494,4 @@
value:
get_attribute:
- abstract_pd_server
- - pd_server_accessIPv4
\ No newline at end of file
+ - pd_server_accessIPv4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
index 7f61688..0ab61b8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -25,15 +25,11 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_0_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_ip_requirements:
type: list
required: true
@@ -57,10 +53,8 @@
entry_schema:
type: string
port_pd01_port_1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_flavor_name:
type: string
required: true
@@ -68,15 +62,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_1_vlan_requirements:
type: list
required: true
@@ -86,10 +76,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_pd01_port_1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
@@ -97,20 +85,16 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_0_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_pd01_port_0_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_1_network:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
index cf65048..753e1c5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -69,29 +69,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -503,17 +495,13 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_oam_server_user_data_format:
type: list
required: true
@@ -527,17 +515,13 @@
entry_schema:
type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -962,29 +946,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
index 540ba14..82259a7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml
@@ -229,8 +229,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -327,8 +326,7 @@
- get_input:
- oam_server_names
- 0
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_oam_server_scheduler_hints:
- group: BE_Affinity_group
service_template_filter:
@@ -471,4 +469,4 @@
name: def
affinity: host
targets:
- - BE_Affinity_group
\ No newline at end of file
+ - BE_Affinity_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
index 86140ff..edf8bd2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_oam_serverServiceTemplate.yaml
@@ -51,15 +51,11 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_oam_server_user_data_format:
type: list
required: true
@@ -71,15 +67,11 @@
entry_schema:
type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
index 7f289a5..19c74bf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_pd_serverServiceTemplate.yaml
@@ -61,25 +61,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
index 1b1ba2f..c9443f5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/Nested_ps_serverServiceTemplate.yaml
@@ -66,25 +66,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
index dad62cb..ca9a33c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -474,17 +466,13 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_oam_server_user_data_format:
type: list
required: true
@@ -498,17 +486,13 @@
entry_schema:
type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -909,29 +893,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
index bd59583..927e672 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml
@@ -198,8 +198,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -280,8 +279,7 @@
- get_input:
- oam_server_names
- 0
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
service_template_filter:
substitute_service_template: Nested_oam_serverServiceTemplate.yaml
count: 1
@@ -305,4 +303,4 @@
- network_policy_server
- abstract_pd_server
- abstract_ps_server
- - abstract_oam_server
\ No newline at end of file
+ - abstract_oam_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
index 7f0cba4..4c65966 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_oam_serverServiceTemplate.yaml
@@ -46,15 +46,11 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_oam_server_user_data_format:
type: list
required: true
@@ -66,15 +62,11 @@
entry_schema:
type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
index 4e52db4..fc9395c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_pd_serverServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
index f0d3d28..71cb4b5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/Nested_ps_serverServiceTemplate.yaml
@@ -56,25 +56,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 590f311..44ad0fe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -51,29 +51,21 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -468,29 +460,21 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -891,29 +875,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
index 2d1315c..46f451d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml
@@ -211,8 +211,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -307,4 +306,4 @@
- network_policy_server
- abstract_pd_server_0
- abstract_pd_server_1
- - abstract_pd_server_2
\ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
index 599756d..a44d082 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -46,25 +46,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
index 5ed2bb6..f923c1d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -46,25 +46,17 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
index 6dd9433..828bcb6 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1f2d24b..74f9812 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -480,29 +472,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -855,23 +839,17 @@
derived_from: org.openecomp.resource.abstract.nodes.VFC
properties:
port_pd01_port_2_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_3_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_3_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -903,11 +881,9 @@
required: true
status: SUPPORTED
port_pd01_port_2_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_3_ip_requirements:
type: list
required: true
@@ -925,27 +901,21 @@
entry_schema:
type: string
port_pd01_port_2_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_2_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
status: SUPPORTED
port_pd01_port_3_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_2_network:
type: list
required: true
@@ -967,11 +937,9 @@
required: true
status: SUPPORTED
port_pd01_port_3_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_pd_server_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
index 20bc890..f50bc8b 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml
@@ -185,8 +185,7 @@
get_attribute:
- network_policy_server
- name
- port_pd01_port_2_network_role_tag:
- - oam
+ port_pd01_port_2_network_role_tag: oam
port_pd01_port_3_ip_requirements:
- ip_version: 4
ip_count_required:
@@ -205,8 +204,7 @@
port_pd01_port_2_mac_requirements:
mac_count_required:
is_required: false
- port_pd01_port_3_network_role_tag:
- - oam
+ port_pd01_port_3_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
port_pd01_port_2_ip_requirements:
@@ -256,8 +254,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -318,4 +315,4 @@
- network_policy_server
- abstract_pd_server_0
- abstract_pd_server_1
- - abstract_pd_server_2
\ No newline at end of file
+ - abstract_pd_server_2
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
index 707bfc9..b1f51f3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_0ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
index 340d30e..a6d8533 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_1ServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
index 1a38b71..8164267 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/Nested_pd_server_2ServiceTemplate.yaml
@@ -12,20 +12,14 @@
topology_template:
inputs:
port_pd01_port_2_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_3_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_3_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
index_value:
type: integer
description: Index value of this substitution service template runtime instance
@@ -52,10 +46,8 @@
type: string
required: true
port_pd01_port_2_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_3_ip_requirements:
type: list
required: true
@@ -70,23 +62,17 @@
entry_schema:
type: string
port_pd01_port_2_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_2_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
vm_image_name:
type: string
required: true
port_pd01_port_3_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_2_network:
type: list
required: true
@@ -104,10 +90,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_pd01_port_3_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_pd_server_user_data_format:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
index b181fa1..b5daf7c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -444,11 +436,9 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -480,21 +470,17 @@
required: true
status: SUPPORTED
port_ps01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
status: SUPPORTED
port_ps01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -512,11 +498,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
index 5b70f82..69ccca5 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml
@@ -378,8 +378,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -420,8 +419,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_ps01_port_network_role_tag:
- - oam
+ port_ps01_port_network_role_tag: oam
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 1
@@ -438,4 +436,4 @@
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
\ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
index 94e2b14..38b011e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
index fdb4c58..4d002e7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/Nested_ps_serverServiceTemplate.yaml
@@ -17,10 +17,8 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -47,18 +45,14 @@
type: string
required: true
port_ps01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
port_ps01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -73,10 +67,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1f66eb3..8080962 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -57,29 +57,21 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
@@ -438,11 +430,9 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -474,21 +464,17 @@
required: true
status: SUPPORTED
port_ps01_port_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
status: SUPPORTED
port_ps01_port_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -506,11 +492,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
index 577954e..d3a239a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml
@@ -376,8 +376,7 @@
is_required: false
port_pd01_port_network:
- get_input: oam_net_name
- port_pd01_port_network_role_tag:
- - oam
+ port_pd01_port_network_role_tag: oam
compute_pd_server_user_data_format:
- RAW
service_template_filter:
@@ -416,8 +415,7 @@
is_required: false
floating_ip_count_required:
is_required: false
- port_ps01_port_network_role_tag:
- - oam
+ port_ps01_port_network_role_tag: oam
service_template_filter:
substitute_service_template: Nested_ps_serverServiceTemplate.yaml
count: 1
@@ -434,4 +432,4 @@
description: heat template that creates MOG stack
members:
- abstract_pd_server
- - abstract_ps_server
\ No newline at end of file
+ - abstract_ps_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
index 4e52db4..fc9395c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_pd_serverServiceTemplate.yaml
@@ -51,25 +51,17 @@
entry_schema:
type: string
port_pd01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_pd01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_pd01_port_vlan_requirements:
type: list
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
index 6050581..80443ab 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/Nested_ps_serverServiceTemplate.yaml
@@ -17,10 +17,8 @@
entry_schema:
type: string
port_ps01_port_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_ps_server_availability_zone:
type: list
required: true
@@ -47,18 +45,14 @@
type: string
required: true
port_ps01_port_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
vm_image_name:
type: string
required: true
port_ps01_port_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -73,10 +67,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_ps01_port_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_ps01_port_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c0eca3b..b994e51 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,11 +13,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
@@ -25,11 +23,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -37,11 +33,9 @@
entry_schema:
type: json
port_FSB2_Internal2_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal1_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -61,11 +55,9 @@
required: true
status: SUPPORTED
port_FSB2_Internal2_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal1_ip_requirements:
type: list
required: true
@@ -73,11 +65,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB2_Internal1_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
@@ -85,11 +75,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal1_mac_address:
type: string
required: true
@@ -111,11 +99,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
@@ -123,11 +109,9 @@
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal1_network:
type: list
required: true
@@ -143,11 +127,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal2_ip_requirements:
type: list
required: true
@@ -179,11 +161,9 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal2_network:
type: list
required: true
@@ -197,29 +177,21 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal1_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal2_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal1_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -231,17 +203,13 @@
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_FSB2_Internal2_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal1_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
index 94f859a..583f92a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/NoOutParamDuplicatePortType/out/SubstitutionServiceTemplate.yaml
@@ -15,30 +15,24 @@
type: string
required: true
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
entry_schema:
type: json
port_FSB2_Internal2_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal1_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
@@ -54,30 +48,24 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB2_Internal2_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal1_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB2_Internal1_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal1_mac_address:
type: string
required: true
@@ -95,20 +83,16 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal1_network:
type: list
required: true
@@ -121,10 +105,8 @@
type: org.openecomp.datatypes.network.MacRequirements
required: true
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal2_ip_requirements:
type: list
required: true
@@ -151,10 +133,8 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal2_network:
type: list
required: true
@@ -166,25 +146,17 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal1_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal2_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal1_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal1_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -194,15 +166,11 @@
entry_schema:
type: org.openecomp.datatypes.heat.neutron.port.FixedIps
port_FSB2_Internal2_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal1_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 17b4b1c..8f4f687 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,11 +13,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
@@ -25,11 +23,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -43,11 +39,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -65,11 +59,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
@@ -77,11 +69,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -89,21 +79,17 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
@@ -111,17 +97,13 @@
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -147,11 +129,9 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -165,11 +145,9 @@
required: true
status: SUPPORTED
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -197,11 +175,9 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
requirements:
- dependency_FSB1_FSB1_Internal:
capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
index c963d31..31f53ed 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithIndex/out/SubstitutionServiceTemplate.yaml
@@ -15,20 +15,16 @@
type: string
required: true
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -40,10 +36,8 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -58,53 +52,41 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -126,10 +108,8 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -140,10 +120,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -166,10 +144,8 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index d7f0bd2..9c1c0bb 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -19,11 +19,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -37,11 +35,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -53,17 +49,13 @@
required: true
status: SUPPORTED
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -71,21 +63,17 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_availability_zone:
type: list
required: true
@@ -119,11 +107,9 @@
required: true
status: SUPPORTED
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_network:
type: list
required: true
@@ -141,11 +127,9 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
FSB1_FSB1_Internal_network_id:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
index 9ccc191..6b1c37d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -20,10 +20,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -35,10 +33,8 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -48,33 +44,25 @@
type: string
required: true
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_availability_zone:
type: list
required: true
@@ -102,10 +90,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_network:
type: list
required: true
@@ -120,10 +106,8 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 1f8e6d3..9965624 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,11 +13,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
@@ -25,11 +23,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -43,11 +39,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -65,11 +59,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
@@ -77,11 +69,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -89,21 +79,17 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
@@ -111,17 +97,13 @@
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -147,11 +129,9 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -165,11 +145,9 @@
required: true
status: SUPPORTED
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -197,11 +175,9 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
FSB1_FSB1_Internal_network_id:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index ec54c8d..106cdcd 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -15,20 +15,16 @@
type: string
required: true
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -40,10 +36,8 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -58,53 +52,41 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -126,10 +108,8 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -140,10 +120,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -166,10 +144,8 @@
entry_schema:
type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 4810bdd..9807e6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -19,11 +19,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -37,11 +35,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
compute_FSB1_availability_zone:
type: list
required: true
@@ -75,27 +71,21 @@
required: true
status: SUPPORTED
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -109,11 +99,9 @@
entry_schema:
type: string
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -129,17 +117,13 @@
required: true
status: SUPPORTED
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
FSB1_FSB1_Internal_network_id:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index a4b53fa..2261cef 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -20,10 +20,8 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
compute_FSB1_metadata:
type: list
required: true
@@ -35,10 +33,8 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
compute_FSB1_availability_zone:
type: list
required: true
@@ -66,23 +62,17 @@
type: string
required: true
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -94,10 +84,8 @@
entry_schema:
type: string
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -110,15 +98,11 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f7be3ae..6ff916c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -13,11 +13,9 @@
required: true
status: SUPPORTED
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
@@ -25,11 +23,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB2_Internal_vlan_requirements:
type: list
required: true
@@ -37,11 +33,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -59,11 +53,9 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
@@ -71,11 +63,9 @@
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
@@ -83,21 +73,17 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
status: SUPPORTED
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
@@ -105,17 +91,13 @@
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -135,11 +117,9 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -153,11 +133,9 @@
required: true
status: SUPPORTED
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
status: SUPPORTED
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -179,11 +157,9 @@
required: true
status: SUPPORTED
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
status: SUPPORTED
- entry_schema:
- type: string
attributes:
FSB1_FSB1_Internal_network_id:
type: list
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index 0992b6e..af4ed4e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -15,30 +15,24 @@
type: string
required: true
port_FSB_OAM_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB2_Internal_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_ip_requirements:
type: list
required: true
@@ -53,53 +47,41 @@
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_ip_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.IpRequirements
port_FSB1_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_vlan_requirements:
type: list
required: true
entry_schema:
type: org.openecomp.datatypes.network.VlanRequirements
port_FSB2_Internal_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB1_Internal_exCP_naming:
type: org.openecomp.datatypes.Naming
required: true
port_FSB_OAM_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_network:
type: list
required: true
entry_schema:
type: string
port_FSB1_Internal_network_role:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_subnetpoolid:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
port_FSB_OAM_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -116,10 +98,8 @@
constraints:
- greater_or_equal: 0
port_FSB_OAM_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB2_Internal_mac_requirements:
type: org.openecomp.datatypes.network.MacRequirements
required: true
@@ -130,10 +110,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB1_Internal_order:
- type: list
+ type: integer
required: true
- entry_schema:
- type: integer
port_FSB_OAM_fixed_ips:
type: list
required: true
@@ -151,10 +129,8 @@
type: org.openecomp.datatypes.Naming
required: true
port_FSB2_Internal_network_role_tag:
- type: list
+ type: string
required: true
- entry_schema:
- type: string
node_templates:
FSB1_FSB1_Internal:
type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml
index 78eb97c..7731309 100644
--- a/openecomp-ui/pom.xml
+++ b/openecomp-ui/pom.xml
@@ -56,20 +56,12 @@
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.4</version>
+
+ <configuration>
+ <installDirectory>${project.parent.parent.basedir}</installDirectory>
+ </configuration>
<executions>
-
- <execution>
- <id>install node and npm in dox-sequence-diagram-ui</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <workingDirectory>${project.basedir}/../dox-sequence-diagram-ui</workingDirectory>
- <nodeVersion>v6.9.5</nodeVersion>
- <npmVersion>3.10.10</npmVersion>
- </configuration>
- </execution>
<execution>
<id>install node and npm</id>
@@ -81,6 +73,16 @@
<npmVersion>3.10.10</npmVersion>
</configuration>
</execution>
+
+ <execution>
+ <id>npm set progress off</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <configuration>
+ <arguments>set progress=false</arguments>
+ </configuration>
+ </execution>
<execution>
<id>npm install in dox-sequence-diagram-ui</id>
diff --git a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh b/test-apis-ci/src/main/resources/ci/scripts/startTest.sh
index 9268d6f..764e046 100644
--- a/test-apis-ci/src/main/resources/ci/scripts/startTest.sh
+++ b/test-apis-ci/src/main/resources/ci/scripts/startTest.sh
@@ -88,7 +88,7 @@
BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'`
ADD_USERS_SCRIPT="addUsersFromList_new.sh"
-USER_LIST="/conf/userList.txt"
+USER_LIST="conf/userList.txt"
chmod +x ${ADD_USERS_SCRIPT}
echo "add users..."
`./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}`
diff --git a/ui-ci-dev/src/main/resources/ci/conf/credentials.yaml b/ui-ci-dev/src/main/resources/ci/conf/credentials.yaml
deleted file mode 100644
index 63a4280..0000000
--- a/ui-ci-dev/src/main/resources/ci/conf/credentials.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
- designer: {
- username: m99121,
- password: 66-Percent,
- firstname: ASDC,
- lastname: KASPIN
- }
- admin: {
- username: m99122,
- password: 98-Degrees,
- firstname: ASDC,
- lastname: KASPIN
- }
- ops: {
- username: m99123,
- password: 17-Diameter,
- firstname: ASDC,
- lastname: KASPIN
- }
- tester: {
- username: m99124,
- password: 802-NotaGroup,
- firstname: ASDC,
- lastname: KASPIN
- }
- governor: {
- username: m99125,
- password: 142-Officiant,
- firstname: ASDC,
- lastname: KASPIN
- }
- product_strategist: {
- username: m99126,
- password: 1910-FruitGum,
- firstname: ASDC,
- lastname: KASPIN
- }
- product_manager: {
- username: m99127,
- password: 747-Airplane,
- firstname: ASDC,
- lastname: KASPIN
- }
- product_local: {
- username: pm0001,
- password: 123123a,
- firstname: ASDC,
- lastname: KASPIN
- }
\ No newline at end of file
diff --git a/ui-ci/src/main/resources/ci/scripts/startTest.sh b/ui-ci/src/main/resources/ci/scripts/startTest.sh
index c85b6f4..a0de1fa 100644
--- a/ui-ci/src/main/resources/ci/scripts/startTest.sh
+++ b/ui-ci/src/main/resources/ci/scripts/startTest.sh
@@ -89,7 +89,7 @@
BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'`
ADD_USERS_SCRIPT="addUsersFromList_new.sh"
-USER_LIST="/conf/userList.txt"
+USER_LIST="conf/userList.txt"
chmod +x ${ADD_USERS_SCRIPT}
echo "add users..."
`./${ADD_USERS_SCRIPT} -ip ${BE_IP} -f ${USER_LIST}`