Package name modified.
Issue-ID: NONRTRIC-872
Change-Id: Ie50c74e1a4b82dcaeac536a3904a471b613aedbf
Signed-off-by: aravind.est <aravindhan.a@est.tech>
* O-RAN-SC
* %%
* Copyright (C) 2023 Nordix Foundation
-* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+* Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
<configOptions>
<sourceFolder>src/main/java</sourceFolder>
<useJakartaEe>true</useJakartaEe>
- <invokerPackage>com.oransc.rappmanager.acm</invokerPackage>
- <apiPackage>com.oransc.rappmanager.acm.rest</apiPackage>
- <modelPackage>com.oransc.rappmanager.acm.data</modelPackage>
+ <invokerPackage>org.oransc.rappmanager.acm</invokerPackage>
+ <apiPackage>org.oransc.rappmanager.acm.rest</apiPackage>
+ <modelPackage>org.oransc.rappmanager.acm.data</modelPackage>
<generateClientAsBean>false</generateClientAsBean>
</configOptions>
</configuration>
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.acm.configuration;
+package org.oransc.rappmanager.acm.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.acm.configuration;
+package org.oransc.rappmanager.acm.configuration;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializer;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.acm.service;
+package org.oransc.rappmanager.acm.service;
import com.google.gson.Gson;
-import com.oransc.rappmanager.acm.configuration.ACMConfiguration;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
-import com.oransc.rappmanager.dme.service.DmeAcmInterceptor;
-import com.oransc.rappmanager.models.RappDeployer;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder;
import org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.oransc.rappmanager.acm.configuration.ACMConfiguration;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
+import org.oransc.rappmanager.dme.service.DmeAcmInterceptor;
+import org.oransc.rappmanager.models.RappDeployer;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappACMInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@Override
public boolean deployRappInstance(Rapp rapp, RappInstance rappInstance) {
try {
- String instantiationPayload = rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance,
- rapp.getCompositionId());
+ String instantiationPayload =
+ rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance, rapp.getCompositionId());
AutomationComposition automationComposition =
gson.fromJson(instantiationPayload, AutomationComposition.class);
if (rappInstance.isDMEEnabled()) {
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.acm.service;
+package org.oransc.rappmanager.acm.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.acm.configuration.ACMConfiguration;
-import com.oransc.rappmanager.dme.service.DmeAcmInterceptor;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rapp.RappResourceBuilder;
-import com.oransc.rappmanager.models.rapp.RappResources;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
import java.io.IOException;
import java.util.UUID;
import java.util.stream.Stream;
import org.onap.policy.clamp.models.acm.messages.rest.commissioning.PrimeOrder;
import org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.oransc.rappmanager.acm.configuration.ACMConfiguration;
+import org.oransc.rappmanager.dme.service.DmeAcmInterceptor;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rapp.RappResourceBuilder;
+import org.oransc.rappmanager.models.rapp.RappResources;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.acm.service;
+package org.oransc.rappmanager.acm.service;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
-import com.oransc.rappmanager.acm.ApiClient;
-import com.oransc.rappmanager.acm.configuration.ACMConfiguration;
-import com.oransc.rappmanager.acm.configuration.JacksonMessageConverterConfiguration;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
-import com.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.acm.ApiClient;
+import org.oransc.rappmanager.acm.configuration.ACMConfiguration;
+import org.oransc.rappmanager.acm.configuration.JacksonMessageConverterConfiguration;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
+import org.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.web.client.RestTemplateBuilder;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
-import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
-import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.Set;
+import org.oransc.rappmanager.models.rappinstance.RappACMInstance;
+import org.oransc.rappmanager.models.rappinstance.RappDMEInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
public class RappResourceBuilder {
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager;
-
-import com.oransc.rappmanager.acm.ApiClient;
-import com.oransc.rappmanager.acm.configuration.ACMConfiguration;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
-import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
-import com.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient;
-import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
-import com.oransc.rappmanager.dme.rest.DataConsumerApiClient;
-import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
-import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
-import com.oransc.rappmanager.sme.provider.rest.DefaultApiClient;
+package org.oransc.rappmanager;
+
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.acm.ApiClient;
+import org.oransc.rappmanager.acm.configuration.ACMConfiguration;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient;
+import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient;
+import org.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient;
+import org.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import org.oransc.rappmanager.dme.rest.DataConsumerApiClient;
+import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
+import org.oransc.rappmanager.sme.configuration.SmeConfiguration;
+import org.oransc.rappmanager.sme.provider.rest.DefaultApiClient;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cache.CacheManager;
}
@Bean("smeProviderApiClient")
- public com.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.provider.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.provider.ApiClient(restTemplate);
}
@Bean("smePublishServiceApiClient")
- public com.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate);
}
@Bean("smeInvokerApiClient")
- public com.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.invoker.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.invoker.ApiClient(restTemplate);
}
@Bean
@Bean
public DefaultApiClient defaultProviderApiClient(
- @Qualifier("smeProviderApiClient") com.oransc.rappmanager.sme.provider.ApiClient apiClient) {
+ @Qualifier("smeProviderApiClient") org.oransc.rappmanager.sme.provider.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath());
return new DefaultApiClient(apiClient);
}
@Bean
- public com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient(
- @Qualifier("smePublishServiceApiClient") com.oransc.rappmanager.sme.publishservice.ApiClient apiClient) {
+ public org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient(
+ @Qualifier("smePublishServiceApiClient") org.oransc.rappmanager.sme.publishservice.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath());
- return new com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient);
+ return new org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient);
}
@Bean
- public com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient(
- @Qualifier("smeInvokerApiClient") com.oransc.rappmanager.sme.invoker.ApiClient apiClient) {
+ public org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient(
+ @Qualifier("smeInvokerApiClient") org.oransc.rappmanager.sme.invoker.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath());
- return new com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient);
+ return new org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient);
}
@Bean
- public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
- com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate);
+ public org.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
+ org.oransc.rappmanager.dme.ApiClient apiClient = new org.oransc.rappmanager.dme.ApiClient(restTemplate);
return apiClient.setBasePath(dmeConfiguration.getBaseUrl());
}
@Bean
public DataProducerRegistrationApiClient dataProducerRegistrationApiClient(
- com.oransc.rappmanager.dme.ApiClient apiClient) {
+ org.oransc.rappmanager.dme.ApiClient apiClient) {
return new DataProducerRegistrationApiClient(apiClient);
}
@Bean
- public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) {
+ public DataConsumerApiClient dataConsumerApiClient(org.oransc.rappmanager.dme.ApiClient apiClient) {
return new DataConsumerApiClient(apiClient);
}
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager;
+package org.oransc.rappmanager;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.configuration;
+package org.oransc.rappmanager.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
/*-
* ============LICENSE_START======================================================================
- * Copyright (C) 2023-2024 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.rest;
+package org.oransc.rappmanager.rest;
-import com.oransc.rappmanager.configuration.RappManagerConfiguration;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.csar.validator.RappValidationHandler;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.rapp.PrimeOrder;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappPrimeOrder;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.service.RappService;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Collection;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.configuration.RappManagerConfiguration;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.csar.validator.RappValidationHandler;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.rapp.PrimeOrder;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappPrimeOrder;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.service.RappService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.rest;
+package org.oransc.rappmanager.rest;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.DeployOrder;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.service.RappService;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.tuple.Pair;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.DeployOrder;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.service.RappService;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
*
*/
-package com.oransc.rappmanager.service;
+package org.oransc.rappmanager.service;
-import com.oransc.rappmanager.models.csar.DeploymentItem;
-import com.oransc.rappmanager.models.csar.DeploymentItemArtifactType;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.rapp.Rapp;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.models.csar.DeploymentItem;
+import org.oransc.rappmanager.models.csar.DeploymentItemArtifactType;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.rapp.Rapp;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.service;
+package org.oransc.rappmanager.service;
-import com.oransc.rappmanager.acm.service.AcmDeployer;
-import com.oransc.rappmanager.models.RappDeployer;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.exception.RappValidationException;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
import java.util.List;
import java.util.UUID;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.acm.service.AcmDeployer;
+import org.oransc.rappmanager.models.RappDeployer;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.rest;
+package org.oransc.rappmanager.rest;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.ArgumentMatchers.any;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.acm.service.AcmDeployer;
-import com.oransc.rappmanager.dme.service.DmeDeployer;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.csar.AsdMetadata;
-import com.oransc.rappmanager.models.rapp.PrimeOrder;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappPrimeOrder;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
import java.io.File;
import java.io.FileInputStream;
import java.util.List;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.ValueSource;
+import org.oransc.rappmanager.acm.service.AcmDeployer;
+import org.oransc.rappmanager.dme.service.DmeDeployer;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.csar.AsdMetadata;
+import org.oransc.rappmanager.models.rapp.PrimeOrder;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappPrimeOrder;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.rest;
+package org.oransc.rappmanager.rest;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.acm.service.AcmDeployer;
-import com.oransc.rappmanager.dme.service.DmeDeployer;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.DeployOrder;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.sme.service.SmeDeployer;
-import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.acm.service.AcmDeployer;
+import org.oransc.rappmanager.dme.service.DmeDeployer;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.DeployOrder;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.sme.service.SmeDeployer;
+import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
Map<UUID, RappInstance> instances = new HashMap();
instances.put(rappInstanceId, rappInstance);
return Rapp.builder().rappId(rappId).name(String.valueOf(rappId)).packageName(validRappFile)
- .packageLocation(validCsarFileLocation).state(RappState.PRIMED).rappInstances(instances)
- .build();
+ .packageLocation(validCsarFileLocation).state(RappState.PRIMED).rappInstances(instances).build();
}
}
*
*/
-package com.oransc.rappmanager.service;
+package org.oransc.rappmanager.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
import static org.springframework.test.web.client.response.MockRestResponseCreators.withTooManyRequests;
-import com.oransc.rappmanager.models.csar.DeploymentItem;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
+import org.oransc.rappmanager.models.csar.DeploymentItem;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
@EnumSource(value = HttpStatus.class, names = {"CREATED", "CONFLICT"})
void testChartUpload(HttpStatus status) {
Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile)
- .packageLocation(validCsarFileLocation)
- .state(RappState.COMMISSIONED).build();
+ .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build();
rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp));
List<DeploymentItem> deploymentItems = rapp.getAsdMetadata().getDeploymentItems();
deploymentItems.forEach(deploymentItem -> mockServer.expect(ExpectedCount.once(),
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.service;
+package org.oransc.rappmanager.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;
-import com.oransc.rappmanager.acm.service.AcmDeployer;
-import com.oransc.rappmanager.dme.service.DmeDeployer;
-import com.oransc.rappmanager.models.exception.RappHandlerException;
-import com.oransc.rappmanager.models.exception.RappValidationException;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.sme.service.SmeDeployer;
-import com.oransc.rappmanager.sme.service.SmeLifecycleManager;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.acm.service.AcmDeployer;
+import org.oransc.rappmanager.dme.service.DmeDeployer;
+import org.oransc.rappmanager.models.exception.RappHandlerException;
+import org.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.sme.service.SmeDeployer;
+import org.oransc.rappmanager.sme.service.SmeLifecycleManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
* O-RAN-SC
* %%
* Copyright (C) 2023 Nordix Foundation
+* Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
<configOptions>
<sourceFolder>src/main/java</sourceFolder>
<useJakartaEe>true</useJakartaEe>
- <invokerPackage>com.oransc.rappmanager.dme</invokerPackage>
- <apiPackage>com.oransc.rappmanager.dme.rest</apiPackage>
- <modelPackage>com.oransc.rappmanager.dme.data</modelPackage>
+ <invokerPackage>org.oransc.rappmanager.dme</invokerPackage>
+ <apiPackage>org.oransc.rappmanager.dme.rest</apiPackage>
+ <modelPackage>org.oransc.rappmanager.dme.data</modelPackage>
<generateClientAsBean>false</generateClientAsBean>
</configOptions>
</configuration>
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.configuration;
+package org.oransc.rappmanager.dme.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "rappmanager.dme")
@Data
public class DmeConfiguration {
+
String baseUrl;
}
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.models;
+package org.oransc.rappmanager.dme.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.validation.constraints.NotNull;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.models;
+package org.oransc.rappmanager.dme.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.validation.constraints.NotNull;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.models;
+package org.oransc.rappmanager.dme.models;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.validation.constraints.NotNull;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.service;
+package org.oransc.rappmanager.dme.service;
import com.google.gson.JsonParser;
-import com.oransc.rappmanager.dme.models.DataConsumerEntity;
-import com.oransc.rappmanager.dme.models.DataProducerEntity;
-import com.oransc.rappmanager.dme.models.InfoTypeEntity;
-import com.oransc.rappmanager.models.AcmInterceptor;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty;
import org.onap.policy.models.tosca.authorative.concepts.ToscaSchemaDefinition;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
+import org.oransc.rappmanager.dme.models.DataConsumerEntity;
+import org.oransc.rappmanager.dme.models.DataProducerEntity;
+import org.oransc.rappmanager.dme.models.InfoTypeEntity;
+import org.oransc.rappmanager.models.AcmInterceptor;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
import org.springframework.stereotype.Service;
@Service
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.service;
+package org.oransc.rappmanager.dme.service;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.dme.data.ConsumerJob;
-import com.oransc.rappmanager.dme.data.ProducerRegistrationInfo;
-import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
-import com.oransc.rappmanager.models.RappDeployer;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.HashSet;
import java.util.Set;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.dme.data.ConsumerJob;
+import org.oransc.rappmanager.dme.data.ProducerRegistrationInfo;
+import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
+import org.oransc.rappmanager.models.RappDeployer;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.service;
+package org.oransc.rappmanager.dme.service;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
-import com.oransc.rappmanager.dme.rest.DataConsumerApiClient;
-import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import org.oransc.rappmanager.dme.rest.DataConsumerApiClient;
+import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.cache.CacheManager;
}
@Bean
- public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
- com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate);
+ public org.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) {
+ org.oransc.rappmanager.dme.ApiClient apiClient = new org.oransc.rappmanager.dme.ApiClient(restTemplate);
return apiClient.setBasePath(dmeConfiguration.getBaseUrl());
}
@Bean
public DataProducerRegistrationApiClient dataProducerRegistrationApiClient(
- com.oransc.rappmanager.dme.ApiClient apiClient) {
+ org.oransc.rappmanager.dme.ApiClient apiClient) {
return new DataProducerRegistrationApiClient(apiClient);
}
@Bean
- public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) {
+ public DataConsumerApiClient dataConsumerApiClient(org.oransc.rappmanager.dme.ApiClient apiClient) {
return new DataConsumerApiClient(apiClient);
}
}
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.service;
+package org.oransc.rappmanager.dme.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.dme.service;
+package org.oransc.rappmanager.dme.service;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.dme.configuration.DmeConfiguration;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
-import com.oransc.rappmanager.models.rapp.RappResources;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.ValueSource;
+import org.oransc.rappmanager.dme.configuration.DmeConfiguration;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappDmeResourceBuilder;
+import org.oransc.rappmanager.models.rapp.RappResources;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
-import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.Set;
+import org.oransc.rappmanager.models.rappinstance.RappDMEInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
public class RappDmeResourceBuilder {
* O-RAN-SC
* %%
* Copyright (C) 2023 Nordix Foundation
-* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+* Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
/*-
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models;
+package org.oransc.rappmanager.models;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.Map;
import java.util.UUID;
import org.onap.policy.clamp.models.acm.concepts.AutomationComposition;
/*-
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 Nordix Foundation. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models;
+package org.oransc.rappmanager.models;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
public interface RappDeployer {
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.cache;
+package org.oransc.rappmanager.models.cache;
-import com.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.Rapp;
import java.util.Collection;
import java.util.List;
import java.util.Map;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.configuration;
+package org.oransc.rappmanager.models.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
* ============LICENSE_END========================================================================
*
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
*
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import com.fasterxml.jackson.annotation.JsonProperty;
*
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import com.fasterxml.jackson.annotation.JsonProperty;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import static com.google.common.base.Splitter.on;
import static com.google.common.collect.Iterables.filter;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappResources;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappResources;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappSMEInstance;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
*
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import lombok.experimental.UtilityClass;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import com.fasterxml.jackson.databind.JsonNode;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.csar.RappCsarPathProvider;
-import com.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.csar.RappCsarPathProvider;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import com.fasterxml.jackson.databind.JsonNode;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.csar.RappCsarPathProvider;
-import com.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.csar.RappCsarPathProvider;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
* ============LICENSE_END========================================================================
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
-import com.oransc.rappmanager.models.csar.RappCsarPathProvider;
+import org.oransc.rappmanager.models.csar.RappCsarPathProvider;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
-import com.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.web.multipart.MultipartFile;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import java.util.Comparator;
import java.util.List;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.csar.RappCsarPathProvider;
-import com.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.csar.RappCsarPathProvider;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import lombok.RequiredArgsConstructor;
* ============LICENSE_END========================================================================
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import org.springframework.validation.Validator;
import org.springframework.web.multipart.MultipartFile;
/*
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.exception;
+package org.oransc.rappmanager.models.exception;
import lombok.Value;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.exception;
+package org.oransc.rappmanager.models.exception;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ExceptionHandler;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.exception;
+package org.oransc.rappmanager.models.exception;
import lombok.Getter;
import org.springframework.http.HttpStatusCode;
*
*/
-package com.oransc.rappmanager.models.exception;
+package org.oransc.rappmanager.models.exception;
import lombok.Getter;
import org.springframework.http.HttpStatus;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
public enum PrimeOrder {
PRIME, DEPRIME;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
-import com.oransc.rappmanager.models.csar.AsdMetadata;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.beans.Transient;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
import lombok.Builder;
import lombok.Data;
+import org.oransc.rappmanager.models.csar.AsdMetadata;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
@Data
@Builder(toBuilder = true)
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
public enum RappEvent {
DEPLOYING,
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
import lombok.Data;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
import java.util.Set;
import lombok.Builder;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rapp;
+package org.oransc.rappmanager.models.rapp;
public enum RappState {
COMMISSIONED, PRIMING, PRIMED, DEPRIMING,
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
public enum DeployOrder {
DEPLOY, UNDEPLOY;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
import java.util.UUID;
import lombok.Data;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
import java.util.Set;
import lombok.Data;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
import java.util.UUID;
import java.util.stream.Stream;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
import lombok.Data;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
public enum RappInstanceState {
DEPLOYED, DEPLOYING, UNDEPLOYED, UNDEPLOYING;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.rappinstance;
+package org.oransc.rappmanager.models.rappinstance;
import java.util.List;
import lombok.Data;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.statemachine;
+package org.oransc.rappmanager.models.statemachine;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.statemachine;
+package org.oransc.rappmanager.models.statemachine;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
import java.util.EnumSet;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/*-
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models;
+package org.oransc.rappmanager.models;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
class AcmInterceptorTest implements AcmInterceptor {
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models;
+package org.oransc.rappmanager.models;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.cache.CacheManager;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models;
+package org.oransc.rappmanager.models;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappResources;
-import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
-import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
import java.util.Set;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappResources;
+import org.oransc.rappmanager.models.rappinstance.RappACMInstance;
+import org.oransc.rappmanager.models.rappinstance.RappDMEInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappSMEInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ContextConfiguration;
/*
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.cache;
+package org.oransc.rappmanager.models.cache;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import com.oransc.rappmanager.models.BeanTestConfiguration;
-import com.oransc.rappmanager.models.rapp.Rapp;
import java.util.UUID;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.models.BeanTestConfiguration;
+import org.oransc.rappmanager.models.rapp.Rapp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.csar;
+package org.oransc.rappmanager.models.csar;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonSyntaxException;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappResources;
-import com.oransc.rappmanager.models.rappinstance.RappACMInstance;
-import com.oransc.rappmanager.models.rappinstance.RappDMEInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappResources;
+import org.oransc.rappmanager.models.rappinstance.RappACMInstance;
+import org.oransc.rappmanager.models.rappinstance.RappDMEInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappSMEInstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.doCallRealMethod;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappValidationException;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullSource;
import org.junit.jupiter.params.provider.ValueSource;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.SpyBean;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.doReturn;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.BeanTestConfiguration;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.AsdMetadata;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappValidationException;
-import com.oransc.rappmanager.models.rapp.Rapp;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullSource;
import org.junit.jupiter.params.provider.ValueSource;
+import org.oransc.rappmanager.models.BeanTestConfiguration;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.AsdMetadata;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappValidationException;
+import org.oransc.rappmanager.models.rapp.Rapp;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.SpyBean;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappValidationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import org.apache.http.entity.ContentType;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import com.oransc.rappmanager.models.exception.RappValidationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import org.apache.http.entity.ContentType;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.BeanTestConfiguration;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.exception.RappValidationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.oransc.rappmanager.models.BeanTestConfiguration;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
*
*/
-package com.oransc.rappmanager.models.csar.validator;
+package org.oransc.rappmanager.models.csar.validator;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.csar.RappCsarPathProvider;
-import com.oransc.rappmanager.models.exception.RappValidationException;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import org.apache.http.entity.ContentType;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.csar.RappCsarPathProvider;
+import org.oransc.rappmanager.models.exception.RappValidationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.statemachine;
+package org.oransc.rappmanager.models.statemachine;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
import java.util.UUID;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.statemachine.StateMachine;
/*
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.models.statemachine;
+package org.oransc.rappmanager.models.statemachine;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappInstanceState;
import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappInstanceState;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
<configOptions>
<sourceFolder>src/main/java</sourceFolder>
<useJakartaEe>true</useJakartaEe>
- <invokerPackage>com.oransc.rappmanager.sme.provider</invokerPackage>
- <apiPackage>com.oransc.rappmanager.sme.provider.rest</apiPackage>
- <modelPackage>com.oransc.rappmanager.sme.provider.data</modelPackage>
+ <invokerPackage>org.oransc.rappmanager.sme.provider</invokerPackage>
+ <apiPackage>org.oransc.rappmanager.sme.provider.rest</apiPackage>
+ <modelPackage>org.oransc.rappmanager.sme.provider.data</modelPackage>
<generateClientAsBean>false</generateClientAsBean>
</configOptions>
</configuration>
<configOptions>
<sourceFolder>src/main/java</sourceFolder>
<useJakartaEe>true</useJakartaEe>
- <invokerPackage>com.oransc.rappmanager.sme.publishservice</invokerPackage>
- <apiPackage>com.oransc.rappmanager.sme.publishservice.rest</apiPackage>
- <modelPackage>com.oransc.rappmanager.sme.publishservice.data</modelPackage>
+ <invokerPackage>org.oransc.rappmanager.sme.publishservice</invokerPackage>
+ <apiPackage>org.oransc.rappmanager.sme.publishservice.rest</apiPackage>
+ <modelPackage>org.oransc.rappmanager.sme.publishservice.data</modelPackage>
<generateClientAsBean>false</generateClientAsBean>
</configOptions>
</configuration>
<configOptions>
<sourceFolder>src/main/java</sourceFolder>
<useJakartaEe>true</useJakartaEe>
- <invokerPackage>com.oransc.rappmanager.sme.invoker</invokerPackage>
- <apiPackage>com.oransc.rappmanager.sme.invoker.rest</apiPackage>
- <modelPackage>com.oransc.rappmanager.sme.invoker.data</modelPackage>
+ <invokerPackage>org.oransc.rappmanager.sme.invoker</invokerPackage>
+ <apiPackage>org.oransc.rappmanager.sme.invoker.rest</apiPackage>
+ <modelPackage>org.oransc.rappmanager.sme.invoker.data</modelPackage>
<generateClientAsBean>false</generateClientAsBean>
</configOptions>
</configuration>
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.configuration;
+package org.oransc.rappmanager.sme.configuration;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.service;
+package org.oransc.rappmanager.sme.service;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.RappDeployer;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappEvent;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails;
-import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
-import com.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails;
-import com.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole;
-import com.oransc.rappmanager.sme.provider.data.RegistrationInformation;
-import com.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription;
import java.util.List;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.models.RappDeployer;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappEvent;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails;
+import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
+import org.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails;
+import org.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole;
+import org.oransc.rappmanager.sme.provider.data.RegistrationInformation;
+import org.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
Logger logger = LoggerFactory.getLogger(SmeDeployer.class);
- private final com.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient;
+ private final org.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient;
- private final com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient;
+ private final org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient;
- private final com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient;
+ private final org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient;
private final RappCsarConfigurationHandler rappCsarConfigurationHandler;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.service;
+package org.oransc.rappmanager.sme.service;
-import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.SmartLifecycle;
/*
* ============LICENSE_START======================================================================
- * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.service;
+package org.oransc.rappmanager.sme.service;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
-import com.oransc.rappmanager.sme.provider.rest.DefaultApiClient;
import lombok.RequiredArgsConstructor;
+import org.oransc.rappmanager.sme.configuration.SmeConfiguration;
+import org.oransc.rappmanager.sme.provider.rest.DefaultApiClient;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.web.client.RestTemplateBuilder;
}
@Bean("smeProviderApiClient")
- public com.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.provider.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.provider.ApiClient(restTemplate);
}
@Bean("smePublishServiceApiClient")
- public com.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate);
}
@Bean("smeInvokerApiClient")
- public com.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) {
- return new com.oransc.rappmanager.sme.invoker.ApiClient(restTemplate);
+ public org.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) {
+ return new org.oransc.rappmanager.sme.invoker.ApiClient(restTemplate);
}
@Bean
public DefaultApiClient defaultProviderApiClient(
- @Qualifier("smeProviderApiClient") com.oransc.rappmanager.sme.provider.ApiClient apiClient) {
+ @Qualifier("smeProviderApiClient") org.oransc.rappmanager.sme.provider.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath());
return new DefaultApiClient(apiClient);
}
@Bean
- public com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient(
- @Qualifier("smePublishServiceApiClient") com.oransc.rappmanager.sme.publishservice.ApiClient apiClient) {
+ public org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient(
+ @Qualifier("smePublishServiceApiClient") org.oransc.rappmanager.sme.publishservice.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath());
- return new com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient);
+ return new org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient);
}
@Bean
- public com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient(
- @Qualifier("smeInvokerApiClient") com.oransc.rappmanager.sme.invoker.ApiClient apiClient) {
+ public org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient(
+ @Qualifier("smeInvokerApiClient") org.oransc.rappmanager.sme.invoker.ApiClient apiClient) {
apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath());
- return new com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient);
+ return new org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient);
}
}
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.service;
+package org.oransc.rappmanager.sme.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.oransc.rappmanager.models.cache.RappCacheService;
-import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
-import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
-import com.oransc.rappmanager.models.rapp.Rapp;
-import com.oransc.rappmanager.models.rapp.RappState;
-import com.oransc.rappmanager.models.rappinstance.RappInstance;
-import com.oransc.rappmanager.models.rappinstance.RappSMEInstance;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
-import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
-import com.oransc.rappmanager.sme.configuration.SmeConfiguration;
-import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails;
-import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
-import com.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails;
-import com.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole;
-import com.oransc.rappmanager.sme.publishservice.data.AefProfile;
-import com.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.oransc.rappmanager.models.cache.RappCacheService;
+import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration;
+import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler;
+import org.oransc.rappmanager.models.rapp.Rapp;
+import org.oransc.rappmanager.models.rapp.RappState;
+import org.oransc.rappmanager.models.rappinstance.RappInstance;
+import org.oransc.rappmanager.models.rappinstance.RappSMEInstance;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine;
+import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig;
+import org.oransc.rappmanager.sme.configuration.SmeConfiguration;
+import org.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails;
+import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
+import org.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails;
+import org.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole;
+import org.oransc.rappmanager.sme.publishservice.data.AefProfile;
+import org.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
@Autowired
ObjectMapper objectMapper;
private final String validRappFile = "valid-rapp-package.csar";
- String uriProviderRegistrations, uriProviderRegistration, uriPublishApis, uriPublishApi, uriInvokers,
- uriInvoker;
+ String uriProviderRegistrations, uriProviderRegistration, uriPublishApis, uriPublishApi, uriInvokers, uriInvoker;
@BeforeAll
void initSmeUri() {
uriProviderRegistration =
smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath() + "registrations/%s";
uriPublishApis = smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis";
- uriPublishApi =
- smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis/%s";
+ uriPublishApi = smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis/%s";
uriInvokers = smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath() + "onboardedInvokers";
uriInvoker = smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath() + "onboardedInvokers/%s";
}
void testCreateAMF() throws JsonProcessingException {
String apiProvDomId = UUID.randomUUID().toString();
APIProviderEnrolmentDetails apiProviderEnrolmentDetails = new APIProviderEnrolmentDetails(apiProvDomId);
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
APIProviderEnrolmentDetails apiProviderEnrolmentResponse = smeDeployer.createAMF();
mockServer.verify();
assertEquals(apiProvDomId, apiProviderEnrolmentResponse.getApiProvDomId());
@Test
void testCreateAMFFailure() {
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
APIProviderEnrolmentDetails apiProviderEnrolmentResponse = smeDeployer.createAMF();
mockServer.verify();
assertNull(apiProviderEnrolmentResponse);
void testDeleteAMF() throws JsonProcessingException {
String apiProvDomId = UUID.randomUUID().toString();
APIProviderEnrolmentDetails apiProviderEnrolmentDetails = new APIProviderEnrolmentDetails(apiProvDomId);
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
mockServer.expect(ExpectedCount.once(), requestTo(String.format(uriProviderRegistration, apiProvDomId)))
.andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT));
smeDeployer.createAMF();
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.state(RappState.COMMISSIONED).build();
APIProviderEnrolmentDetails apiProviderEnrolmentDetails = getProviderDomainApiEnrollmentDetails();
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
RappInstance rappInstance = getRappInstance();
boolean createProviderDomain = smeDeployer.createProviderDomain(rapp, rappInstance);
mockServer.verify();
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.state(RappState.COMMISSIONED).build();
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR));
RappInstance rappInstance = getRappInstance();
boolean createProviderDomain = smeDeployer.createProviderDomain(rapp, rappInstance);
mockServer.verify();
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.state(RappState.COMMISSIONED).build();
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
ServiceAPIDescription serviceAPIDescription = getServiceApiDescription();
mockServer.expect(ExpectedCount.once(),
requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId())))
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.state(RappState.COMMISSIONED).build();
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
ServiceAPIDescription serviceAPIDescription = getServiceApiDescription();
mockServer.expect(ExpectedCount.once(),
requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId())))
Rapp rapp =
Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation)
.state(RappState.COMMISSIONED).build();
- mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations))
- .andExpect(method(HttpMethod.POST)).andRespond(
- withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
- .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
+ mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST))
+ .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON)
+ .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails)));
ServiceAPIDescription serviceAPIDescription = getServiceApiDescription();
mockServer.expect(ExpectedCount.once(),
requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId())))
APIInvokerEnrolmentDetails getApiInvokerEnrollmentDetails() {
APIInvokerEnrolmentDetails apiInvokerEnrolmentDetails =
new APIInvokerEnrolmentDetails(String.valueOf(UUID.randomUUID()));
- com.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription serviceAPIDescription =
- new com.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription();
+ org.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription serviceAPIDescription =
+ new org.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription();
serviceAPIDescription.setApiId(String.valueOf(UUID.randomUUID()));
apiInvokerEnrolmentDetails.setApiList(List.of(serviceAPIDescription));
return apiInvokerEnrolmentDetails;
/*-
* ============LICENSE_START======================================================================
* Copyright (C) 2023 Nordix Foundation. All rights reserved.
+ * Copyright (C) 2023-2024 OpenInfra Foundation Europe. 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.
* ============LICENSE_END========================================================================
*/
-package com.oransc.rappmanager.sme.service;
+package org.oransc.rappmanager.sme.service;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
import org.junit.jupiter.api.Test;
+import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;