diff options
Diffstat (limited to 'a1-policy-management/src/main/java/org')
6 files changed, 125 insertions, 53 deletions
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ConfigurationFile.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ConfigurationFile.java new file mode 100644 index 00000000..345722cb --- /dev/null +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/configuration/ConfigurationFile.java @@ -0,0 +1,93 @@ +/*- + * ========================LICENSE_START================================= + * Copyright (C) 2020 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================LICENSE_END=================================== + */ + +package org.onap.ccsdk.oran.a1policymanagementservice.configuration; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Optional; +import javax.validation.constraints.NotNull; +import org.onap.ccsdk.oran.a1policymanagementservice.exceptions.ServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ConfigurationFile { + private static final Logger logger = LoggerFactory.getLogger(ConfigurationFile.class); + + final ApplicationConfig appConfig; + final Gson gson = new Gson(); + + @Autowired + public ConfigurationFile(ApplicationConfig appConfig) { + this.appConfig = appConfig; + } + + public synchronized Optional<JsonObject> readFile() { + String filepath = appConfig.getLocalConfigurationFilePath(); + if (!fileExists(filepath)) { + return Optional.empty(); + } + + try (InputStream inputStream = createInputStream(filepath)) { + JsonObject rootObject = getJsonElement(inputStream).getAsJsonObject(); + logger.debug("Local configuration file loaded: {}", filepath); + return Optional.of(rootObject); + } catch (Exception e) { + logger.error("Local configuration file not loaded: {}, {}", filepath, e.getMessage()); + return Optional.empty(); + } + } + + public synchronized void writeFile(JsonObject content) throws ServiceException { + String filepath = appConfig.getLocalConfigurationFilePath(); + try (FileWriter fileWriter = getFileWriter(filepath)) { + gson.toJson(content, fileWriter); + } catch (IOException e) { + logger.error("Local configuration file not written: {}, {}", filepath, e.getMessage()); + throw new ServiceException("Local configuration file not written"); + } + } + + FileWriter getFileWriter(String filepath) throws IOException { + return new FileWriter(filepath); + } + + private boolean fileExists(String filepath) { + return (new File(filepath).exists()); + } + + private JsonElement getJsonElement(InputStream inputStream) { + return JsonParser.parseReader(new InputStreamReader(inputStream)); + } + + private InputStream createInputStream(@NotNull String filepath) throws IOException { + return new BufferedInputStream(new FileInputStream(filepath)); + } +} diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java index ec776042..ea047cb5 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyController.java @@ -262,12 +262,6 @@ public class PolicyController { return Mono.just("{}"); } - private void assertRicStateIdleSync(Ric ric) throws ServiceException { - if (ric.getState() != Ric.RicState.AVAILABLE) { - throw new ServiceException("Near-RT RIC: " + ric.id() + " is " + ric.getState()); - } - } - private Mono<Object> assertRicStateIdle(Ric ric) { if (ric.getState() == Ric.RicState.AVAILABLE) { return Mono.just("{}"); @@ -408,6 +402,7 @@ public class PolicyController { policyInfo.ricId = p.ric().id(); policyInfo.policyTypeId = p.type().id(); policyInfo.serviceId = p.ownerServiceId(); + policyInfo.isTransient = p.isTransient(); if (!p.statusNotificationUri().isEmpty()) { policyInfo.statusNotificationUri = p.statusNotificationUri(); } diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java index c032e3ad..43684a33 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/PolicyInfo.java @@ -57,10 +57,12 @@ public class PolicyInfo { @SerializedName("service_id") public String serviceId; - @ApiModelProperty(value = "the name of the service owning the policy", required = false) - @JsonProperty(value = "transient", required = false) + @ApiModelProperty( + value = "if true, the policy is deleted at RIC restart. If false, its value is maintained by this service until explicitly deleted. Default false.", + required = false) + @JsonProperty(value = "transient", required = false, defaultValue = "false") @SerializedName("transient") - public boolean isTransient; + public boolean isTransient = false; @ApiModelProperty(value = "Callback URI for policy status updates", required = false) @JsonProperty(value = "status_notification_uri", required = false) diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java index e4d7d8d7..75fd16cf 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java @@ -20,21 +20,12 @@ package org.onap.ccsdk.oran.a1policymanagementservice.tasks; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.time.Duration; +import java.util.Optional; import java.util.Properties; -import javax.validation.constraints.NotNull; - import lombok.AccessLevel; import lombok.Getter; @@ -43,6 +34,7 @@ import org.onap.ccsdk.oran.a1policymanagementservice.clients.AsyncRestClientFact import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfig; import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfig.RicConfigUpdate; import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ApplicationConfigParser; +import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ConfigurationFile; import org.onap.ccsdk.oran.a1policymanagementservice.configuration.RicConfig; import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policies; import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes; @@ -83,6 +75,7 @@ public class RefreshConfigTask { */ static final Duration CONFIG_REFRESH_INTERVAL = Duration.ofMinutes(1); + final ConfigurationFile configurationFile; final ApplicationConfig appConfig; @Getter(AccessLevel.PROTECTED) private Disposable refreshTask = null; @@ -96,8 +89,9 @@ public class RefreshConfigTask { private final AsyncRestClientFactory restClientFactory; @Autowired - public RefreshConfigTask(ApplicationConfig appConfig, Rics rics, Policies policies, Services services, - PolicyTypes policyTypes, A1ClientFactory a1ClientFactory) { + public RefreshConfigTask(ConfigurationFile configurationFile, ApplicationConfig appConfig, Rics rics, + Policies policies, Services services, PolicyTypes policyTypes, A1ClientFactory a1ClientFactory) { + this.configurationFile = configurationFile; this.appConfig = appConfig; this.rics = rics; this.policies = policies; @@ -195,14 +189,10 @@ public class RefreshConfigTask { return this.appConfig.setConfiguration(config); } - boolean fileExists(String filepath) { - return (filepath != null && (new File(filepath).exists())); - } - private void removePoliciciesInRic(@Nullable Ric ric) { if (ric != null) { - RicSynchronizationTask synch = - new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory); + RicSynchronizationTask synch = new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, + restClientFactory, rics); synch.run(ric); } } @@ -212,15 +202,18 @@ public class RefreshConfigTask { String ricId = updatedInfo.getRicConfig().ricId(); RicConfigUpdate.Type event = updatedInfo.getType(); if (event == RicConfigUpdate.Type.ADDED) { + logger.debug("RIC added {}", ricId); addRic(updatedInfo.getRicConfig()); } else if (event == RicConfigUpdate.Type.REMOVED) { + logger.debug("RIC removed {}", ricId); Ric ric = rics.remove(ricId); this.policies.removePoliciesForRic(ricId); removePoliciciesInRic(ric); } else if (event == RicConfigUpdate.Type.CHANGED) { + logger.debug("RIC config updated {}", ricId); Ric ric = this.rics.get(ricId); if (ric == null) { - // Should not happen,just for robustness + logger.error("An non existing RIC config is changed, should not happen (just for robustness)"); addRic(updatedInfo.getRicConfig()); } else { ric.setRicConfig(updatedInfo.getRicConfig()); @@ -237,7 +230,7 @@ public class RefreshConfigTask { void runRicSynchronization(Ric ric) { RicSynchronizationTask synchronizationTask = - new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory); + new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory, rics); synchronizationTask.run(ric); } @@ -245,28 +238,10 @@ public class RefreshConfigTask { * Reads the configuration from file. */ Flux<JsonObject> loadConfigurationFromFile() { - String filepath = appConfig.getLocalConfigurationFilePath(); - if (!fileExists(filepath)) { - return Flux.empty(); - } - - try (InputStream inputStream = createInputStream(filepath)) { - JsonObject rootObject = getJsonElement(inputStream).getAsJsonObject(); - ApplicationConfigParser appParser = new ApplicationConfigParser(); - appParser.parse(rootObject); - logger.debug("Local configuration file loaded: {}", filepath); - return Flux.just(rootObject); - } catch (Exception e) { - logger.error("Local configuration file not loaded: {}, {}", filepath, e.getMessage()); - return Flux.empty(); + Optional<JsonObject> readJson = configurationFile.readFile(); + if (readJson.isPresent()) { + return Flux.just(readJson.get()); } - } - - JsonElement getJsonElement(InputStream inputStream) { - return JsonParser.parseReader(new InputStreamReader(inputStream)); - } - - InputStream createInputStream(@NotNull String filepath) throws IOException { - return new BufferedInputStream(new FileInputStream(filepath)); + return Flux.empty(); } } diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java index cae257cd..c13df8c3 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSupervision.java @@ -211,6 +211,6 @@ public class RicSupervision { } RicSynchronizationTask createSynchronizationTask() { - return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory); + return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services, restClientFactory, rics); } } diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java index 825418b5..b38a36b2 100644 --- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java +++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RicSynchronizationTask.java @@ -33,6 +33,7 @@ import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy; import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyType; import org.onap.ccsdk.oran.a1policymanagementservice.repository.PolicyTypes; import org.onap.ccsdk.oran.a1policymanagementservice.repository.Ric; +import org.onap.ccsdk.oran.a1policymanagementservice.repository.Rics; import org.onap.ccsdk.oran.a1policymanagementservice.repository.Services; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,15 +65,17 @@ public class RicSynchronizationTask { private final PolicyTypes policyTypes; private final Policies policies; private final Services services; + private final Rics rics; private final AsyncRestClientFactory restClientFactory; public RicSynchronizationTask(A1ClientFactory a1ClientFactory, PolicyTypes policyTypes, Policies policies, - Services services, AsyncRestClientFactory restClientFactory) { + Services services, AsyncRestClientFactory restClientFactory, Rics rics) { this.a1ClientFactory = a1ClientFactory; this.policyTypes = policyTypes; this.policies = policies; this.services = services; this.restClientFactory = restClientFactory; + this.rics = rics; } public void run(Ric ric) { @@ -129,6 +132,10 @@ public class RicSynchronizationTask { } private void onSynchronizationComplete(Ric ric) { + if (this.rics.get(ric.id()) == null) { + logger.debug("Policies removed in removed ric: {}", ric.id()); + return; + } logger.debug("Synchronization completed for: {}", ric.id()); ric.setState(RicState.AVAILABLE); notifyServices(ric); |