</resource>
</resources>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.aai.schema-service</groupId>
+ <artifactId>aai-schema</artifactId>
+ <version>1.9.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
import org.springframework.web.client.RestTemplate;
@SpringBootApplication
-@ComponentScan(basePackages = {"org.onap.so.adapters.cnf"})
+@ComponentScan(basePackages = {"org.onap.so.adapters.cnf", "org.onap.so.spring"})
@EnableAutoConfiguration(exclude = {LiquibaseAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class,
SecurityAutoConfiguration.class})
package org.onap.so.adapters.cnf.exceptions;
-import static org.onap.so.adapters.cnf.util.CNfAdapterUtil.marshal;
+import static org.onap.so.adapters.cnf.util.CnfAdapterUtil.marshal;
import org.onap.so.adapters.cnf.model.ErrorResponse;
import org.springframework.http.ResponseEntity;
+import static org.onap.so.adapters.cnf.util.CnfAdapterUtil.marshal;
+
public class ApplicationException extends Exception {
private static final long serialVersionUID = 1L;
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
package org.onap.so.adapters.cnf.model.instantiation;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
private String tenantId;
@JsonProperty("callbackUrl")
private String callbackUrl;
+ @JsonProperty("genericVnfId")
+ private String genericVnfId;
+ @JsonProperty("vfModuleId")
+ private String vfModuleId;
public String getInstanceId() {
return instanceId;
this.callbackUrl = callbackUrl;
}
+ public String getVfModuleId() {
+ return vfModuleId;
+ }
+
+ public void setVfModuleId(String vfModuleId) {
+ this.vfModuleId = vfModuleId;
+ }
+
+ public String getGenericVnfId() {
+ return genericVnfId;
+ }
+
+ public void setGenericVnfId(String genericVnfId) {
+ this.genericVnfId = genericVnfId;
+ }
+
@Override
public String toString() {
return "AaiRequest{" +
", cloudOwner='" + cloudOwner + '\'' +
", tenantId='" + tenantId + '\'' +
", callbackUrl='" + callbackUrl + '\'' +
+ ", genericVnfId='" + genericVnfId + '\'' +
+ ", vfModuleId='" + vfModuleId + '\'' +
'}';
}
}
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-
package org.onap.so.adapters.cnf.rest;
import com.fasterxml.jackson.core.JsonParseException;
new Thread(() -> {
logger.info("Processing aai update");
-// aaiService.aaiUpdate(aaiRequest);
+ try {
+ aaiService.aaiUpdate(aaiRequest);
+ } catch (BadResponseException e) {
+ throw new RuntimeException("Failed to insert resource into AAI", e);
+ }
AaiCallbackResponse mockCallbackResponse = new AaiCallbackResponse();
mockCallbackResponse.setCompletionStatus(AaiCallbackResponse.CompletionStatus.COMPLETED);
try {
logger.info("aai-delete called.");
DeferredResult<ResponseEntity> response = new DeferredResult<>();
- new Thread(() -> {
+ ForkJoinPool.commonPool().execute(() -> {
logger.info("Processing aai delete");
-// aaiService.aaiDelete(aaiRequest);
AaiCallbackResponse mockCallbackResponse = new AaiCallbackResponse();
- mockCallbackResponse.setCompletionStatus(AaiCallbackResponse.CompletionStatus.COMPLETED);
+ try {
+ aaiService.aaiDelete(aaiRequest);
+ mockCallbackResponse.setCompletionStatus(AaiCallbackResponse.CompletionStatus.COMPLETED);
+ } catch (BadResponseException e) {
+ logger.warn("Failed to delete resource from AAI", e);
+ mockCallbackResponse.setCompletionStatus(AaiCallbackResponse.CompletionStatus.FAILED);
+ }
try {
Thread.sleep(10_000L);
} catch (InterruptedException e) {
logger.error("InterruptedException occurred when aai-delete");
}
callbackClient.sendPostCallback(aaiRequest.getCallbackUrl(), mockCallbackResponse);
- }).start();
+ });
response.setResult(ResponseEntity.accepted().build());
return response;
+++ /dev/null
-package org.onap.so.adapters.cnf.service.aai;
-
-import com.google.gson.Gson;
-import org.onap.aaiclient.client.aai.AAIResourcesClient;
-import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
-import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
-import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder;
-import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
-import org.springframework.stereotype.Component;
-
-@Component
-class AaiRequestSender {
-
- private final static Gson gson = new Gson();
- private AAIResourcesClient aaiClient;
-
- void sendUpdateRequestToAai(ParseResult parseResult, AaiRequest aaiRequest) {
- AAIResourceUri aaiUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure()
- .cloudRegion(aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion())
- .tenant(aaiRequest.getTenantId())
- .build());
- String payload = gson.toJson(parseResult);
- getAaiClient().create(aaiUri, payload);
- }
-
- void sendDeleteRequestToAai(AaiRequest aaiRequest) {
- AAIResourceUri aaiUri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure()
- .cloudRegion(aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion())
- .tenant(aaiRequest.getTenantId())
- .build());
- getAaiClient().delete(aaiUri);
- }
-
- private AAIResourcesClient getAaiClient() {
- if (aaiClient == null) {
- aaiClient = new AAIResourcesClient();
- }
- return aaiClient;
- }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2021 Samsung Electronics Co. Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
package org.onap.so.adapters.cnf.service.aai;
+import org.apache.http.client.utils.URIBuilder;
import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatusMetadata;
import org.springframework.stereotype.Component;
+import java.net.URISyntaxException;
import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
+import java.util.Map;
@Component
public class AaiResponseParser {
+ private final static String INSTANCE_ID = "k8splugin.io/rb-instance-id";
+
private final AaiIdGeneratorService aaiIdGeneratorService;
public AaiResponseParser(AaiIdGeneratorService aaiIdGeneratorService) {
this.aaiIdGeneratorService = aaiIdGeneratorService;
}
- ParseResult parse(K8sRbInstanceResourceStatus status, AaiRequest aaiRequest) {
- ParseResult result = new ParseResult();
+ KubernetesResource parse(K8sRbInstanceResourceStatus status, AaiRequest aaiRequest) {
+ KubernetesResource result = new KubernetesResource();
K8sRbInstanceGvk gvk = status.getGvk();
K8sStatus k8sStatus = status.getStatus();
K8sStatusMetadata metadata = k8sStatus.getK8sStatusMetadata();
result.setVersion(gvk.getVersion());
result.setKind(gvk.getKind());
result.setNamespace(metadata.getNamespace());
- Collection<String> labels = new ArrayList<>();
- metadata.getLabels().forEach((key, value) -> {
- labels.add(key);
- labels.add(value);
- });
+ List<String> labels = parseLabels(metadata.getLabels());
result.setLabels(labels);
- result.setK8sResourceSelfLink(String.format("http://so-cnf-adapter:8090/api/cnf-adapter/v1/instance/%s/query", aaiRequest.getInstanceId()));
+ URIBuilder uriBuilder = new URIBuilder();
+ String selfLink;
+ try {
+ selfLink = uriBuilder
+ .setScheme("http")
+ .setHost("so-cnf-adapter")
+ .setPort(8090)
+ .setPath("/api/cnf-adapter/v1/instance/" + aaiRequest.getInstanceId() + "/query")
+ .setParameter("ApiVersion", gvk.getVersion())
+ .setParameter("Kind", gvk.getKind())
+ .setParameter("Name", status.getName())
+ .setParameter("Namespace", metadata.getNamespace())
+ .build()
+ .toString();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ result.setK8sResourceSelfLink(selfLink);
+ return result;
+ }
+
+ private List<String> parseLabels(Map<String, String> labels) {
+ List<String> result = new ArrayList<>();
+ labels.entrySet().stream()
+ .filter(i -> i.getKey().equals(INSTANCE_ID))
+ .findFirst()
+ .ifPresent(i -> addInstanceIdFist(i, result));
+ labels.entrySet().stream()
+ .filter(i -> !i.getKey().equals(INSTANCE_ID))
+ .forEach(i -> {
+ result.add(i.getKey());
+ result.add(i.getValue());
+ });
return result;
}
+ private void addInstanceIdFist(Map.Entry<String, String> instanceId, List<String> result) {
+ result.add(instanceId.getKey());
+ result.add(instanceId.getValue());
+ }
}
import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceStatus;
+import org.onap.so.adapters.cnf.util.IAaiRepository;
import org.onap.so.client.exception.BadResponseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final static Logger log = LoggerFactory.getLogger(AaiService.class);
private final MulticloudClient multicloudClient;
- private final AaiRequestSender aaiRequestSender;
private final AaiResponseParser responseParser;
- private final AaiConfiguration aaiConfiguration;
+ private final AaiConfiguration configuration;
- public AaiService(MulticloudClient multicloudClient,
- AaiRequestSender aaiRequestSender,
- AaiResponseParser responseParser,
- AaiConfiguration aaiConfiguration) {
+ public AaiService(MulticloudClient multicloudClient, AaiResponseParser responseParser, AaiConfiguration configuration) {
this.multicloudClient = multicloudClient;
- this.aaiRequestSender = aaiRequestSender;
this.responseParser = responseParser;
- this.aaiConfiguration = aaiConfiguration;
+ this.configuration = configuration;
}
public void aaiUpdate(AaiRequest aaiRequest) throws BadResponseException {
- if (aaiConfiguration.isEnabled()) {
- List<ParseResult> parseStatus = parseStatus(aaiRequest);
- parseStatus.forEach(status -> aaiRequestSender.sendUpdateRequestToAai(status, aaiRequest));
- } else {
- log.info("aai.enabled=false, do not execute aaiUpdate flow");
- }
+ List<KubernetesResource> parseStatus = parseStatus(aaiRequest);
+ IAaiRepository aaiRepository = IAaiRepository.instance(configuration.isEnabled());
+ parseStatus.forEach(status -> aaiRepository.update(status, aaiRequest));
+ aaiRepository.commit(true);
}
public void aaiDelete(AaiRequest aaiRequest) throws BadResponseException {
- if (aaiConfiguration.isEnabled()) {
- List<ParseResult> parseStatus = parseStatus(aaiRequest);
- parseStatus.forEach(status -> aaiRequestSender.sendDeleteRequestToAai(aaiRequest));
- } else {
- log.info("aai.enabled=false, do not execute aaiDelete flow");
- }
+ List<KubernetesResource> parseStatus = parseStatus(aaiRequest);
+
+ IAaiRepository aaiRepository = IAaiRepository.instance(configuration.isEnabled());
+ parseStatus.forEach(status -> aaiRepository.delete(status, aaiRequest));
+ aaiRepository.commit(true);
}
- private List<ParseResult> parseStatus(AaiRequest aaiRequest) throws BadResponseException {
+ private List<KubernetesResource> parseStatus(AaiRequest aaiRequest) throws BadResponseException {
String instanceId = aaiRequest.getInstanceId();
K8sRbInstanceStatus instanceStatus = multicloudClient.getInstanceStatus(instanceId);
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2021 Samsung Electronics Co. Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
package org.onap.so.adapters.cnf.service.aai;
-import java.util.Collection;
+import java.util.List;
-class ParseResult {
+public class KubernetesResource {
private String id;
private String name;
private String group;
private String version;
private String kind;
private String namespace;
- private Collection<String> labels;
+ private List<String> labels;
private String k8sResourceSelfLink;
public String getId() {
this.namespace = namespace;
}
- public Collection<String> getLabels() {
+ public List<String> getLabels() {
return labels;
}
- public void setLabels(Collection<String> labels) {
+ public void setLabels(List<String> labels) {
this.labels = labels;
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.adapters.cnf.util;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.onap.aaiclient.client.aai.AAIProperties;
+import org.onap.aaiclient.client.aai.AAIVersion;
+import org.onap.so.client.CacheProperties;
+import org.onap.so.spring.SpringContextHelper;
+import org.springframework.context.ApplicationContext;
+
+public class AaiClientPropertiesImpl implements AAIProperties {
+
+ private String aaiEndpoint;
+ private String auth;
+ private String key;
+ private Long readTimeout;
+ private Long connectionTimeout;
+ private boolean enableCaching;
+ private Long cacheMaxAge;
+ private static final String SYSTEM_NAME = "MSO";
+
+ public AaiClientPropertiesImpl() {
+ ApplicationContext context = SpringContextHelper.getAppContext();
+ aaiEndpoint = context.getEnvironment().getProperty("aai.endpoint");
+ this.auth = context.getEnvironment().getProperty("aai.auth");
+ this.key = context.getEnvironment().getProperty("mso.msoKey");
+ this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, 60000L);
+ this.connectionTimeout = context.getEnvironment().getProperty("aai.connectionTimeout", Long.class, 60000L);
+ this.enableCaching = context.getEnvironment().getProperty("aai.caching.enabled", Boolean.class, false);
+ this.cacheMaxAge = context.getEnvironment().getProperty("aai.caching.maxAge", Long.class, 60000L);
+ }
+
+ @Override
+ public URL getEndpoint() throws MalformedURLException {
+ return new URL(aaiEndpoint);
+ }
+
+ @Override
+ public String getSystemName() {
+ return SYSTEM_NAME;
+ }
+
+ @Override
+ public AAIVersion getDefaultVersion() {
+ return AAIVersion.LATEST;
+ }
+
+ @Override
+ public String getAuth() {
+ return this.auth;
+ }
+
+ @Override
+ public String getKey() {
+ return this.key;
+ }
+
+ @Override
+ public Long getReadTimeout() {
+ return this.readTimeout;
+ }
+
+ @Override
+ public Long getConnectionTimeout() {
+ return this.connectionTimeout;
+ }
+
+ @Override
+ public boolean isCachingEnabled() {
+ return this.enableCaching;
+ }
+
+ @Override
+ public CacheProperties getCacheProperties() {
+ return new AAICacheProperties() {
+ @Override
+ public Long getMaxAge() {
+ return cacheMaxAge;
+ }
+ };
+ }
+}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2021 Samsung Electronics Co. Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.adapters.cnf.util;
+
+import com.google.gson.Gson;
+import org.onap.aaiclient.client.aai.AAIResourcesClient;
+import org.onap.aaiclient.client.aai.AAITransactionalClient;
+import org.onap.aaiclient.client.aai.AAIVersion;
+import org.onap.aaiclient.client.aai.entities.uri.AAIResourceUri;
+import org.onap.aaiclient.client.aai.entities.uri.AAIUriFactory;
+import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder;
+import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder.Types;
+import org.onap.aaiclient.client.generated.fluentbuilders.K8sResource;
+import org.onap.aaiclient.client.graphinventory.exceptions.BulkProcessFailed;
+import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.service.aai.KubernetesResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class AaiRepository implements IAaiRepository {
+ private final static Logger logger = LoggerFactory.getLogger(IAaiRepository.class);
+ private final static Gson gson = new Gson();
+
+ private final AAIResourcesClient aaiClient;
+ private final AAITransactionalClient transaction;
+
+ public static IAaiRepository instance() {
+ return new AaiRepository();
+ }
+
+ private AaiRepository() {
+ aaiClient = new AAIResourcesClient(AAIVersion.LATEST);
+ transaction = aaiClient.beginTransaction();
+ }
+
+ @Override
+ public void commit(boolean dryrun) {
+ try {
+ transaction.execute(dryrun);
+ } catch (BulkProcessFailed bulkProcessFailed) {
+ throw new RuntimeException("Failed to exectute transaction", bulkProcessFailed);
+ }
+ }
+
+ @Override
+ public void update(KubernetesResource resource, AaiRequest aaiRequest) {
+ logger.info("updating AAI with resource {} and request {}", resource, aaiRequest);
+
+ K8sResource k8sResource = AAIFluentTypeBuilder.cloudInfrastructure()
+ .cloudRegion(aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion())
+ .tenant(aaiRequest.getTenantId())
+ .k8sResource(resource.getId());
+
+ AAIResourceUri k8sResourceUri =
+ AAIUriFactory.createResourceUri(k8sResource.build(), aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion(), aaiRequest.getTenantId(), resource.getId());
+
+ String payload = gson.toJson(resource);
+ logger.debug("K8s resource URI: " + k8sResourceUri + " with payload [" + payload + "]");
+ transaction.createIfNotExists(k8sResourceUri, Optional.of(payload));
+ // add edge from vf module to k8s resource
+ final String genericVnfId = aaiRequest.getGenericVnfId();
+ final String vfModuleId = aaiRequest.getVfModuleId();
+
+
+ var vfModuleUri = AAIUriFactory.createResourceUri(
+ AAIFluentTypeBuilder.network().genericVnf(genericVnfId).vfModule(vfModuleId));
+ var instance = aaiClient.get(vfModuleUri);
+
+ var foundUri = instance.getRelationships().get().getRelatedUris(Types.K8S_RESOURCE)
+ .stream().filter(resourceUri -> resourceUri
+ .getURIKeys()
+ .get("k8s_resource-id")
+ .startsWith(resource.getId()))
+ .findFirst();
+
+ transaction.connect(foundUri.get(), k8sResourceUri);
+
+ var genericVnfUri = AAIUriFactory.createResourceUri(
+ AAIFluentTypeBuilder.network().genericVnf(genericVnfId));
+ instance = aaiClient.get(genericVnfUri);
+
+ foundUri = instance.getRelationships().get().getRelatedUris(Types.K8S_RESOURCE)
+ .stream().filter(resourceUri -> resourceUri
+ .getURIKeys()
+ .get("k8s_resource-id") // FIXME double check names
+ .startsWith(resource.getId()))
+ .findFirst();
+
+ transaction.connect(foundUri.get(), k8sResourceUri);
+ }
+
+ @Override
+ public void delete(KubernetesResource resource, AaiRequest aaiRequest) {
+ logger.info("deleting from AAI resource {}", aaiRequest);
+ // dge from vf module to k8s resource
+ final String genericVnfId = aaiRequest.getGenericVnfId();
+ final String vfModuleId = aaiRequest.getVfModuleId();
+
+ var vfModuleUri = AAIUriFactory.createResourceUri(
+ AAIFluentTypeBuilder.network().genericVnf(genericVnfId).vfModule(vfModuleId));
+ var instance = aaiClient.get(vfModuleUri);
+
+ if (instance.hasRelationshipsTo(Types.K8S_RESOURCE)) {
+ List<KubernetesResource> resources = instance.getRelationships().get().getByType(Types.K8S_RESOURCE)
+ .stream()
+ .map(r -> r.asBean(KubernetesResource.class))
+ .filter(r -> r.get().getLabels().get(1).equals(resource.getLabels().get(1)))
+ .map(Optional::get)
+ .collect(Collectors.toList());
+ resources.stream().map(r -> {
+ K8sResource k8sResource = AAIFluentTypeBuilder.cloudInfrastructure()
+ .cloudRegion(aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion())
+ .tenant(aaiRequest.getTenantId())
+ .k8sResource(r.getId());
+ AAIResourceUri k8sResourceUri =
+ AAIUriFactory.createResourceUri(k8sResource.build(), aaiRequest.getCloudOwner(), aaiRequest.getCloudRegion(), aaiRequest.getTenantId(), r.getId());
+ return k8sResourceUri;
+ }).forEach(uri -> transaction.delete(uri));
+ }
+
+ }
+}
package org.onap.so.adapters.cnf.util;
import com.fasterxml.jackson.databind.ObjectMapper;
+
import java.io.IOException;
+
import org.onap.so.adapters.cnf.exceptions.ApplicationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.onap.logging.filter.base.ErrorCode;
+
import static org.onap.so.logger.LoggingAnchor.THREE;
import static org.onap.so.logger.MessageEnum.RA_NS_EXC;
-public class CNfAdapterUtil {
+public class CnfAdapterUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(CNfAdapterUtil.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(CnfAdapterUtil.class);
public static final int BAD_REQUEST = 400;
}
}
- private CNfAdapterUtil() {
+ private CnfAdapterUtil() {
}
--- /dev/null
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2021 Samsung Electronics Co. Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.adapters.cnf.util;
+
+import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
+import org.onap.so.adapters.cnf.service.aai.KubernetesResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static java.lang.Thread.sleep;
+
+public interface IAaiRepository {
+ static IAaiRepository instance(boolean enabled) {
+ if (enabled)
+ return AaiRepository.instance();
+ else
+ return AaiRepositoryDummy.instance();
+ }
+
+ void update(KubernetesResource resource, AaiRequest request);
+
+ void delete(KubernetesResource resource, AaiRequest request);
+
+ void commit(boolean dryRun);
+
+ static class AaiRepositoryDummy implements IAaiRepository {
+ private static final Logger logger = LoggerFactory.getLogger(IAaiRepository.class);
+ private static final IAaiRepository instance = new AaiRepositoryDummy();
+
+ private static final Long SLEEP_TIME = 3000l;
+
+ public static IAaiRepository instance() {
+ return instance;
+ }
+
+ private AaiRepositoryDummy() {
+
+ }
+
+ @Override
+ public void update(KubernetesResource resource, AaiRequest request) {
+ logger.info("aai synchronization disabled - mocking update AAI with resource {} and request {}", resource, request);
+ try {
+ sleep(SLEEP_TIME);
+ } catch (InterruptedException e) {
+ logger.debug("aai synchronization disabled [update] - sleep failed");
+ }
+ }
+
+ @Override
+ public void delete(KubernetesResource resource, AaiRequest aaiRequest) {
+ logger.info("aai synchronization disabled - mocking delete from AAI resource {}", aaiRequest);
+ try {
+ sleep(SLEEP_TIME);
+ } catch (InterruptedException e) {
+ logger.debug("aai synchronization disabled [delete] - sleep failed");
+ }
+
+ }
+
+ @Override
+ public void commit(boolean dryrun) {
+ logger.info("aai synchronization disabled - commiting");
+ }
+ }
+}
-org.onap.so.adapters.cnf.extclients.aai.AaiClientPropertiesImpl
\ No newline at end of file
+org.onap.so.adapters.cnf.util.AaiClientPropertiesImpl
\ No newline at end of file
\r
import org.junit.Test;\r
import org.junit.runner.RunWith;\r
-import org.onap.so.adapters.cnf.model.*;\r
-import org.springframework.http.HttpStatus;\r
+import org.onap.so.adapters.cnf.model.GroupVersionKind;\r
+import org.onap.so.adapters.cnf.model.InstanceStatusResponse;\r
+import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest;\r
+import org.onap.so.adapters.cnf.model.PodStatus;\r
+import org.onap.so.adapters.cnf.model.Resource;\r
import org.springframework.test.context.junit4.SpringRunner;\r
\r
import java.util.List;\r
applicationexception.buildErrorResponse();\r
\r
}\r
-}
\ No newline at end of file
+\r
+}\r
import org.mockito.Mock;
import org.mockito.Mockito;
import org.onap.so.adapters.cnf.MulticloudConfiguration;
-import org.onap.so.adapters.cnf.model.*;
+import org.onap.so.adapters.cnf.model.BpmnInstanceRequest;
+import org.onap.so.adapters.cnf.model.CheckInstanceRequest;
+import org.onap.so.adapters.cnf.model.ConfigTemplateEntity;
+import org.onap.so.adapters.cnf.model.ConfigurationEntity;
+import org.onap.so.adapters.cnf.model.ConfigurationRollbackEntity;
+import org.onap.so.adapters.cnf.model.ConnectivityInfo;
+import org.onap.so.adapters.cnf.model.InstanceMiniResponse;
+import org.onap.so.adapters.cnf.model.InstanceMiniResponseList;
+import org.onap.so.adapters.cnf.model.InstanceResponse;
+import org.onap.so.adapters.cnf.model.InstanceStatusResponse;
+import org.onap.so.adapters.cnf.model.MulticloudInstanceRequest;
+import org.onap.so.adapters.cnf.model.ProfileEntity;
+import org.onap.so.adapters.cnf.model.Resource;
+import org.onap.so.adapters.cnf.model.ResourceBundleEntity;
+import org.onap.so.adapters.cnf.model.Tag;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
import org.onap.so.adapters.cnf.service.CnfAdapterService;
import org.springframework.http.HttpStatus;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.context.request.async.DeferredResult;
import org.springframework.web.multipart.MultipartFile;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+
import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
@RunWith(SpringRunner.class)
package org.onap.so.adapters.cnf.service;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
+import lombok.Data;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.so.adapters.cnf.service.statuscheck.SimpleStatusCheckService;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
+import javax.persistence.EntityNotFoundException;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.persistence.EntityNotFoundException;
-
-import lombok.Data;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
@RunWith(SpringRunner.class)
public class CnfAdapterServiceTest {
import org.onap.so.adapters.cnf.model.instantiation.AaiRequest;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceGvk;
import org.onap.so.adapters.cnf.model.statuscheck.K8sRbInstanceResourceStatus;
+import org.onap.so.adapters.cnf.util.IAaiRepository;
import org.springframework.test.context.junit4.SpringRunner;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2021 Samsung Electronics Co. Ltd. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
package org.onap.so.adapters.cnf.service.aai;
import org.junit.Assert;
import org.onap.so.adapters.cnf.model.statuscheck.K8sStatusMetadata;
import org.springframework.test.context.junit4.SpringRunner;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@RunWith(SpringRunner.class)
public class AaiResponseParserTest {
+ private final static String INSTANCE_ID = "k8splugin.io/rb-instance-id";
+ private final static String INSTANCE_ID_VALUE = "rb-instance-id_value";
+
@InjectMocks
private AaiResponseParser aaiResponseParser;
String namespace = "namespace";
Map<String, String> labelsMap = new HashMap<>();
labelsMap.put("key", "value");
+ labelsMap.put(INSTANCE_ID, INSTANCE_ID_VALUE);
K8sRbInstanceResourceStatus status = mock(K8sRbInstanceResourceStatus.class);
AaiRequest aaiRequest = mock(AaiRequest.class);
K8sRbInstanceGvk gvk = mock(K8sRbInstanceGvk.class);
when(metadata.getLabels()).thenReturn(labelsMap);
// then
- ParseResult actual = aaiResponseParser.parse(status, aaiRequest);
+ KubernetesResource actual = aaiResponseParser.parse(status, aaiRequest);
Assert.assertNotNull(actual);
assertEquals(id, actual.getId());
assertEquals(version, actual.getVersion());
assertEquals(kind, actual.getKind());
assertEquals(namespace, actual.getNamespace());
- assertEquals(2, actual.getLabels().size());
- assertEquals("http://so-cnf-adapter:8090/api/cnf-adapter/v1/instance/id/query", actual.getK8sResourceSelfLink());
-
- }
-
- ParseResult parse(K8sRbInstanceResourceStatus status, AaiRequest aaiRequest) {
- ParseResult result = new ParseResult();
- K8sRbInstanceGvk gvk = status.getGvk();
- K8sStatus k8sStatus = status.getStatus();
- K8sStatusMetadata metadata = k8sStatus.getK8sStatusMetadata();
- String id = aaiIdGeneratorService.generateId(status, aaiRequest);
- result.setId(id);
- result.setName(status.getName());
- result.setGroup(gvk.getGroup());
- result.setVersion(gvk.getVersion());
- result.setKind(gvk.getKind());
- result.setNamespace(metadata.getNamespace());
- Collection<String> labels = new ArrayList<>();
- metadata.getLabels().forEach((key, value) -> {
- labels.add(key);
- labels.add(value);
- });
- result.setLabels(labels);
- result.setK8sResourceSelfLink(String.format("http://so-cnf-adapter:8090/api/cnf-adapter/v1/instance/%s/query", aaiRequest.getInstanceId()));
- return result;
+ assertEquals(4, actual.getLabels().size());
+ assertEquals(INSTANCE_ID, actual.getLabels().get(0));
+ assertEquals(INSTANCE_ID_VALUE, actual.getLabels().get(1));
+ assertEquals("http://so-cnf-adapter:8090/api/cnf-adapter/v1/instance/id/query?ApiVersion=version&Kind=kind&Name=name&Namespace=namespace", actual.getK8sResourceSelfLink());
}
-}
\ No newline at end of file
+}
import java.util.List;
import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@Mock
private MulticloudClient multicloudClient;
@Mock
- private AaiRequestSender aaiRequestSender;
- @Mock
private AaiResponseParser responseParser;
@Mock
private AaiConfiguration aaiConfiguration;
K8sRbInstanceResourceStatus status = mock(K8sRbInstanceResourceStatus.class);
List<K8sRbInstanceResourceStatus> resourcesStatus = new ArrayList<>();
resourcesStatus.add(status);
- ParseResult parseResult = mock(ParseResult.class);
- List<ParseResult> parseResultList = new ArrayList<>();
+ KubernetesResource parseResult = mock(KubernetesResource.class);
+ List<KubernetesResource> parseResultList = new ArrayList<>();
parseResultList.add(parseResult);
// when
when(multicloudClient.getInstanceStatus(instanceId)).thenReturn(instanceStatus);
when(instanceStatus.getResourcesStatus()).thenReturn(resourcesStatus);
when(responseParser.parse(status, aaiRequest)).thenReturn(parseResult);
- when(aaiConfiguration.isEnabled()).thenReturn(true);
- doNothing().when(aaiRequestSender).sendUpdateRequestToAai(parseResult, aaiRequest);
// then
aaiServiceTested.aaiUpdate(aaiRequest);
verify(responseParser, atLeast(1)).parse(status, aaiRequest);
- verify(aaiRequestSender, atLeast(1)).sendUpdateRequestToAai(parseResult, aaiRequest);
}
K8sRbInstanceResourceStatus status = mock(K8sRbInstanceResourceStatus.class);
List<K8sRbInstanceResourceStatus> resourcesStatus = new ArrayList<>();
resourcesStatus.add(status);
- ParseResult parseResult = mock(ParseResult.class);
- List<ParseResult> parseResultList = new ArrayList<>();
+ KubernetesResource parseResult = mock(KubernetesResource.class);
+ List<KubernetesResource> parseResultList = new ArrayList<>();
parseResultList.add(parseResult);
// when
when(multicloudClient.getInstanceStatus(instanceId)).thenReturn(instanceStatus);
when(instanceStatus.getResourcesStatus()).thenReturn(resourcesStatus);
when(responseParser.parse(status, aaiRequest)).thenReturn(parseResult);
- when(aaiConfiguration.isEnabled()).thenReturn(true);
- doNothing().when(aaiRequestSender).sendUpdateRequestToAai(parseResult, aaiRequest);
// then
aaiServiceTested.aaiDelete(aaiRequest);
verify(responseParser, atLeast(1)).parse(status, aaiRequest);
- verify(aaiRequestSender, atLeast(1)).sendDeleteRequestToAai(aaiRequest);
}
-}
\ No newline at end of file
+}
package org.onap.so.adapters.cnf.service.healthcheck;
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.UUID;
-
-import org.junit.jupiter.api.BeforeEach;
+import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import org.junit.Rule;
import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
import org.onap.so.adapters.cnf.client.MulticloudClient;
import org.onap.so.adapters.cnf.model.CheckInstanceRequest;
import org.onap.so.adapters.cnf.model.InstanceRequest;
import org.onap.so.adapters.cnf.model.healthcheck.HealthCheckResponse;
import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheck;
import org.onap.so.adapters.cnf.model.healthcheck.K8sRbInstanceHealthCheckSimple;
-import org.onap.so.client.exception.BadResponseException;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.UUID;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+@SpringBootTest
+@RunWith(MockitoJUnitRunner.class)
class HealthCheckServiceTest {
+ private final int portNumber = 8443;
+ @Rule
+ public WireMockRule wireMockRule = new WireMockRule(portNumber);
@InjectMocks
- HealthCheckService healthCheckService;
+ private HealthCheckService healthCheckService;
@Mock
- MulticloudClient multicloudClient;
-
- @BeforeEach
- void setUp() {
- MockitoAnnotations.initMocks(this);
- }
+ private MulticloudClient multicloudClient;
@Test
- void healthCheckTest() {
+ public void healthCheckTest() {
try {
doReturn(getK8sRbInstanceHealthCheckSimple()).when(multicloudClient).startInstanceHealthCheck(any());
- doReturn(getK8sRbInstanceHealthCheck()).when(multicloudClient).getInstanceHealthCheck(any(),any());
+ doReturn(getK8sRbInstanceHealthCheck()).when(multicloudClient).getInstanceHealthCheck(any(), any());
HealthCheckResponse response = healthCheckService.healthCheck(getTestCheckInstanceRequest());
verify(multicloudClient, times(3)).startInstanceHealthCheck(any());
- verify(multicloudClient, times(3)).getInstanceHealthCheck(any(),any());
+ verify(multicloudClient, times(3)).getInstanceHealthCheck(any(), any());
assertThat(response.getInstanceResponse()).hasSize(getTestCheckInstanceRequest().getInstances().size());
} catch (Exception e) {
e.printStackTrace();
}
}
- private CheckInstanceRequest getTestCheckInstanceRequest(){
- CheckInstanceRequest checkInstanceRequest=new CheckInstanceRequest() ;
- checkInstanceRequest.setInstances(asList(getRandomInstance(),getRandomInstance(),getRandomInstance()));
+ private CheckInstanceRequest getTestCheckInstanceRequest() {
+ CheckInstanceRequest checkInstanceRequest = new CheckInstanceRequest();
+ checkInstanceRequest.setInstances(asList(getRandomInstance(), getRandomInstance(), getRandomInstance()));
return checkInstanceRequest;
}
- private InstanceRequest getRandomInstance(){
- InstanceRequest instanceRequest=new InstanceRequest();
+ private InstanceRequest getRandomInstance() {
+ InstanceRequest instanceRequest = new InstanceRequest();
instanceRequest.setInstanceId(UUID.randomUUID().toString());
return instanceRequest;
}
- private K8sRbInstanceHealthCheckSimple getK8sRbInstanceHealthCheckSimple(){
- K8sRbInstanceHealthCheckSimple k8sRbInstanceHealthCheckSimple=new K8sRbInstanceHealthCheckSimple();
+ private K8sRbInstanceHealthCheckSimple getK8sRbInstanceHealthCheckSimple() {
+ K8sRbInstanceHealthCheckSimple k8sRbInstanceHealthCheckSimple = new K8sRbInstanceHealthCheckSimple();
k8sRbInstanceHealthCheckSimple.setId(UUID.randomUUID().toString());
k8sRbInstanceHealthCheckSimple.setStatus("RUNNING");
return k8sRbInstanceHealthCheckSimple;
}
- private K8sRbInstanceHealthCheck getK8sRbInstanceHealthCheck(){
- K8sRbInstanceHealthCheck k8sRbInstanceHealthCheck=new K8sRbInstanceHealthCheck();
+ private K8sRbInstanceHealthCheck getK8sRbInstanceHealthCheck() {
+ K8sRbInstanceHealthCheck k8sRbInstanceHealthCheck = new K8sRbInstanceHealthCheck();
k8sRbInstanceHealthCheck.setStatus("STOPPED");
return k8sRbInstanceHealthCheck;
}
-}
\ No newline at end of file
+}
--- /dev/null
+aai.enabled=true
+aai.endpoint=http://localhost:8443
+aai.auth=5E12ACACBD552A415E081E29F2C4772F9835792A51C766CCFDD7433DB5220B59969CB2798C
+mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
\ No newline at end of file
Code Review / so / adapters / so-cnf-adapter.git / commitdiff