NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
DOCKER_ENVIRONMENT=remote
-TAG=1.6.0
+TAG=1.8.0-STAGING-latest
TIME_OUT_DEFAULT_VALUE_SEC=1200
PROJECT_NAME=etsiintegrationtesting
DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
+ETSI_CATALOG_IMAGE_VERSION=1.0.9
adapters:
network:
encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
+aai:
+ auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
resourceTemplateId: vnfd2_vnfc4
vduId: vnfd2_vduForVnfc4
type: COMPUTE
+ - vnfdid: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+ vnfclist:
+ - vnfcid: VNFC5
+ resourceTemplateId: vnfd3_vnfc4
+ vduId: vnfd3_vduForVnfc4
+ type: COMPUTE
+ - vnfcid: VNFC6
+ resourceTemplateId: vnfd3_vnfc5
+ vduId: vnfd3_vduForVnfc5
+ type: COMPUTE
+ - vnfdid: 0c960b3a-d88f-11ea-87d0-0242ac130003
+ vnfclist:
+ - vnfcid: VNFC7
+ resourceTemplateId: vnfd4_vnfc5
+ vduId: vnfd4_vduForVnfc5
+ type: COMPUTE
+ - vnfcid: VNFC8
+ resourceTemplateId: vnfd4_vnfc6
+ vduId: vnfd4_vduForVnfc6
+ type: COMPUTE
result=$(docker inspect --format '{{.State.Running}}' $CONTAINER_NAME)
if [ $result != "true" ] ; then
+ docker logs $CONTAINER_NAME
echo "$SCRIPT_NAME $(current_timestamp) ERROR: $CONTAINER_NAME container is not running"
exit 1
fi
$WAIT_FOR_SCRIPT -t "$TIME_OUT" -h "$HOST_IP" -p "$PORT"
if [ $? -ne 0 ]; then
+ docker logs $CONTAINER_NAME
echo "$SCRIPT_NAME $(current_timestamp) ERROR: wait-for.sh failed ..."
exit 1
fi
so-vnfm-adapter:
image: onap/so/vnfm-adapter:${TAG}
################################################################################
- ve-vnfm-adapter:
- image: onap/so/ve-vnfm-adapter:${TAG}
-################################################################################
+ modeling-etsicatalog:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
ports:
- "3306:3306"
volumes:
+ - /var/lib/mysql
- ${TEST_LAB_DIR}/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- ${TEST_LAB_DIR}/volumes/mariadb/conf.d:/etc/mysql/conf.d
environment:
- MYSQL_ROOT_PASSWORD=password
+ - MYSQL_USER=etsicatalog
+ - MYSQL_PASSWORD=etsicatalog
+ - MYSQL_DATABASE=etsicatalog
hostname:
mariadb.so.testlab.onap.org
logging:
command:
- "/config/populate-aai-simulator.sh"
################################################################################
- ve-vnfm-adapter:
- image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/ve-vnfm-adapter:${TAG}
+ modeling-etsicatalog:
+ image: ${NEXUS_DOCKER_REPO_MSO}/onap/modeling/etsicatalog:${ETSI_CATALOG_IMAGE_VERSION}
ports:
- - "9098:9098"
+ - "8806:8806"
volumes:
- - ${CONFIG_DIR_PATH}/override-files/ve-vnfm-adapter/onapheat:/app/config
- - ${CONFIG_DIR_PATH}/certificates/truststore/root-ca.crt:/app/ca-certificates/root-ca.crt
+ - /var/lib/mysql
+ - ${CONFIG_DIR_PATH}/wait-for.sh:/service/wait-for.sh
environment:
- - APP=ve-vnfm-adapter
- - JVM_ARGS=-Xms64m -Xmx512m
- - DB_HOST=mariadb
+ - DB_IP=mariadb
+ - SDC_ADDR=http://sdc-simulator:9991
hostname:
- ve-vnfm-adapter
+ modeling-etsicatalog
depends_on:
- - request-db-adapter
- - aai-simulator
+ - mariadb
+ - sdc-simulator
logging:
driver: "json-file"
options:
max-size: "30m"
max-file: "5"
- user: root
- entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
-################################################################################
+ entrypoint: /bin/sh -c '/service/wait-for.sh -t 300 -h mariadb -p 3306 && /service/modeling/etsicatalog/docker/docker-entrypoint.sh'
export $(egrep -v '^#' $ENV_FILE | xargs)
-MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME")
+MANDATORY_VARIABLES_NAMES=( "NEXUS_DOCKER_REPO_MSO" "DOCKER_ENVIRONMENT" "TAG" "TIME_OUT_DEFAULT_VALUE_SEC" "PROJECT_NAME" "DEFAULT_NETWORK_NAME", "ETSI_CATALOG_IMAGE_VERSION")
for var in "${MANDATORY_VARIABLES_NAMES[@]}"
do
echo "Sleeping for 3m"
sleep 3m
+docker ps -a
+
echo "Will execute $WAIT_FOR_WORKAROUND_SCRIPT script"
$WAIT_FOR_WORKAROUND_SCRIPT
exit 1
fi
+MODELING_ETSI_CATALOG_CONTAINER_NAME="modeling-etsicatalog"
+echo "Will execute $WAIT_FOR_CONTAINER_SCRIPT to wait for $MODELING_ETSI_CATALOG_CONTAINER_NAME container to start up"
+$WAIT_FOR_CONTAINER_SCRIPT -c "$MODELING_ETSI_CATALOG_CONTAINER_NAME" -t "300" -n "$DEFAULT_NETWORK_NAME"
+
+if [ $? -ne 0 ]; then
+ echo "ERROR: $WAIT_FOR_CONTAINER_SCRIPT failed"
+ echo "Will stop running docker containers . . ."
+ $TEAR_DOWN_SCRIPT
+ exit 1
+fi
+
REPO_IP='127.0.0.1'
ROBOT_VARIABLES="-v REPO_IP:${REPO_IP}"
</parent>
<artifactId>aai-simulator</artifactId>
<properties>
- <version.aai.schema>1.0.0</version.aai.schema>
+ <version.aai.schema>1.8.1</version.aai.schema>
</properties>
<dependencies>
<dependency>
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_TYPE;
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_URL;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
-import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_RESOURCE_TYPE;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION;
import static org.onap.so.aaisimulator.utils.Constants.X_HTTP_METHOD_OVERRIDE;
import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getRequestErrorResponseEntity;
import static org.onap.so.aaisimulator.utils.RequestErrorResponseUtils.getResourceVersion;
+import java.util.List;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.MediaType;
import org.onap.aai.domain.yang.GenericVnf;
import org.onap.aai.domain.yang.GenericVnfs;
import org.onap.aai.domain.yang.Relationship;
-import org.onap.aai.domain.yang.RelationshipData;
import org.onap.aai.domain.yang.ServiceInstance;
import org.onap.aai.domain.yang.ServiceInstances;
import org.onap.aai.domain.yang.ServiceSubscription;
public ResponseEntity<?> getRelatedToGenericVnf(@PathVariable("global-customer-id") final String globalCustomerId,
@PathVariable("service-type") final String serviceType,
@PathVariable(name = "service-instance-id") final String serviceInstanceId,
- @RequestParam(name = "vnf-name", required = true) final String vnfName, final HttpServletRequest request) {
+ @RequestParam(name = "vnf-name", required = false) final String vnfName, final HttpServletRequest request) {
LOGGER.info(
"Will retrieve generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
globalCustomerId, serviceType, serviceInstanceId, vnfName);
- final Optional<Relationship> optional =
- cacheServiceProvider.getRelationship(globalCustomerId, serviceType, serviceInstanceId, vnfName);
+ final List<String> relatedToVnfIds =
+ getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId, vnfName);
- if (optional.isPresent()) {
-
- final Relationship relationship = optional.get();
- final Optional<RelationshipData> relationshipDataOptional = relationship.getRelationshipData().stream()
- .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst();
- if (relationshipDataOptional.isPresent()) {
- final RelationshipData relationshipData = relationshipDataOptional.get();
- final String vnfId = relationshipData.getRelationshipValue();
+ if (!relatedToVnfIds.isEmpty()) {
+ final GenericVnfs genericVnfs = new GenericVnfs();
+ relatedToVnfIds.stream().forEach(vnfId -> {
final Optional<GenericVnf> genericVnfOptional = genericVnfCacheServiceProvider.getGenericVnf(vnfId);
if (genericVnfOptional.isPresent()) {
- final GenericVnfs genericVnfs = new GenericVnfs();
- genericVnfs.getGenericVnf().add(genericVnfOptional.get());
- LOGGER.info("found service instance {} in cache", relationship);
- return ResponseEntity.ok(genericVnfs);
+ final GenericVnf genericVnf = genericVnfOptional.get();
+ LOGGER.info("found related-to generic-vnf {} in cache", genericVnf);
+ genericVnfs.getGenericVnf().add(genericVnf);
}
+ });
+ if (!genericVnfs.getGenericVnf().isEmpty()) {
+ LOGGER.info("Found {} related generic-vnfs", genericVnfs.getGenericVnf().size());
+ return ResponseEntity.ok(genericVnfs);
}
}
+
LOGGER.error(
"Couldn't find generic vnf related to information for 'global customer id': {}, 'service type': {} and 'service instance id: '{} with vnfname: {}...",
globalCustomerId, serviceType, serviceInstanceId, vnfName);
return getRequestErrorResponseEntity(request);
}
+
+ private List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId, final String vnfName) {
+ if (vnfName != null) {
+ return cacheServiceProvider.getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId, vnfName);
+ }
+ return cacheServiceProvider.getRelatedToVnfIds(globalCustomerId, serviceType, serviceInstanceId);
+ }
}
*/
package org.onap.so.aaisimulator.service.providers;
+import java.util.List;
import java.util.Optional;
import org.onap.aai.domain.yang.Customer;
import org.onap.aai.domain.yang.Relationship;
boolean patchServiceInstance(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final ServiceInstance serviceInstance);
- Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
- final String serviceInstanceId, final String vnfName);
-
Optional<Relationship> addRelationShip(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final Relationship relationship, final String requestUri);
boolean deleteSericeInstance(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final String resourceVersion);
+ List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId, final String vnfName);
+
+ List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId);
+
}
import static org.onap.so.aaisimulator.utils.CacheName.CUSTOMER_CACHE;
import static org.onap.so.aaisimulator.utils.Constants.CUSTOMER_GLOBAL_CUSTOMER_ID;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF;
+import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_ID;
import static org.onap.so.aaisimulator.utils.Constants.GENERIC_VNF_VNF_NAME;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_ID;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_INSTANCE_SERVICE_INSTANCE_NAME;
import static org.onap.so.aaisimulator.utils.Constants.SERVICE_SUBSCRIPTION_SERVICE_TYPE;
import static org.onap.so.aaisimulator.utils.HttpServiceUtils.getBiDirectionalRelationShipListRelatedLink;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
}
@Override
- public Optional<Relationship> getRelationship(final String globalCustomerId, final String serviceType,
+ public List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
final String serviceInstanceId, final String vnfName) {
final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
final RelationshipList relationshipList = serviceInstance.getRelationshipList();
if (relationshipList != null) {
- final List<Relationship> relationship = relationshipList.getRelationship();
- return relationship.stream().filter(
+ final List<Relationship> relationships = relationshipList.getRelationship().stream().filter(
relationShip -> relationShip.getRelatedToProperty().stream().filter(relatedToProperty -> {
final String propertyKey = relatedToProperty.getPropertyKey();
final String propertyValue = relatedToProperty.getPropertyValue();
return GENERIC_VNF_VNF_NAME.equals(propertyKey) && propertyValue != null
&& propertyValue.equals(vnfName);
- }).findFirst().isPresent()).findFirst();
+ }).findFirst().isPresent()).collect(Collectors.toList());
+ LOGGER.info("Found relationships {} for vnf-name: {}", relationships, vnfName);
+ return getGenericVnfIdsIfPresent(relationships);
}
LOGGER.warn("Relationship list is nulll ...");
}
- LOGGER.error("Unable to RelationShip with property value: {}... ", vnfName);
+ LOGGER.error("Unable to find generic-vnf relationships with property value: {}... ", vnfName);
+ return Collections.emptyList();
+ }
- return Optional.empty();
+ @Override
+ public List<String> getRelatedToVnfIds(final String globalCustomerId, final String serviceType,
+ final String serviceInstanceId) {
+ final Optional<ServiceInstance> optional = getServiceInstance(globalCustomerId, serviceType, serviceInstanceId);
+
+ if (optional.isPresent()) {
+ LOGGER.info("Found service instance ...");
+ final ServiceInstance serviceInstance = optional.get();
+ final RelationshipList relationshipList = serviceInstance.getRelationshipList();
+
+ if (relationshipList != null) {
+ final List<Relationship> relationships = relationshipList.getRelationship();
+ LOGGER.info("Relationships found {}", relationships);
+ return getGenericVnfIdsIfPresent(relationships);
+ }
+ LOGGER.warn("Relationship list is nulll ...");
+ }
+ LOGGER.error("Unable to find generic-vnf relationships ... ");
+ return Collections.emptyList();
+ }
+
+ private List<String> getGenericVnfIdsIfPresent(final List<Relationship> relationships) {
+ final List<String> vnfIdsFound = new ArrayList<>();
+ relationships.stream().forEach(relationship -> {
+ relationship.getRelationshipData().stream()
+ .filter(existing -> GENERIC_VNF_VNF_ID.equals(existing.getRelationshipKey())).findFirst()
+ .ifPresent(consume -> {
+ vnfIdsFound.add(consume.getRelationshipValue());
+ });
+ });
+ return vnfIdsFound;
}
@Override
assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
}
+ @Test
+ public void test_putServiceInstanceRelatedTo_ableToRetrieveAllRelatedGenericVnfsFromCache() throws Exception {
+
+ final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
+
+ invokeCustomerEndPointAndAssertResponse();
+
+ invokeServiceInstanceEndPointAndAssertResponse();
+
+ final String relationShipUrl = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL,
+ BI_DIRECTIONAL_RELATIONSHIP_LIST_URL);
+
+ final ResponseEntity<Relationship> responseEntity2 = testRestTemplateService.invokeHttpPut(relationShipUrl,
+ TestUtils.getRelationShipJsonObject(), Relationship.class);
+
+ assertEquals(HttpStatus.ACCEPTED, responseEntity2.getStatusCode());
+
+ final String genericVnfUrl = getUrl(GENERIC_VNF_URL, VNF_ID);
+ final ResponseEntity<Void> genericVnfResponse =
+ testRestTemplateService.invokeHttpPut(genericVnfUrl, TestUtils.getGenericVnf(), Void.class);
+ assertEquals(HttpStatus.ACCEPTED, genericVnfResponse.getStatusCode());
+
+ final ResponseEntity<GenericVnfs> actual =
+ testRestTemplateService.invokeHttpGet(url + RELATED_TO_URL, GenericVnfs.class);
+
+ assertEquals(HttpStatus.OK, actual.getStatusCode());
+
+ assertTrue(actual.hasBody());
+ final GenericVnfs genericVnfs = actual.getBody();
+ assertFalse(genericVnfs.getGenericVnf().isEmpty());
+ final GenericVnf genericVnf = genericVnfs.getGenericVnf().get(0);
+ assertEquals(GENERIC_VNF_NAME, genericVnf.getVnfName());
+ }
+
+
@Test
public void test_DeleteSericeInstance_ServiceInstanceRemovedFromCache() throws Exception {
final String url = getUrl(CUSTOMERS_URL, SERVICE_SUBSCRIPTIONS_URL, SERVICE_INSTANCE_URL);
ENV https_proxy=$HTTPS_PROXY
# Update the package list and upgrade installed packages
-RUN apk update && apk upgrade
+USER root
+RUN apk update
# Install commonly needed tools
RUN apk --no-cache add curl netcat-openbsd sudo nss
RUN chown -R so:so /app && chmod 700 /app/*.sh
+USER so
+
# Springboot configuration (required)
VOLUME /app/config
FROM docker.io/alpine
# Install packages
-RUN apk update && apk upgrade && apk add mysql-client && apk add bash
+USER root
+RUN apk upgrade && apk add mysql-client
-RUN apk --no-cache add curl netcat-openbsd sudo nss
+RUN apk --no-cache add bash curl netcat-openbsd sudo nss
<artifactId>sdc-simulator</artifactId>
<name>${project.artifactId}</name>
<dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
package org.onap.so.sdcsimulator.configration;
import org.onap.so.sdcsimulator.utils.Constants;
+import org.onap.so.simulator.configuration.SimulatorSecurityConfigurer;
+import org.onap.so.simulator.model.UserCredentials;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* @author waqas.ikram@ericsson.com
*/
@Configuration
@EnableWebSecurity
-public class WebSecurityConfigImpl extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfigImpl extends SimulatorSecurityConfigurer {
- private final String username;
- private final String password;
- private final String role;
- public WebSecurityConfigImpl(@Value("${spring.security.username}") final String username,
- @Value("${spring.security.password}") final String password,
- @Value("${spring.security.role}") final String role) {
- this.username = username;
- this.password = password;
- this.role = role;
+ @Autowired
+ public WebSecurityConfigImpl(final UserCredentials userCredentials) {
+ super(userCredentials.getUsers());
}
.httpBasic();
}
- @Bean
- public BCryptPasswordEncoder passwordEncoder() {
- return new BCryptPasswordEncoder();
- }
-
- @Autowired
- public void configureGlobal(final AuthenticationManagerBuilder auth) throws Exception {
- auth.inMemoryAuthentication().passwordEncoder(passwordEncoder()).withUser(username).password(password)
- .roles(role);
- }
}
this.resourceProvider = resourceProvider;
}
+ @GetMapping(value = "/resources", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public ResponseEntity<?> getResources() {
+ LOGGER.info("Running getResources ...");
+ return ResponseEntity.ok().body(resourceProvider.getResource());
+ }
+
@GetMapping(value = "/resources/{csarId}/toscaModel", produces = MediaType.APPLICATION_OCTET_STREAM)
public ResponseEntity<byte[]> getCsar(@PathVariable("csarId") final String csarId) {
LOGGER.info("Running getCsar for {} ...", csarId);
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2021 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.sdcsimulator.models;
+
+import java.io.Serializable;
+import org.springframework.util.ObjectUtils;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Waqas Ikram (waqas.ikram@est.tech)
+ *
+ */
+public class ResourceArtifact implements Serializable {
+
+ private static final long serialVersionUID = 3967660000071162759L;
+
+ @JsonProperty("uuid")
+ private String uuid;
+
+ @JsonProperty("invariantUUID")
+ private String invariantUuid;
+
+ @JsonProperty("name")
+ private String name;
+
+ @JsonProperty("version")
+ private String version;
+
+ @JsonProperty("toscaModelURL")
+ private String toscaModelUrl;
+
+ @JsonProperty("category")
+ private String category;
+
+ @JsonProperty("subCategory")
+ private String subCategory;
+
+ @JsonProperty("resourceType")
+ private String resourceType;
+
+ @JsonProperty("lifecycleState")
+ private String lifecycleState;
+
+ @JsonProperty("lastUpdaterUserId")
+ private String lastUpdaterUserId;
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(final String uuid) {
+ this.uuid = uuid;
+ }
+
+ public ResourceArtifact uuid(final String uuid) {
+ this.uuid = uuid;
+ return this;
+ }
+
+ public String getInvariantUuid() {
+ return invariantUuid;
+ }
+
+ public void setInvariantUuid(final String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ }
+
+ public ResourceArtifact invariantUuid(final String invariantUuid) {
+ this.invariantUuid = invariantUuid;
+ return this;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String name) {
+ this.name = name;
+ }
+
+ public ResourceArtifact name(final String name) {
+ this.name = name;
+ return this;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(final String version) {
+ this.version = version;
+ }
+
+ public ResourceArtifact version(final String version) {
+ this.version = version;
+ return this;
+ }
+
+ public String getToscaModelUrl() {
+ return toscaModelUrl;
+ }
+
+ public void setToscaModelUrl(final String toscaModelUrl) {
+ this.toscaModelUrl = toscaModelUrl;
+ }
+
+ public ResourceArtifact toscaModelUrl(final String toscaModelUrl) {
+ this.toscaModelUrl = toscaModelUrl;
+ return this;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(final String category) {
+ this.category = category;
+ }
+
+ public ResourceArtifact category(final String category) {
+ this.category = category;
+ return this;
+ }
+
+ public String getSubCategory() {
+ return subCategory;
+ }
+
+ public void setSubCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ }
+
+ public ResourceArtifact subCategory(final String subCategory) {
+ this.subCategory = subCategory;
+ return this;
+ }
+
+ public String getResourceType() {
+ return resourceType;
+ }
+
+ public void setResourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ }
+
+ public ResourceArtifact resourceType(final String resourceType) {
+ this.resourceType = resourceType;
+ return this;
+ }
+
+ public String getLifecycleState() {
+ return lifecycleState;
+ }
+
+ public void setLifecycleState(final String lifecycleState) {
+ this.lifecycleState = lifecycleState;
+ }
+
+ public ResourceArtifact lifecycleState(final String lifecycleState) {
+ this.lifecycleState = lifecycleState;
+ return this;
+ }
+
+ public String getLastUpdaterUserId() {
+ return lastUpdaterUserId;
+ }
+
+ public void setLastUpdaterUserId(final String lastUpdaterUserId) {
+ this.lastUpdaterUserId = lastUpdaterUserId;
+ }
+
+ public ResourceArtifact lastUpdaterUserId(final String lastUpdaterUserId) {
+ this.lastUpdaterUserId = lastUpdaterUserId;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((category == null) ? 0 : category.hashCode());
+ result = prime * result + ((invariantUuid == null) ? 0 : invariantUuid.hashCode());
+ result = prime * result + ((lastUpdaterUserId == null) ? 0 : lastUpdaterUserId.hashCode());
+ result = prime * result + ((lifecycleState == null) ? 0 : lifecycleState.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((resourceType == null) ? 0 : resourceType.hashCode());
+ result = prime * result + ((subCategory == null) ? 0 : subCategory.hashCode());
+ result = prime * result + ((toscaModelUrl == null) ? 0 : toscaModelUrl.hashCode());
+ result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
+ result = prime * result + ((version == null) ? 0 : version.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (obj instanceof ResourceArtifact) {
+ final ResourceArtifact other = (ResourceArtifact) obj;
+ return ObjectUtils.nullSafeEquals(category, other.category)
+ && ObjectUtils.nullSafeEquals(invariantUuid, other.invariantUuid)
+ && ObjectUtils.nullSafeEquals(lastUpdaterUserId, other.lastUpdaterUserId)
+ && ObjectUtils.nullSafeEquals(lifecycleState, other.lifecycleState)
+ && ObjectUtils.nullSafeEquals(name, other.name)
+ && ObjectUtils.nullSafeEquals(resourceType, other.resourceType)
+ && ObjectUtils.nullSafeEquals(subCategory, other.subCategory)
+ && ObjectUtils.nullSafeEquals(toscaModelUrl, other.toscaModelUrl)
+ && ObjectUtils.nullSafeEquals(uuid, other.uuid)
+ && ObjectUtils.nullSafeEquals(version, other.version);
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class ResourceArtifact {\n");
+ sb.append(" uuid: ").append(uuid).append("\n");
+ sb.append(" invariantUuid: ").append(invariantUuid).append("\n");
+ sb.append(" name: ").append(name).append("\n");
+ sb.append(" version: ").append(version).append("\n");
+ sb.append(" toscaModelUrl: ").append(toscaModelUrl).append("\n");
+ sb.append(" category: ").append(category).append("\n");
+ sb.append(" subCategory: ").append(subCategory).append("\n");
+ sb.append(" lastUpdaterUserId: ").append(lastUpdaterUserId).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
+}
package org.onap.so.sdcsimulator.providers;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Optional;
+import java.util.Set;
+import org.onap.so.sdcsimulator.models.ResourceArtifact;
/**
* @author Eoin Hanan (eoin.hanan@est.tech)
Optional<byte[]> getResource(final String csarId);
- Optional<InputStream> getInputStream(final String csarId) throws IOException;
+ Set<ResourceArtifact> getResource();
}
package org.onap.so.sdcsimulator.providers;
+import static org.onap.so.sdcsimulator.utils.Constants.CATALOG_URL;
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_CSAR;
+import static org.onap.so.sdcsimulator.utils.Constants.MAIN_RESOURCE_FOLDER;
+import static org.onap.so.sdcsimulator.utils.Constants.WILD_CARD_REGEX;
+import static org.springframework.core.io.support.ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.HashSet;
import java.util.Optional;
+import java.util.Set;
+import org.onap.so.sdcsimulator.models.ResourceArtifact;
import org.onap.so.sdcsimulator.utils.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.stereotype.Service;
import org.springframework.util.StreamUtils;
private final String resourceLocation;
- public ResourceProviderImpl(@Value("${sdc.resource.location:/app/csars/}") final String resourceLocation) {
+ private final ResourcePatternResolver resourcePatternResolver;
+
+ @Autowired
+ public ResourceProviderImpl(@Value("${sdc.resource.location:/app/csars/}") final String resourceLocation,
+ final ResourcePatternResolver resourcePatternResolver) {
this.resourceLocation = resourceLocation;
+ this.resourcePatternResolver = resourcePatternResolver;
}
@Override
}
@Override
- public Optional<InputStream> getInputStream(final String csarId) throws IOException {
- final Path filePath = Paths.get(resourceLocation, csarId + ".csar");
+ public Set<ResourceArtifact> getResource() {
+ final Set<ResourceArtifact> result = new HashSet<>();
+
+ final Path dir = Paths.get(resourceLocation);
+ if (Files.exists(dir)) {
+ try (final DirectoryStream<Path> stream = Files.newDirectoryStream(dir, WILD_CARD_REGEX + DOT_CSAR)) {
+ for (final Path entry : stream) {
+ final String filename = getFilenameWithoutExtension(entry);
+ final ResourceArtifact artifact = getResourceArtifact(filename);
+ result.add(artifact);
+ LOGGER.info("Found resource on file system: {}", artifact);
+
+
+ }
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find resources on filesystem", ioException);
+ }
+ }
+
+ try {
+ final String csarFileLocationPattern =
+ CLASSPATH_ALL_URL_PREFIX + MAIN_RESOURCE_FOLDER + WILD_CARD_REGEX + DOT_CSAR;
+ final Resource[] resources = resourcePatternResolver.getResources(csarFileLocationPattern);
+ if (resources != null) {
+
+ for (final Resource resource : resources) {
+ final ResourceArtifact artifact =
+ getResourceArtifact(getFilenameWithoutExtension(resource.getFilename()));
+ result.add(artifact);
+ LOGGER.info("Found resource in classpath: {}", artifact);
+ }
+ }
+
+ } catch (final IOException ioException) {
+ LOGGER.error("Unable to find resources in classpath", ioException);
+ }
+
+ return result;
+ }
+
+ private ResourceArtifact getResourceArtifact(final String filename) {
+ return new ResourceArtifact().uuid(filename).invariantUuid(filename).name(filename).version("1.0")
+ .toscaModelUrl(CATALOG_URL + "/resources/" + filename + "/toscaModel").category("Generic")
+ .subCategory("Network Service").resourceType("VF").lifecycleState("CERTIFIED")
+ .lastUpdaterUserId("SDC_SIMULATOR");
+ }
+
+ private String getFilenameWithoutExtension(final String filename) {
+ return filename.substring(0, filename.lastIndexOf('.'));
+ }
+
+ private String getFilenameWithoutExtension(final Path file) {
+ return getFilenameWithoutExtension(file.getFileName().toString());
+ }
+
+ private Optional<InputStream> getInputStream(final String csarId) throws IOException {
+ final Path filePath = Paths.get(resourceLocation, csarId + DOT_CSAR);
if (Files.exists(filePath)) {
+ LOGGER.info("Found resource in on file system using path: {}", filePath);
return Optional.of(Files.newInputStream(filePath));
}
+ LOGGER.warn("Couldn't find file on file system '{}', will search it in classpath", filePath);
- LOGGER.info("Couldn't find file on file system '{}', will return default csar", filePath);
- final ClassPathResource classPathResource = new ClassPathResource(getDefaultCsarPath(), this.getClass());
+ final String path = MAIN_RESOURCE_FOLDER + csarId + DOT_CSAR;
+ ClassPathResource classPathResource = getClassPathResource(path);
if (classPathResource.exists()) {
+ LOGGER.info("Found resource in classpath using path: {}", path);
+ return Optional.of(classPathResource.getInputStream());
+ }
+
+ LOGGER.warn("Couldn't find file on file system '{}', will return default csar", filePath);
+ classPathResource = getClassPathResource(getDefaultCsarPath());
+ if (classPathResource.exists()) {
+ LOGGER.info("Found default csar in classpath");
return Optional.of(classPathResource.getInputStream());
}
return Optional.empty();
}
+ private ClassPathResource getClassPathResource(final String path) {
+ return new ClassPathResource(path, this.getClass());
+ }
+
/*
* Used in test
*/
String getDefaultCsarPath() {
return Constants.DEFAULT_CSAR_PATH;
}
-}
\ No newline at end of file
+}
*/
public class Constants {
+ public static final String MAIN_RESOURCE_FOLDER = "/csar/";
+
public static final String BASE_URL = "/sdc/v1";
public static final String CATALOG_URL = BASE_URL + "/catalog";
public static final String DOT = ".";
+ public static final String WILD_CARD_REGEX = "*";
+
public static final String DOT_CSAR = DOT + "csar";
public static final String DEFAULT_CSAR_NAME_WITH_EXT = DEFAULT_CSAR_NAME + DOT_CSAR;
- public static final String DEFAULT_CSAR_PATH = "/csar/" + DEFAULT_CSAR_NAME_WITH_EXT;
+ public static final String DEFAULT_CSAR_PATH = MAIN_RESOURCE_FOLDER + DEFAULT_CSAR_NAME_WITH_EXT;
private Constants() {}
}
ssl-enable: false
spring:
security:
- username: mso
- #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
- password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
- role: mso
\ No newline at end of file
+ users:
+ - username: mso
+ #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
+ role: mso
+ - username: modeling
+ #password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+ password: $2a$04$Lcu/DWdyXsl/a3A0iqHTfOX1.zHQ3DlQS/nOPfafT.9pWbeEqlF7W
+ role: mso
\ No newline at end of file
import static org.junit.Assert.assertTrue;
import java.util.Base64;
import java.util.Optional;
+import java.util.Set;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.onap.so.sdcsimulator.controller.CatalogController;
+import org.onap.so.sdcsimulator.models.ResourceArtifact;
import org.onap.so.sdcsimulator.providers.ResourceProvider;
import org.onap.so.sdcsimulator.utils.Constants;
+import org.onap.so.simulator.model.UserCredentials;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.context.annotation.Configuration;
+import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@Autowired
private TestRestTemplate restTemplate;
- @Value("${spring.security.username}")
- private String username;
+ @Autowired
+ private UserCredentials userCredentials;
@Test
public void test_getCsar_validCsarId_matchContent() {
}
+ @Test
+ public void test_getResources_validResourcesFromClassPath() {
+
+ final ResponseEntity<Set<ResourceArtifact>> response =
+ restTemplate.exchange(getBaseUrl() + "/resources", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
+ new ParameterizedTypeReference<Set<ResourceArtifact>>() {});
+
+ assertEquals(HttpStatus.OK, response.getStatusCode());
+ assertTrue(response.hasBody());
+ assertEquals(3, response.getBody().size());
+
+ }
+
@Test
public void test_getCsar_invalidCsar_internalServerError() {
final ResourceProvider mockedResourceProvider = Mockito.mock(ResourceProvider.class);
private HttpHeaders getHttpHeaders() {
final HttpHeaders requestHeaders = new HttpHeaders();
- requestHeaders.add("Authorization", getBasicAuth(username));
+ requestHeaders.add("Authorization", getBasicAuth(userCredentials.getUsers().get(0).getUsername()));
requestHeaders.setContentType(MediaType.APPLICATION_JSON);
return requestHeaders;
}
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.UUID;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.onap.so.sdcsimulator.utils.Constants;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.util.StreamUtils;
/**
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
- private static final String DUMMY_CONTENT = "Hell world";
+ private static final String DUMMY_CONTENT = "Hello world";
+
+ private final PathMatchingResourcePatternResolver resourcePatternResolver =
+ new PathMatchingResourcePatternResolver();
@Test
public void test_getResource_withValidPath_matchContent() throws IOException {
final File folder = temporaryFolder.newFolder();
- final Path file = Files.createFile(folder.toPath().resolve("empty.csar"));
+ final String uuid = UUID.randomUUID().toString();
+ final Path file = Files.createFile(folder.toPath().resolve(uuid + Constants.DOT_CSAR));
Files.write(file, DUMMY_CONTENT.getBytes());
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath());
+ final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath(), resourcePatternResolver);
- assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource("empty").get());
+ assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(uuid).get());
}
@Test
final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("");
+ final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver);
assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
}
@Test
- public void test_getResource_unbleToreadFileFromClasspath_emptyOptional() throws IOException {
+ public void test_getResource_unbleToReadFileFromClasspath_emptyOptional() throws IOException {
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("") {
+ final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver) {
@Override
String getDefaultCsarPath() {
return "/some/dummy/path";
}
};
- assertFalse(objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).isPresent());
+ assertFalse(objUnderTest.getResource(UUID.randomUUID().toString()).isPresent());
}
}
public void setVnfcList(final List<Vnfc> vnfclist) {
this.vnfclist = vnfclist;
}
+
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfd {\n");
+ sb.append(" vnfdId: ").append(vnfdId).append("\n");
+ sb.append(" vnfclist: ").append(vnfclist).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
}
this.grantResourceId = grantResourceId;
}
- }
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfc {\n");
+ sb.append(" vnfcId: ").append(vnfcId).append("\n");
+ sb.append(" type: ").append(type).append("\n");
+ sb.append(" vduId: ").append(vduId).append("\n");
+ sb.append(" resourceTemplateId: ").append(resourceTemplateId).append("\n");
+ sb.append(" grantResourceId: ").append(grantResourceId).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+ }
public List<Vnfd> getVnfdList() {
return vnfdList;
this.vnfdList = vnfdList;
}
+ @Override
+ public String toString() {
+ final StringBuilder sb = new StringBuilder();
+ sb.append("class Vnfds {\n");
+ sb.append(" vnfdList: ").append(vnfdList).append("\n");
+ sb.append("}");
+ return sb.toString();
+ }
+
+
+
}
@Override
protected List<GrantsAddResources> getAddResources(final String vnfdId) {
final List<GrantsAddResources> resources = new ArrayList<>();
-
+ LOGGER.info("Will find GrantsAddResources for vnfdId: {}", vnfdId);
for (final Vnfd vnfd : vnfds.getVnfdList()) {
if (vnfd.getVnfdId().equals(vnfdId)) {
+ LOGGER.info("Found vnfd: {}", vnfd);
for (final Vnfc vnfc : vnfd.getVnfcList()) {
final GrantsAddResources addResource = new GrantsAddResources();
vnfc.setGrantResourceId(UUID.randomUUID().toString());
addResource.getVimConnectionId());
}
LOGGER.info("VIM connections in grant response: {}", mapOfGrantResourceIdToVimConnectionId);
+ final String vnfInstanceId = operation.getVnfInstanceId();
+
+ LOGGER.info("vnfds: {}", vnfds);
for (final Vnfd vnfd : vnfds.getVnfdList()) {
- if (vnfd.getVnfdId().equals(svnfmService.getVnf(operation.getVnfInstanceId()).getVnfdId())) {
+ if (vnfd.getVnfdId().equals(svnfmService.getVnf(vnfInstanceId).getVnfdId())) {
for (final Vnfc vnfc : vnfd.getVnfcList()) {
final InlineResponse201InstantiatedVnfInfoVnfcResourceInfo vnfcResourceInfoItem =
new InlineResponse201InstantiatedVnfInfoVnfcResourceInfo();
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201.InstantiationStateEnum;
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201InstantiatedVnfInfoResourceHandle;
import org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201InstantiatedVnfInfoVnfcResourceInfo;
-import org.onap.so.svnfm.simulator.model.Vnfds;
-import org.onap.so.svnfm.simulator.repository.VnfOperationRepository;
import org.onap.so.svnfm.simulator.config.ApplicationConfig;
import org.onap.so.svnfm.simulator.model.VnfOperation;
+import org.onap.so.svnfm.simulator.model.Vnfds;
+import org.onap.so.svnfm.simulator.repository.VnfOperationRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TerminateOperationProgressor extends OperationProgressor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TerminateOperationProgressor.class);
public TerminateOperationProgressor(final VnfOperation operation, final SvnfmService svnfmService,
final VnfOperationRepository vnfOperationRepository, final ApplicationConfig applicationConfig,
@Override
protected List<GrantsAddResources> getRemoveResources(final String vnfdId) {
final List<GrantsAddResources> resources = new ArrayList<>();
+ LOGGER.info("Will find RemoveResources for vnfdId: {}", vnfdId);
+ final String vnfInstanceId = operation.getVnfInstanceId();
final org.onap.so.adapters.vnfmadapter.extclients.vnfm.model.InlineResponse201 vnf =
- svnfmService.getVnf(operation.getVnfInstanceId());
+ svnfmService.getVnf(vnfInstanceId);
+ LOGGER.info("Found InlineResponse201: {} for vnfInstanceId: {}", vnf, vnfInstanceId);
for (final InlineResponse201InstantiatedVnfInfoVnfcResourceInfo vnfc : vnf.getInstantiatedVnfInfo()
.getVnfcResourceInfo()) {
final GrantsAddResources addResource = new GrantsAddResources();
{
- "distributionID": "cfe30d6c-eb67-4ffb-ba98-4b654162223a",
- "serviceName": "manualDistributionTestService",
- "serviceVersion": "1.0",
- "serviceUUID": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "serviceDescription": "Test",
- "serviceInvariantUUID": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "resources": [
- {
- "resourceInstanceName": "manualDistributionTestVNF 0",
- "resourceCustomizationUUID": "82ad3aa0-edc6-410c-a217-655fb064323f",
- "resourceName": "manualDistributionTestVNF",
- "resourceVersion": "1.0",
- "resoucreType": "VF",
- "resourceUUID": "e8e39dc4-4761-4da7-aedf-7d1fd3637772",
- "resourceInvariantUUID": "0a0b9979-863d-4b7e-b7f4-d27725a182b3",
- "category": "Application L4+",
- "subcategory": "Media Servers",
- "artifacts": [
+ "distributionID": "f0d0e9e2-10aa-4f66-a0cc-cf5ecb386b42",
+ "serviceName": "EtsiServiceCSIT3",
+ "serviceVersion": "1.0",
+ "serviceUUID": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "serviceDescription": "test",
+ "serviceInvariantUUID": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "resources": [
{
- "artifactName": "manualdistributiontestvnf0_modules.json",
- "artifactType": "VF_MODULES_METADATA",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/manualdistributiontestvnf0_modules.json",
- "artifactChecksum": "NTc0NDlkNzdmYzVmMDM3ZjMxMTE2NDBmYWJiMDM1NzY\u003d",
- "artifactDescription": "Auto-generated VF Modules information artifact",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "a10f397a-6546-4a27-843f-25821955ef3e",
- "relatedArtifactsInfo": []
- },
- {
- "artifactName": "base_ves_med1.yaml",
- "artifactType": "HEAT",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.yaml",
- "artifactChecksum": "YTAwNTQ3NjczY2Y5MmUwZjUzZTY1ZjNhNTA0NGQyMDY\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295",
- "generatedArtifact": {
- "artifactName": "base_ves_med1.env",
- "artifactType": "HEAT_ENV",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env",
- "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d",
- "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951",
- "generatedFromUUID": "e216d9da-18c4-460f-8b2b-d7f8dd9e9295"
- },
- "relatedArtifactsInfo": []
- },
- {
- "artifactName": "base_ves_med1.env",
- "artifactType": "HEAT_ENV",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/base_ves_med1.env",
- "artifactChecksum": "Mjg5YTVhNTlmYTdjYTFlYjYxMDlhODYzNmJhZGJiZGE\u003d",
- "artifactDescription": "Auto-generated HEAT Environment deployment artifact",
- "artifactTimeout": 120,
- "artifactVersion": "2",
- "artifactUUID": "6243747f-e794-4519-82b2-6399846f1951",
- "relatedArtifactsInfo": []
- },
+ "resourceInstanceName": "EtsiVnfCSIT3 0",
+ "resourceCustomizationUUID": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "resourceName": "EtsiVnfCSIT3",
+ "resourceVersion": "1.0",
+ "resourceUUID": "bb7ff27f-d609-4d02-9926-2f4c5eb89316",
+ "resourceInvariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "category": "Generic",
+ "subcategory": "Network Service",
+ "artifacts": [],
+ "artifactsImpl": [],
+ "resourceType": "VF"
+ }
+ ],
+ "serviceArtifacts": [
{
- "artifactName": "TOSCA.meta",
- "artifactType": "OTHER",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/TOSCA.meta",
- "artifactChecksum": "NWE2ODcyOWY0NGI2MzEyOGViYjUxNTEwMjU5OWRhZmI\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "6c64d38b-186f-4339-9a76-a266c40f40ec",
- "relatedArtifactsInfo": []
- },
+ "artifactName": "service-Etsiservicecsit3-csar.csar",
+ "artifactType": "TOSCA_CSAR",
+ "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Etsiservicecsit3/1.0/artifacts/service-Etsiservicecsit3-csar.csar",
+ "artifactChecksum": "NDcwMjRmZjg3MWYwY2FmMTAxN2RlZWEzMWE2OTU2ZjA=",
+ "artifactDescription": "TOSCA definition package ofthe asset",
+ "artifactTimeout": 0,
+ "artifactVersion": "1",
+ "artifactUUID": "587a89d9-ca2d-41b7-929e-de191fd4bf29",
+ "relatedArtifacts": []
+ }
+ ],
+ "workloadContext": "Production",
+ "resourcesImpl": [
{
- "artifactName": "descriptor.yaml",
- "artifactType": "OTHER",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/resourceInstances/manualdistributiontestvnf0/artifacts/descriptor.yaml",
- "artifactChecksum": "YWZkNTg2ZGMzZjRhZjgxNzNkODJiNjgwZmRlZjlmNDE\u003d",
- "artifactDescription": "created from csar",
- "artifactTimeout": 120,
- "artifactVersion": "1",
- "artifactUUID": "4bd0cdf6-0b12-4d19-b3d8-6dbc34fe397e",
- "relatedArtifactsInfo": []
+ "resourceInstanceName": "EtsiVnfCSIT3 0",
+ "resourceCustomizationUUID": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "resourceName": "EtsiVnfCSIT3",
+ "resourceVersion": "1.0",
+ "resourceUUID": "bb7ff27f-d609-4d02-9926-2f4c5eb89316",
+ "resourceInvariantUUID": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "category": "Generic",
+ "subcategory": "Network Service",
+ "artifacts": [],
+ "artifactsImpl": [],
+ "resourceType": "VF"
}
- ]
- }
- ],
- "serviceArtifacts": [
- {
- "artifactName": "service-Manualdistributiontestservice-csar.csar",
- "artifactType": "TOSCA_CSAR",
- "artifactURL": "/unzipped_sdc_csar/v1/catalog/services/Manualdistributiontestservice/1.0/artifacts/service-Manualdistributiontestservice-csar.csar",
- "artifactChecksum": "YWYxNmUxNTlhMmE3MjA1NGVhNTBhYTdkMmU0OTZjNzM\u003d",
- "artifactDescription": "TOSCA definition package of the asset",
- "artifactTimeout": 0,
- "artifactVersion": "1",
- "artifactUUID": "e6e8c36a-b939-4845-995a-41c50be890a0"
- }
- ],
- "workloadContext": "Production"
+ ]
}
"requestDetails": {
"modelInfo": {
"modelType": "service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersionId": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "modelName": "manualDistributionTestService",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "modelName": "EtsiServiceCSIT3",
"modelVersion": "1.0"
},
"requestInfo": {
"aLaCarte": true
}
}
-}
\ No newline at end of file
+}
{
- "requestDetails": {
- "requestInfo": {
- "instanceName": "CsitEtsiInstance",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "demo"
- },
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersionId": "28d4acf3-4791-4998-8d06-1cdf6d1767a9",
- "modelName": "manualDistributionTestService",
- "modelVersion": "1.0"
- },
- "requestParameters": {
- "userParams": [],
- "testApi": "GR_API",
- "subscriptionServiceType": "vCPE",
- "aLaCarte": true
- },
- "subscriberInfo": {
- "globalSubscriberId": "DemoCustomer"
- },
- "project": {
- "projectName": "etsiCsitProject"
- },
- "owningEntity": {
- "owningEntityId": "f2e1071e-3d47-4a65-94d4-e473ec03326a",
- "owningEntityName": "OE-Demonstration"
- }
+ "requestDetails": {
+ "requestInfo": {
+ "instanceName": "CsitEtsiInstance",
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "demo"
+ },
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403",
+ "modelName": "EtsiServiceCSIT3",
+ "modelVersion": "1.0"
+ },
+ "requestParameters": {
+ "userParams": [],
+ "testApi": "GR_API",
+ "subscriptionServiceType": "vCPE",
+ "aLaCarte": true
+ },
+ "subscriberInfo": {
+ "globalSubscriberId": "DemoCustomer"
+ },
+ "project": {
+ "projectName": "etsiCsitProject"
+ },
+ "owningEntity": {
+ "owningEntityId": "f2e1071e-3d47-4a65-94d4-e473ec03326a",
+ "owningEntityName": "OE-Demonstration"
}
+ }
}
"requestDetails": {
"modelInfo": {
"modelType": "vnf",
- "modelInvariantId": "b0f14066-2b65-40d2-b5a4-c8f2116fb5fc",
- "modelVersionId": "84b9649a-4eb9-4967-9abe-e8702f55518b",
- "modelName": "Sol004Zip3VSP",
- "modelCustomizationName": "Sol004Zip3VSP 0",
- "modelCustomizationId": "ff0860ac-fa9a-4fff-956b-80eeb7a330bc",
+ "modelInvariantId": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "modelVersionId": "73522444-e8e9-49c1-be29-d355800aa349",
+ "modelName": "EtsiVnfCSIT3",
+ "modelCustomizationName": "EtsiVnfCSIT3 0",
+ "modelCustomizationId": "3341825c-837c-4e84-8a82-cc69033ca92f",
"modelVersion": "1.0"
},
"requestInfo": {
"tenantId": "693c7729b2364a26a3ca602e6f66187d"
}
}
-}
\ No newline at end of file
+}
{
- "requestDetails": {
- "requestInfo": {
- "instanceName": "CsitEtsiVnfInstance",
- "source": "VID",
- "suppressRollback": false,
- "requestorId": "demo",
- "productFamilyId": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e"
- },
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "0a0b9979-863d-4b7e-b7f4-d27725a182b3",
- "modelVersionId": "8f43a8c9-c677-462a-ae36-8ddb5990a60d",
- "modelName": "manualDistributionTestVNF",
- "modelVersion": "1.0",
- "modelCustomizationId": "82ad3aa0-edc6-410c-a217-655fb064323f",
- "modelCustomizationName": "manualDistributionTestVNF 0"
- },
- "requestParameters": {
- "userParams": [],
- "testApi": "GR_API"
- },
- "cloudConfiguration": {
- "lcpCloudRegionId": "EtsiCloudRegion",
- "cloudOwner": "CloudOwner",
- "tenantId": "693c7729b2364a26a3ca602e6f66187d"
- },
- "lineOfBusiness": {
- "lineOfBusinessName": "EtsiCsitLineOfBusiness"
- },
- "platform": {
- "platformName": "EtsiCsitPlatform"
- },
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "",
- "modelInfo": {
- "modelType": "service",
- "modelName": "Sol004Zip4Service",
- "modelInvariantId": "0ddc448d-5513-44bc-8b02-5759d84600d5",
- "modelVersion": "1.0",
- "modelVersionId": "99d59273-4450-4034-9141-027f0c1a807a"
- }
- }
- }
- ]
- }
-}
\ No newline at end of file
+ "requestDetails": {
+ "requestInfo": {
+ "instanceName": "CsitEtsiVnfInstance",
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "demo",
+ "productFamilyId": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e"
+ },
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "037f7b1b-5c62-44c1-b806-f92fe8970171",
+ "modelVersionId": "73522444-e8e9-49c1-be29-d355800aa349",
+ "modelName": "EtsiVnfCSIT3",
+ "modelVersion": "1.0",
+ "modelCustomizationId": "3341825c-837c-4e84-8a82-cc69033ca92f",
+ "modelCustomizationName": "EtsiVnfCSIT3 0"
+ },
+ "requestParameters": {
+ "userParams": [],
+ "testApi": "GR_API"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "EtsiCloudRegion",
+ "cloudOwner": "CloudOwner",
+ "tenantId": "693c7729b2364a26a3ca602e6f66187d"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "EtsiCsitLineOfBusiness"
+ },
+ "platform": {
+ "platformName": "EtsiCsitPlatform"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "",
+ "modelInfo": {
+ "modelType": "service",
+ "modelName": "EtsiServiceCSIT3",
+ "modelInvariantId": "10b3d278-e262-44ca-a0c0-4e663c2d7562",
+ "modelVersion": "1.0",
+ "modelVersionId": "fdea6501-dabd-4428-b52c-623336a3b403"
+ }
+ }
+ }]
+ }
+}
--- /dev/null
+{"csarId": "73522444-e8e9-49c1-be29-d355800aa349"}
${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}= 48 # Represents the maximum number of attempts that will be made before a timeout. It sleeps for SLEEP_INTERVAL_SEC seconds before retry.
*** Test Cases ***
+OnBoard VNF Package In Etsi Catalog
+ Create Session etsi_catalog_session http://${REPO_IP}:8806
+ ${data}= Get Binary File ${CURDIR}${/}data${/}vnfPackageOnboardRequest.json
+ &{headers}= Create Dictionary Content-Type=application/json Accept=application/json
+ ${resp}= Post Request etsi_catalog_session /api/catalog/v1/vnfpackages data=${data} headers=${headers}
+ Run Keyword If '${resp.status_code}' == '202' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${resp.status_code}' '202'
+ log to console ${resp.content}
+ ${onboarding_job_json_response}= Evaluate json.loads(r"""${resp.content}""", strict=False) json
+ ${job_ID}= Set Variable ${onboarding_job_json_response}[jobId]
+ Should Not Be Empty ${job_ID}
+ ${actual_job_status}= Set Variable ""
+
+ FOR ${INDEX} IN RANGE ${MAXIMUM_ATTEMPTS_BEFORE_TIMEOUT}
+ ${onboarding_job_status_request}= Get Request etsi_catalog_session /api/catalog/v1/jobs/${job_ID}
+ Run Keyword If '${onboarding_job_status_request.status_code}' == '200' log to console \nexecuted with expected result
+ log to console ${onboarding_job_status_request.content}
+
+ ${onboarding_job_status_json_response}= Evaluate json.loads(r"""${onboarding_job_status_request.content}""", strict=False) json
+
+ ${actual_job_status}= Set Variable ""
+
+ ${response_descriptor_exists}= Run Keyword And Return Status Get From Dictionary ${onboarding_job_status_json_response} responseDescriptor
+ ${status_exists}= Run Keyword And Return Status Get From Dictionary ${onboarding_job_status_json_response}[responseDescriptor] status
+
+ ${actual_job_status}= Set Variable If ${response_descriptor_exists} == True and ${status_exists} == True
+ ... ${onboarding_job_status_json_response}[responseDescriptor][status]
+
+ Log To Console Received actual repsonse status:${actual_job_status}
+ Run Keyword If '${actual_job_status}' == 'finished' or '${actual_job_status}' == 'error' or '${actual_job_status}' == 'timeout' Exit For Loop
+ log to console Will try again after ${SLEEP_INTERVAL_SEC} seconds
+ SLEEP ${SLEEP_INTERVAL_SEC}
+ END
+ Log To Console final repsonse status received: ${actual_job_status}
+ Run Keyword If '${actual_job_status}' == 'finished' log to console \nexecuted with expected result
+ Should Be Equal As Strings '${actual_job_status}' 'finished'
+
Distribute Service Template
Create Session sdc_controller_session http://${REPO_IP}:8085
${data}= Get Binary File ${CURDIR}${/}data${/}distributeServiceTemplate.json
Code Review / integration / csit.git / commitdiff