* Builder for A1 influenced REST APIs
*/
interface A1UriBuilder {
- String createPutPolicyUri(String type, String policyId);
+ String createPutPolicyUri(String type, String policyId, String notificationDestinationUri);
String createDeleteUri(String type, String policyId);
}
@Override
- public String createPutPolicyUri(String type, String policyId) {
+ public String createPutPolicyUri(String type, String policyId, String notificationDestinationUri) {
return createPolicyUri(type, policyId);
}
@Override
public Mono<String> putPolicy(Policy policy) {
- String policyUri = this.uri.createPutPolicyUri(policy.type().id(), policy.id());
+ String policyUri = this.uri.createPutPolicyUri(policy.type().id(), policy.id(), policy.statusNotificationUri());
return restClient.put(policyUri, policy.json());
}
@Override
public Mono<String> putPolicy(Policy policy) {
- String ricUrl = getUriBuilder().createPutPolicyUri(policy.type().id(), policy.id());
+ String ricUrl =
+ getUriBuilder().createPutPolicyUri(policy.type().id(), policy.id(), policy.statusNotificationUri());
return post("putA1Policy", ricUrl, Optional.of(policy.json()));
}
if (protocolType == A1ProtocolType.SDNC_OSC_STD_V1_1) {
return new StdA1ClientVersion1.UriBuilder(ricConfig);
} else if (protocolType == A1ProtocolType.SDNC_OSC_STD_V2_0_0) {
- return new StdA1ClientVersion2.UriBuilder(ricConfig);
+ return new StdA1ClientVersion2.OranV2UriBuilder(ricConfig);
} else if (protocolType == A1ProtocolType.SDNC_OSC_OSC_V1) {
return new OscA1Client.UriBuilder(ricConfig);
}
}
private Mono<A1ProtocolType> tryStdProtocolVersion2() {
- StdA1ClientVersion2.UriBuilder uriBuilder = new StdA1ClientVersion2.UriBuilder(ricConfig);
+ StdA1ClientVersion2.OranV2UriBuilder uriBuilder = new StdA1ClientVersion2.OranV2UriBuilder(ricConfig);
return post(GET_POLICY_RPC, uriBuilder.createPolicyTypesUri(), Optional.empty()) //
.flatMap(x -> Mono.just(A1ProtocolType.SDNC_OSC_STD_V2_0_0));
}
* /A1-P/v1/policies/{policyId}
*/
@Override
- public String createPutPolicyUri(String type, String policyId) {
+ public String createPutPolicyUri(String type, String policyId, String statusNotificationUri) {
return policiesBaseUri() + policyId;
}
@Override
public Mono<String> putPolicy(Policy policy) {
- return restClient.put(uri.createPutPolicyUri(policy.type().id(), policy.id()), policy.json());
+ return restClient.put(uri.createPutPolicyUri(policy.type().id(), policy.id(), policy.statusNotificationUri()),
+ policy.json());
}
@Override
import org.onap.ccsdk.oran.a1policymanagementservice.repository.Policy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+import org.springframework.web.util.UriBuilderFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
public class StdA1ClientVersion2 implements A1Client {
static final int CONCURRENCY_RIC = 1; // How many paralell requests that is sent to one NearRT RIC
- public static class UriBuilder implements A1UriBuilder {
+ public static class OranV2UriBuilder implements A1UriBuilder {
private final RicConfig ricConfig;
- public UriBuilder(RicConfig ricConfig) {
+ public OranV2UriBuilder(RicConfig ricConfig) {
this.ricConfig = ricConfig;
}
@Override
- public String createPutPolicyUri(String type, String policyId) {
- return createPolicyUri(type, policyId);
+ public String createPutPolicyUri(String type, String policyId, String statusNotificationUri) {
+ String policyUri = createPolicyUri(type, policyId);
+ if (statusNotificationUri.isEmpty()) {
+ return policyUri;
+ }
+ UriBuilderFactory builderFactory = new DefaultUriBuilderFactory(policyUri);
+ return builderFactory.builder() //
+ .queryParam("notificationDestination", statusNotificationUri) //
+ .build() //
+ .normalize() //
+ .toASCIIString();
}
/**
private static final String TITLE = "title";
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final AsyncRestClient restClient;
- private final UriBuilder uriBuiler;
+ private final OranV2UriBuilder uriBuiler;
public StdA1ClientVersion2(RicConfig ricConfig, AsyncRestClientFactory restClientFactory) {
this(ricConfig, restClientFactory.createRestClient(""));
this.restClient = restClient;
logger.debug("OscA1Client for ric: {}", ricConfig.ricId());
- uriBuiler = new UriBuilder(ricConfig);
+ uriBuiler = new OranV2UriBuilder(ricConfig);
}
public static Mono<String> extractPolicySchema(String policyTypeResponse, String policyTypeId) {
@Override
public Mono<String> putPolicy(Policy policy) {
- String policyUri = this.uriBuiler.createPutPolicyUri(policy.type().id(), policy.id());
+ String policyUri =
+ this.uriBuiler.createPutPolicyUri(policy.type().id(), policy.id(), policy.statusNotificationUri());
return restClient.put(policyUri, policy.json());
}
private Services services;
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
@GetMapping("/policy_schemas")
@ApiOperation(value = "Returns policy type schema definitions")
.ownerServiceId(service) //
.lastModified(Instant.now()) //
.isTransient(isTransient) //
+ .statusNotificationUri("") //
.build();
final boolean isCreate = this.policies.get(policy.id()) == null;
PolicyTypes types;
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
.create(); //
/**
private final Services services;
private final Policies policies;
- private static Gson gson = new GsonBuilder() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
@Autowired
ServiceController(Services services, Policies policies) {
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
.create(); //
- @GetMapping(path = Consts.V2_API_ROOT + "/policy-schemas", produces = MediaType.APPLICATION_JSON_VALUE)
- @ApiOperation(value = "Returns policy type schema definitions")
+ @GetMapping(path = Consts.V2_API_ROOT + "/policy-types/{policyTypeId}", produces = MediaType.APPLICATION_JSON_VALUE)
+ @ApiOperation(value = "Returns a policy type definition")
@ApiResponses(value = { //
- @ApiResponse(code = 200, message = "Policy schemas", response = PolicySchemaList.class), //
+ @ApiResponse(code = 200, message = "Policy type", response = PolicyTypeInfo.class), //
@ApiResponse(code = 404, message = "Near-RT RIC is not found", response = ErrorResponse.ErrorInfo.class)})
- public ResponseEntity<Object> getPolicySchemas( //
- @ApiParam(name = Consts.RIC_ID_PARAM, required = false,
- value = "The identity of the Near-RT RIC to get the definitions for.") //
- @RequestParam(name = Consts.RIC_ID_PARAM, required = false) String ricId,
- @ApiParam(name = Consts.POLICY_TYPE_ID_PARAM, required = true,
- value = "The identity of the policy type to get the definition for. When this parameter is given, max one schema will be returned") //
- @RequestParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false) String policyTypeId) {
+ public ResponseEntity<Object> getPolicyType( //
+ @PathVariable("policyTypeId") String policyTypeId) {
try {
- Ric ric = ricId == null ? null : rics.getRic(ricId);
- if (ric == null && policyTypeId == null) {
- Collection<PolicyType> types = this.policyTypes.getAll();
- return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
- } else if (ric != null && policyTypeId != null) {
- synchronized (ric) {
- assertRicStateIdleSync(ric);
- Collection<PolicyType> types = new ArrayList<>();
- if (rics.getRic(ricId).isSupportingType(policyTypeId)) {
- types.add(policyTypes.getType(policyTypeId));
- }
- return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
- }
- } else if (ric != null) {
- synchronized (ric) {
- assertRicStateIdleSync(ric);
- Collection<PolicyType> types = rics.getRic(ricId).getSupportedPolicyTypes();
- return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
- }
- } else {
- Collection<PolicyType> types = new ArrayList<>();
- types.add(policyTypes.getType(policyTypeId));
- return new ResponseEntity<>(toPolicyTypeSchemasJson(types), HttpStatus.OK);
- }
+ PolicyType type = policyTypes.getType(policyTypeId);
+ PolicyTypeInfo info = new PolicyTypeInfo(type.schema());
+ return new ResponseEntity<>(gson.toJson(info), HttpStatus.OK);
} catch (ServiceException e) {
return ErrorResponse.create(e, HttpStatus.NOT_FOUND);
}
}
}
- @GetMapping(path = Consts.V2_API_ROOT + "/policy", produces = MediaType.APPLICATION_JSON_VALUE)
- @ApiOperation(value = "Returns a policy configuration") //
+ @GetMapping(path = Consts.V2_API_ROOT + "/policies/{policy_id}", produces = MediaType.APPLICATION_JSON_VALUE)
+ @ApiOperation(value = "Returns a policy") //
@ApiResponses(value = { //
- @ApiResponse(code = 200, message = "Policy found", response = JsonObject.class), //
+ @ApiResponse(code = 200, message = "Policy found", response = PolicyInfo.class), //
@ApiResponse(code = 404, message = "Policy is not found", response = ErrorResponse.ErrorInfo.class)} //
)
public ResponseEntity<Object> getPolicy( //
- @ApiParam(name = Consts.POLICY_ID_PARAM, required = true, value = "The identity of the policy instance.") //
- @RequestParam(name = Consts.POLICY_ID_PARAM, required = true) String id) {
+ @PathVariable(name = Consts.POLICY_ID_PARAM, required = true) String id) {
try {
Policy p = policies.getPolicy(id);
- return new ResponseEntity<>(p.json(), HttpStatus.OK);
+ return new ResponseEntity<>(gson.toJson(toPolicyInfo(p)), HttpStatus.OK);
} catch (ServiceException e) {
return ErrorResponse.create(e, HttpStatus.NOT_FOUND);
}
}
- @DeleteMapping(Consts.V2_API_ROOT + "/policy")
+ @DeleteMapping(Consts.V2_API_ROOT + "/policies/{policy_id}")
@ApiOperation(value = "Delete a policy")
@ApiResponses(value = { //
@ApiResponse(code = 200, message = "Not used", response = VoidResponse.class),
@ApiResponse(code = 423, message = "Near-RT RIC is not operational",
response = ErrorResponse.ErrorInfo.class)})
public Mono<ResponseEntity<Object>> deletePolicy( //
- @ApiParam(name = Consts.POLICY_ID_PARAM, required = true, value = "The identity of the policy instance.") //
- @RequestParam(name = Consts.POLICY_ID_PARAM, required = true) String id) {
+ @PathVariable(Consts.POLICY_ID_PARAM) String policyId) {
try {
- Policy policy = policies.getPolicy(id);
+ Policy policy = policies.getPolicy(policyId);
keepServiceAlive(policy.ownerServiceId());
Ric ric = policy.ric();
return ric.getLock().lock(LockType.SHARED) //
}
}
- @PutMapping(path = Consts.V2_API_ROOT + "/policy", produces = MediaType.APPLICATION_JSON_VALUE)
+ @PutMapping(path = Consts.V2_API_ROOT + "/policies", produces = MediaType.APPLICATION_JSON_VALUE)
@ApiOperation(value = "Create or update a policy")
@ApiResponses(value = { //
@ApiResponse(code = 201, message = "Policy created", response = VoidResponse.class), //
@ApiResponse(code = 404, message = "Near-RT RIC or policy type is not found",
response = ErrorResponse.ErrorInfo.class) //
})
- public Mono<ResponseEntity<Object>> putPolicy( //
- @ApiParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false, value = "The identity of the policy type.") //
- @RequestParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false, defaultValue = "") String policyTypeId, //
- @ApiParam(name = Consts.POLICY_ID_PARAM, required = true, value = "The identity of the policy instance.") //
- @RequestParam(name = Consts.POLICY_ID_PARAM, required = true) String instanceId, //
- @ApiParam(name = Consts.RIC_ID_PARAM, required = true,
- value = "The identity of the Near-RT RIC where the policy will be " + //
- "created.") //
- @RequestParam(name = Consts.RIC_ID_PARAM, required = true) String ricId, //
- @ApiParam(name = Consts.SERVICE_ID_PARAM, required = true,
- value = "The identity of the service creating the policy.") //
- @RequestParam(name = Consts.SERVICE_ID_PARAM, required = true) String serviceId, //
- @ApiParam(name = Consts.TRANSIENT_PARAM, required = false,
- value = "If the policy is transient or not (boolean " + //
- "defaulted to false). A policy is transient if it will not be recreated in the Near-RT RIC "
- + //
- "when it has been lost (for instance due to a restart)") //
- @RequestParam(name = Consts.TRANSIENT_PARAM, required = false, defaultValue = "false") boolean isTransient, //
- @RequestBody Object jsonBody) {
-
- String jsonString = gson.toJson(jsonBody);
- Ric ric = rics.get(ricId);
- PolicyType type = policyTypes.get(policyTypeId);
- keepServiceAlive(serviceId);
+ public Mono<ResponseEntity<Object>> putPolicy(@RequestBody PolicyInfo policyInfo) {
+
+ String jsonString = gson.toJson(policyInfo.policyData);
+ Ric ric = rics.get(policyInfo.ricId);
+ PolicyType type = policyTypes.get(policyInfo.policyTypeId);
+ keepServiceAlive(policyInfo.serviceId);
if (ric == null || type == null) {
return ErrorResponse.createMono("Near-RT RIC or policy type not found", HttpStatus.NOT_FOUND);
}
Policy policy = ImmutablePolicy.builder() //
- .id(instanceId) //
+ .id(policyInfo.policyId) //
.json(jsonString) //
.type(type) //
.ric(ric) //
- .ownerServiceId(serviceId) //
+ .ownerServiceId(policyInfo.serviceId) //
.lastModified(Instant.now()) //
- .isTransient(isTransient) //
+ .isTransient(policyInfo.isTransient) //
+ .statusNotificationUri(policyInfo.statusNotificationUri == null ? "" : policyInfo.statusNotificationUri) //
.build();
final boolean isCreate = this.policies.get(policy.id()) == null;
"Returns a list of A1 policies matching given search criteria. <br>" //
+ "If several query parameters are defined, the policies matching all conditions are returned.";
- @GetMapping(path = Consts.V2_API_ROOT + "/policies", produces = MediaType.APPLICATION_JSON_VALUE)
- @ApiOperation(value = "Query for existing A1 policies", notes = GET_POLICIES_QUERY_DETAILS)
+ @GetMapping(path = Consts.V2_API_ROOT + "/policy_instances", produces = MediaType.APPLICATION_JSON_VALUE)
+ @ApiOperation(value = "Query for A1 policy instances", notes = GET_POLICIES_QUERY_DETAILS)
@ApiResponses(value = { //
@ApiResponse(code = 200, message = "Policies", response = PolicyInfoList.class),
@ApiResponse(code = 404, message = "Near-RT RIC, policy type or service not found",
return new ResponseEntity<>(filteredPolicies, HttpStatus.OK);
}
- @GetMapping(path = Consts.V2_API_ROOT + "/policy-ids", produces = MediaType.APPLICATION_JSON_VALUE)
- @ApiOperation(value = "Query policies, only policy identities are returned", notes = GET_POLICIES_QUERY_DETAILS)
+ @GetMapping(path = Consts.V2_API_ROOT + "/policies", produces = MediaType.APPLICATION_JSON_VALUE)
+ @ApiOperation(value = "Query policy identities", notes = GET_POLICIES_QUERY_DETAILS)
@ApiResponses(value = { //
@ApiResponse(code = 200, message = "Policy identities", response = PolicyIdList.class), @ApiResponse(
code = 404, message = "Near-RT RIC or type not found", response = ErrorResponse.ErrorInfo.class)})
return new ResponseEntity<>(policyIdsJson, HttpStatus.OK);
}
- @GetMapping(path = Consts.V2_API_ROOT + "/policy-status", produces = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = Consts.V2_API_ROOT + "/policies/{policy_id}/status", produces = MediaType.APPLICATION_JSON_VALUE)
@ApiOperation(value = "Returns a policy status") //
@ApiResponses(value = { //
- @ApiResponse(code = 200, message = "Policy status", response = JsonObject.class), //
+ @ApiResponse(code = 200, message = "Policy status", response = PolicyStatusInfo.class), //
@ApiResponse(code = 404, message = "Policy is not found", response = ErrorResponse.ErrorInfo.class)} //
)
public Mono<ResponseEntity<Object>> getPolicyStatus( //
- @ApiParam(name = Consts.POLICY_ID_PARAM, required = true, value = "The identity of the policy.") //
- @RequestParam(name = Consts.POLICY_ID_PARAM, required = true) String policyId) {
+ @PathVariable(Consts.POLICY_ID_PARAM) String policyId) {
try {
Policy policy = policies.getPolicy(policyId);
return a1ClientFactory.createA1Client(policy.ric()) //
- .flatMap(client -> client.getPolicyStatus(policy)) //
- .flatMap(status -> Mono.just(new ResponseEntity<>((Object) status, HttpStatus.OK)))
+ .flatMap(client -> client.getPolicyStatus(policy).onErrorResume(e -> Mono.just("{}"))) //
+ .flatMap(status -> createPolicyStatus(policy, status)) //
.onErrorResume(this::handleException);
} catch (ServiceException e) {
return ErrorResponse.createMono(e, HttpStatus.NOT_FOUND);
}
}
+ private Mono<ResponseEntity<Object>> createPolicyStatus(Policy policy, String statusFromNearRic) {
+ PolicyStatusInfo info = new PolicyStatusInfo(policy.lastModified(), fromJson(statusFromNearRic));
+ String str = gson.toJson(info);
+ return Mono.just(new ResponseEntity<>((Object) str, HttpStatus.OK));
+ }
+
private void keepServiceAlive(String name) {
Service s = this.services.get(name);
if (s != null) {
}
}
+ private PolicyInfo toPolicyInfo(Policy p) {
+ PolicyInfo policyInfo = new PolicyInfo();
+ policyInfo.policyId = p.id();
+ policyInfo.policyData = fromJson(p.json());
+ policyInfo.ricId = p.ric().id();
+ policyInfo.policyTypeId = p.type().id();
+ policyInfo.serviceId = p.ownerServiceId();
+ if (!p.statusNotificationUri().isEmpty()) {
+ policyInfo.statusNotificationUri = p.statusNotificationUri();
+ }
+ if (!policyInfo.validate()) {
+ logger.error("BUG, all mandatory fields must be set");
+ }
+
+ return policyInfo;
+ }
+
private String policiesToJson(Collection<Policy> policies) {
List<PolicyInfo> v = new ArrayList<>(policies.size());
for (Policy p : policies) {
- PolicyInfo policyInfo = new PolicyInfo();
- policyInfo.policyId = p.id();
- policyInfo.policyData = fromJson(p.json());
- policyInfo.ricId = p.ric().id();
- policyInfo.policyTypeId = p.type().id();
- policyInfo.serviceId = p.ownerServiceId();
- policyInfo.lastModified = p.lastModified().toString();
- if (!policyInfo.validate()) {
- logger.error("BUG, all fields must be set");
- }
- v.add(policyInfo);
+ v.add(toPolicyInfo(p));
}
PolicyInfoList list = new PolicyInfoList(v);
return gson.toJson(list);
return gson.fromJson(jsonStr, Object.class);
}
- private String toPolicyTypeSchemasJson(Collection<PolicyType> types) {
-
- Collection<String> schemas = new ArrayList<>();
- for (PolicyType t : types) {
- schemas.add(t.schema());
- }
- PolicySchemaList res = new PolicySchemaList(schemas);
- return gson.toJson(res);
- }
-
private String toPolicyTypeIdsJson(Collection<PolicyType> types) {
List<String> v = new ArrayList<>(types.size());
for (PolicyType t : types) {
@ApiModel(value = "policy_info_v2", description = "Information for one A1-P Policy")
public class PolicyInfo {
- @ApiModelProperty(value = "identity of the policy")
- @JsonProperty("policy_id")
+ @ApiModelProperty(value = "identity of the policy", required = true)
+ @JsonProperty(value = "policy_id", required = true)
@SerializedName("policy_id")
public String policyId;
- @ApiModelProperty(value = "name of the policy type")
+ @ApiModelProperty(value = "identity of the policy type", required = true)
+ @JsonProperty(value = "policy_type_id", required = true)
@SerializedName("policy_type_id")
- @JsonProperty("policy_type_id")
public String policyTypeId;
- @ApiModelProperty(value = "identity of the target Near-RT RIC")
+ @ApiModelProperty(value = "identity of the target Near-RT RIC", required = true)
+ @JsonProperty(value = "ric_id", required = true)
@SerializedName("ric_id")
- @JsonProperty("ric_id")
public String ricId;
- @ApiModelProperty(value = "the configuration of the policy")
+ @ApiModelProperty(value = "the configuration of the policy", required = true)
+ @JsonProperty(value = "policy_data", required = true)
@SerializedName("policy_data")
- @JsonProperty("policy_data")
public Object policyData;
- @ApiModelProperty(value = "the name of the service owning the policy")
+ @ApiModelProperty(value = "the name of the service owning the policy", required = true)
+ @JsonProperty(value = "service_id", required = true)
@SerializedName("service_id")
- @JsonProperty("service_id")
public String serviceId;
- @ApiModelProperty(value = "timestamp, last modification time")
- @SerializedName("last_modified")
- @JsonProperty("last_modified")
- public String lastModified;
+ @ApiModelProperty(value = "the name of the service owning the policy", required = false)
+ @JsonProperty(value = "transient", required = false)
+ @SerializedName("transient")
+ public boolean isTransient;
+
+ @ApiModelProperty(value = "Callback URI for policy status updates", required = false)
+ @JsonProperty(value = "status_notification_uri", required = false)
+ @SerializedName("status_notification_uri")
+ public String statusNotificationUri;
PolicyInfo() {}
public boolean validate() {
- return policyId != null && policyTypeId != null && ricId != null && policyData != null && serviceId != null
- && lastModified != null;
+ return policyId != null && policyTypeId != null && ricId != null && policyData != null && serviceId != null;
}
}
--- /dev/null
+/*-
+ * ========================LICENSE_START=================================
+ * ONAP : ccsdk oran
+ * ======================================================================
+ * Copyright (C) 2019-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.controllers.v2;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.time.Instant;
+
+import org.immutables.gson.Gson;
+
+@Gson.TypeAdapters
+@ApiModel(value = "policy_status_info_v2", description = "Status for one A1-P Policy")
+public class PolicyStatusInfo {
+
+ @ApiModelProperty(value = "timestamp, last modification time")
+ @SerializedName("last_modified")
+ @JsonProperty("last_modified")
+ public String lastModified;
+
+ @ApiModelProperty(value = "the Policy status")
+ @SerializedName("status")
+ @JsonProperty("status")
+ public Object status;
+
+ public PolicyStatusInfo() {}
+
+ public PolicyStatusInfo(Instant lastModified, Object statusFromNearRTRic) {
+ this.lastModified = lastModified.toString();
+ this.status = statusFromNearRTRic;
+ }
+
+ public boolean validate() {
+ return lastModified != null;
+ }
+
+}
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.immutables.gson.Gson;
@Gson.TypeAdapters
-@ApiModel(value = "policy_schema_list_v2", description = "Policy type json schemas")
-public class PolicySchemaList {
+@ApiModel(value = "policy_type_v2", description = "Policy type")
+public class PolicyTypeInfo {
@ApiModelProperty(
- value = "Policy type json schemas. The schema is a json object following http://json-schema.org/draft-07/schema")
- @SerializedName("policy_schemas")
- @JsonProperty("policy_schemas")
- public final Collection<Object> schemas;
-
- public PolicySchemaList(Collection<String> schemasAsStrings) {
- this.schemas = new ArrayList<>();
- for (String str : schemasAsStrings) {
- JsonObject jsonObj = JsonParser.parseString(str).getAsJsonObject();
- this.schemas.add(jsonObj);
- }
+ value = "Policy type json scema. The schema is a json object following http://json-schema.org/draft-07/schema")
+ @SerializedName("policy_schema")
+ @JsonProperty("policy_schema")
+ public final Object schema;
+
+ public PolicyTypeInfo(String schemaAsString) {
+ JsonObject jsonObj = JsonParser.parseString(schemaAsString).getAsJsonObject();
+ this.schema = jsonObj;
}
}
PolicyTypes types;
private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
.create(); //
- private static final String GET_RIC_BRIEF = "Returns info for a Near-RT RIC";
+ private static final String GET_RIC_BRIEF = "Returns info for one Near-RT RIC";
private static final String GET_RIC_DETAILS =
"Either a Near-RT RIC identity or a Mananged Element identity can be specified.<br>" //
+ "The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU).";
/**
- * Example: http://localhost:8081/v2/ric?managed_element_id=kista_1
+ * Example: http://localhost:8081/v2/rics/ric?managed_element_id=kista_1
*/
- @GetMapping(path = Consts.V2_API_ROOT + "/ric", produces = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = Consts.V2_API_ROOT + "/rics/ric", produces = MediaType.APPLICATION_JSON_VALUE)
@ApiOperation(value = GET_RIC_BRIEF, notes = GET_RIC_DETAILS)
@ApiResponses(value = { //
@ApiResponse(code = 200, message = "Near-RT RIC is found", response = RicInfo.class), //
public ResponseEntity<Object> getRics( //
@ApiParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false,
value = "The identity of a policy type. If given, all Near-RT RICs supporteing the policy type are returned") //
- @RequestParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false) String supportingPolicyType) {
+ @RequestParam(name = Consts.POLICY_TYPE_ID_PARAM, required = false) String supportingPolicyType
+
+ ) {
if ((supportingPolicyType != null) && (this.types.get(supportingPolicyType) == null)) {
return ErrorResponse.create("Policy type not found", HttpStatus.NOT_FOUND);
}
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
private final Services services;
private final Policies policies;
- private static Gson gson = new GsonBuilder() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
@Autowired
ServiceController(Services services, Policies policies) {
private void validateRegistrationInfo(ServiceRegistrationInfo registrationInfo)
throws ServiceException, MalformedURLException {
if (registrationInfo.serviceId.isEmpty()) {
- throw new ServiceException("Missing mandatory parameter 'serviceName'");
+ throw new ServiceException("Missing mandatory parameter 'service-id'");
}
if (registrationInfo.keepAliveIntervalSeconds < 0) {
throw new ServiceException("Keepalive interval shoul be greater or equal to 0");
@ApiResponse(code = 204, message = "Service unregistered"),
@ApiResponse(code = 200, message = "Not used", response = VoidResponse.class),
@ApiResponse(code = 404, message = "Service not found", response = ErrorResponse.ErrorInfo.class)})
- @DeleteMapping(Consts.V2_API_ROOT + "/services")
+ @DeleteMapping(Consts.V2_API_ROOT + "/services/{serviceId}")
public ResponseEntity<Object> deleteService(//
- @ApiParam(name = Consts.SERVICE_ID_PARAM, required = true, value = "The idenitity of the service") //
- @RequestParam(name = Consts.SERVICE_ID_PARAM, required = true) String serviceName) {
+ @PathVariable("serviceId") String serviceId) {
try {
- Service service = removeService(serviceName);
+ Service service = removeService(serviceId);
// Remove the policies from the repo and let the consistency monitoring
// do the rest.
removePolicies(service);
@ApiResponse(code = 404, message = "The service is not found, needs re-registration",
response = ErrorResponse.ErrorInfo.class)})
- @PutMapping(Consts.V2_API_ROOT + "/services/keepalive")
+ @PutMapping(Consts.V2_API_ROOT + "/services/{service_id}/keepalive")
public ResponseEntity<Object> keepAliveService(//
- @ApiParam(name = Consts.SERVICE_ID_PARAM, required = true, value = "The identity of the service") //
- @RequestParam(name = Consts.SERVICE_ID_PARAM, required = true) String serviceName) {
+ @PathVariable(Consts.SERVICE_ID_PARAM) String serviceId) {
try {
- services.getService(serviceName).keepAlive();
+ services.getService(serviceId).keepAlive();
return new ResponseEntity<>(HttpStatus.OK);
} catch (ServiceException e) {
return ErrorResponse.create(e, HttpStatus.NOT_FOUND);
public Instant lastModified();
public boolean isTransient();
+
+ public String statusNotificationUri();
}
.type(unnamedPolicyType) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("statusNotificationUri") //
.build();
this.policies.put(policy);
}
}
protected static Policy createPolicy(String nearRtRicUrl, String policyId, String json, String type) {
+ String callbackUrl = "https://test.com";
return ImmutablePolicy.builder() //
.id(policyId) //
.json(json) //
.type(createPolicyType(type)) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri(callbackUrl) //
.build();
}
@Test
void putPolicy_STD_V2() {
- String expUrl = RIC_1_URL + "/A1-P/v2/policytypes/type1/policies/policy1";
+ String expUrl =
+ RIC_1_URL + "/A1-P/v2/policytypes/type1/policies/policy1?notificationDestination=https://test.com";
putPolicy(A1ProtocolType.SDNC_OSC_STD_V2_0_0, expUrl);
}
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.ccsdk.oran.a1policymanagementservice.configuration.ImmutableRicConfig;
import org.onap.ccsdk.oran.a1policymanagementservice.configuration.RicConfig;
@ExtendWith(MockitoExtension.class)
class StdA1ClientV2Test {
- private static final String RIC_URL = "RicUrl";
+ private static final String RIC_URL = "https://ric.com";
- private static final String RIC_BASE_URL = "RicBaseUrl/A1-P/v2";
+ private static final String RIC_BASE_URL = RIC_URL + "/A1-P/v2";
private static final String POLICYTYPES_IDENTITIES_URL = RIC_BASE_URL + "/policytypes";
private static final String POLICIES = "/policies";
void init() {
RicConfig ricConfig = ImmutableRicConfig.builder() //
.ricId("name") //
- .baseUrl("RicBaseUrl") //
+ .baseUrl(RIC_URL) //
.managedElementIds(new ArrayList<>()) //
.controllerName("") //
.build();
clientUnderTest
.putPolicy(A1ClientHelper.createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID))
.block();
- verify(asyncRestClientMock).put(POLICYTYPES_URL + POLICY_TYPE_1_ID + POLICIES + "/" + POLICY_1_ID,
- POLICY_JSON_VALID);
+ ArgumentCaptor<String> urlCaptor = ArgumentCaptor.forClass(String.class);
+ verify(asyncRestClientMock).put(urlCaptor.capture(), eq(POLICY_JSON_VALID));
+ String actualUrl = urlCaptor.getValue();
+ String expUrl = POLICYTYPES_URL + POLICY_TYPE_1_ID + POLICIES + "/" + POLICY_1_ID;
+ assertThat(actualUrl).contains(expUrl);
}
@Test
@Autowired
Services services;
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
public static class MockApplicationConfig extends ApplicationConfig {
@Override
.type(addPolicyType(typeName, ric)) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("/policy_status?id=XXX") //
.build();
policies.put(policy);
return policy;
@Autowired
Services services;
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
public static class MockApplicationConfig extends ApplicationConfig {
@Override
String managedElementId = "kista_1";
addRic(ricId, managedElementId);
- String url = "/ric?managed_element_id=" + managedElementId;
+ String url = "/rics/ric?managed_element_id=" + managedElementId;
String rsp = restClient().get(url).block();
RicInfo ricInfo = gson.fromJson(rsp, RicInfo.class);
assertThat(ricInfo.ricId).isEqualTo(ricId);
- url = "/ric?ric_id=" + ricId;
+ url = "/rics/ric?ric_id=" + ricId;
rsp = restClient().get(url).block();
ricInfo = gson.fromJson(rsp, RicInfo.class);
assertThat(ricInfo.ricId).isEqualTo(ricId);
// test GET RIC for ManagedElement that does not exist
- url = "/ric?managed_element_id=" + "junk";
+ url = "/rics/ric?managed_element_id=" + "junk";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
- url = "/ric";
+ url = "/rics/ric";
testErrorCode(restClient().get(url), HttpStatus.BAD_REQUEST);
}
- private String putPolicyUrl(String serviceName, String ricId, String policyTypeName, String policyInstanceId,
+ private String putPolicyBody(String serviceName, String ricId, String policyTypeName, String policyInstanceId,
boolean isTransient) {
- String url;
- if (policyTypeName.isEmpty()) {
- url = "/policy?policy_id=" + policyInstanceId + "&ric_id=" + ricId + "&service_id=" + serviceName;
- } else {
- url = "/policy?policy_id=" + policyInstanceId + "&ric_id=" + ricId + "&service_id=" + serviceName
- + "&policytype_id=" + policyTypeName;
- }
+ PolicyInfo info = new PolicyInfo();
+ info.policyId = policyInstanceId;
+ info.policyTypeId = policyTypeName;
+ info.ricId = ricId;
+ info.serviceId = serviceName;
+ info.policyData = gson.fromJson(jsonString(), Object.class);
+
if (isTransient) {
- url += "&transient=true";
+ info.isTransient = isTransient;
}
- return url;
+ info.statusNotificationUri = "statusNotificationUri";
+ return gson.toJson(info);
}
- private String putPolicyUrl(String serviceName, String ricId, String policyTypeName, String policyInstanceId) {
- return putPolicyUrl(serviceName, ricId, policyTypeName, policyInstanceId, false);
+ private String putPolicyBody(String serviceName, String ricId, String policyTypeName, String policyInstanceId) {
+ return putPolicyBody(serviceName, ricId, policyTypeName, policyInstanceId, false);
}
@Test
addPolicyType(policyTypeName, ricId);
// PUT a transient policy
- String url = putPolicyUrl(serviceName, ricId, policyTypeName, policyInstanceId, true);
- final String policyBody = jsonString();
+ String url = "/policies";
+ String policyBody = putPolicyBody(serviceName, ricId, policyTypeName, policyInstanceId, true);
this.rics.getRic(ricId).setState(Ric.RicState.AVAILABLE);
restClient().put(url, policyBody).block();
assertThat(policy.isTransient()).isTrue();
// Put a non transient policy
- url = putPolicyUrl(serviceName, ricId, policyTypeName, policyInstanceId);
+ policyBody = putPolicyBody(serviceName, ricId, policyTypeName, policyInstanceId);
restClient().put(url, policyBody).block();
policy = policies.getPolicy(policyInstanceId);
assertThat(policy.isTransient()).isFalse();
- url = "/policies";
+ url = "/policy_instances";
String rsp = restClient().get(url).block();
assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId);
- url = "/policy?policy_id=" + policyInstanceId;
+ url = "/policies/" + policyInstanceId;
rsp = restClient().get(url).block();
- assertThat(rsp).isEqualTo(policyBody);
+ assertThat(rsp).contains(policyBody);
// Test of error codes
- url = putPolicyUrl(serviceName, ricId + "XX", policyTypeName, policyInstanceId);
+ url = "/policies";
+ policyBody = putPolicyBody(serviceName, ricId + "XX", policyTypeName, policyInstanceId);
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
- url = putPolicyUrl(serviceName, ricId, policyTypeName + "XX", policyInstanceId);
+ policyBody = putPolicyBody(serviceName, ricId, policyTypeName + "XX", policyInstanceId);
addPolicyType(policyTypeName + "XX", "otherRic");
testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
- url = putPolicyUrl(serviceName, ricId, policyTypeName, policyInstanceId);
+ policyBody = putPolicyBody(serviceName, ricId, policyTypeName, policyInstanceId);
this.rics.getRic(ricId).setState(Ric.RicState.SYNCHRONIZING);
testErrorCode(restClient().put(url, policyBody), HttpStatus.LOCKED);
this.rics.getRic(ricId).setState(Ric.RicState.AVAILABLE);
putService("service1");
addPolicyType("type1", "ric1");
- String url = putPolicyUrl("service1", "ric1", "type1", "id1");
MockA1Client a1Client = a1ClientFactory.getOrCreateA1Client("ric1");
HttpStatus httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
String responseBody = "Refused";
doReturn(Mono.error(a1Exception)).when(a1Client).putPolicy(any());
// PUT Policy
- testErrorCode(restClient().put(url, "{}"), httpStatus, responseBody);
+ String putBody = putPolicyBody("service1", "ric1", "type1", "id1");
+ String url = "/policies";
+ testErrorCode(restClient().put(url, putBody), httpStatus, responseBody);
// DELETE POLICY
this.addPolicy("instance1", "type1", "service1", "ric1");
doReturn(Mono.error(a1Exception)).when(a1Client).deletePolicy(any());
- testErrorCode(restClient().delete("/policy?policy_id=instance1"), httpStatus, responseBody);
-
- // GET STATUS
- this.addPolicy("instance1", "type1", "service1", "ric1");
- doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any());
- testErrorCode(restClient().get("/policy-status?policy_id=instance1"), httpStatus, responseBody);
+ testErrorCode(restClient().delete("/policies/instance1"), httpStatus, responseBody);
- // Check that empty response body is OK
- a1Exception = new WebClientResponseException(httpStatus.value(), "", null, null, null, null);
- doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any());
- testErrorCode(restClient().get("/policy-status?policy_id=instance1"), httpStatus);
}
@Test
void testPutTypelessPolicy() throws Exception {
putService("service1");
addPolicyType("", "ric1");
- String url = putPolicyUrl("service1", "ric1", "", "id1");
- restClient().put(url, jsonString()).block();
+ String body = putPolicyBody("service1", "ric1", "", "id1");
+ restClient().put("/policies", body).block();
- String rsp = restClient().get("/policies").block();
+ String rsp = restClient().get("/policy_instances").block();
PolicyInfoList info = gson.fromJson(rsp, PolicyInfoList.class);
assertThat(info.policies).hasSize(1);
PolicyInfo policyInfo = info.policies.iterator().next();
this.addPolicy("instance2", "type1", "service1", "ricXXX");
// Try change ric1 -> ricXXX
- String urlWrongRic = putPolicyUrl("service1", "ricXXX", "type1", "instance1");
- testErrorCode(restClient().put(urlWrongRic, jsonString()), HttpStatus.CONFLICT);
+ String bodyWrongRic = putPolicyBody("service1", "ricXXX", "type1", "instance1");
+ testErrorCode(restClient().put("/policies", bodyWrongRic), HttpStatus.CONFLICT);
}
@Test
void testGetPolicy() throws Exception {
- String url = "/policy?policy_id=id";
+ String url = "/policies/id";
Policy policy = addPolicy("id", "typeName", "service1", "ric1");
{
String rsp = restClient().get(url).block();
- assertThat(rsp).isEqualTo(policy.json());
+ PolicyInfo info = gson.fromJson(rsp, PolicyInfo.class);
+ String policyStr = gson.toJson(info.policyData);
+ assertThat(policyStr).isEqualTo(policy.json());
}
{
policies.remove(policy);
addPolicy("id", "typeName", "service1", "ric1");
assertThat(policies.size()).isEqualTo(1);
- String url = "/policy?policy_id=id";
+ String url = "/policies/id";
ResponseEntity<String> entity = restClient().deleteForEntity(url).block();
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT);
}
@Test
- void testGetPolicySchemas() throws Exception {
+ void testGetPolicyType() throws Exception {
addPolicyType("type1", "ric1");
- addPolicyType("type2", "ric2");
waitForRicState("ric1", RicState.AVAILABLE);
- waitForRicState("ric2", RicState.AVAILABLE);
- String url = "/policy-schemas";
+ String url = "/policy-types/type1";
String rsp = this.restClient().get(url).block();
- assertThat(rsp).contains("type1") //
- .contains("{\"title\":\"type2\"}");
-
- PolicySchemaList info = parseSchemas(rsp);
- assertThat(info.schemas).hasSize(2);
-
- url = "/policy-schemas?ric_id=ric1";
- rsp = restClient().get(url).block();
- assertThat(rsp).contains("type1");
- info = parseSchemas(rsp);
- assertThat(info.schemas).hasSize(1);
-
- // Schema for type
- url = "/policy-schemas?policytype_id=type1";
- rsp = restClient().get(url).block();
- assertThat(rsp).contains("type1") //
- .contains("title");
-
- // Both type and ric specified
- url = "/policy-schemas?ric_id=ric1&policytype_id=type1";
- rsp = restClient().get(url).block();
- PolicySchemaList list = gson.fromJson(rsp, PolicySchemaList.class);
- assertThat(list.schemas).hasSize(1);
- url = "/policy-schemas?ric_id=ric1&policytype_id=type2";
- rsp = restClient().get(url).block();
- list = gson.fromJson(rsp, PolicySchemaList.class);
- assertThat(list.schemas).isEmpty();
-
- // Get schema for non existing RIC
- url = "/policy-schemas?ric_id=ric1XXX";
- testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
+ PolicyTypeInfo info = gson.fromJson(rsp, PolicyTypeInfo.class);
+ assertThat(info.schema).isNotNull();
// Get non existing schema
- url = "/policy-schemas?policytype_id=type1XX";
+ url = "/policy-types/JUNK";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
}
}
@Test
- void testGetPolicies() throws Exception {
+ void testGetPolicyInstances() throws Exception {
addPolicy("id1", "type1", "service1");
- String url = "/policies";
+ String url = "/policy_instances";
String rsp = restClient().get(url).block();
logger.info(rsp);
PolicyInfoList info = gson.fromJson(rsp, PolicyInfoList.class);
}
@Test
- void testGetPoliciesFilter() throws Exception {
+ void testGetPolicyInstancesFilter() throws Exception {
addPolicy("id1", "type1", "service1");
addPolicy("id2", "type1", "service2");
addPolicy("id3", "type2", "service1");
- String url = "/policies?policytype_id=type1";
+ String url = "/policy_instances?policytype_id=type1";
String rsp = restClient().get(url).block();
logger.info(rsp);
assertThat(rsp).contains("id1") //
.contains("id2") //
.doesNotContain("id3");
- url = "/policies?policytype_id=type1&service_id=service2";
+ url = "/policy_instances?policytype_id=type1&service_id=service2";
rsp = restClient().get(url).block();
logger.info(rsp);
assertThat(rsp).doesNotContain("id1") //
.doesNotContain("id3");
// Test get policies for non existing type
- url = "/policies?policytype_id=type1XXX";
+ url = "/policy_instances?policytype_id=type1XXX";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
// Test get policies for non existing RIC
- url = "/policies?ric_id=XXX";
+ url = "/policy_instances?ric_id=XXX";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
}
addPolicy("id2", "type1", "service2", "ric1");
addPolicy("id3", "type2", "service1", "ric1");
- String url = "/policy-ids?policytype_id=type1";
+ String url = "/policies?policytype_id=type1";
String rsp = restClient().get(url).block();
logger.info(rsp);
assertThat(rsp).contains("id1") //
.contains("id2") //
.doesNotContain("id3");
- url = "/policy-ids?policytype_id=type1&service_id=service1&ric=ric1";
+ url = "/policies?policytype_id=type1&service_id=service1&ric=ric1";
rsp = restClient().get(url).block();
PolicyIdList respList = gson.fromJson(rsp, PolicyIdList.class);
assertThat(respList.policyIds.iterator().next()).isEqualTo("id1");
// Test get policy ids for non existing type
- url = "/policy-ids?policytype_id=type1XXX";
+ url = "/policies?policytype_id=type1XXX";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
// Test get policy ids for non existing RIC
- url = "/policy-ids?ric_id=XXX";
+ url = "/policies?ric_id=XXX";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
}
logger.info(rsp);
// Keep alive
- url = "/services/keepalive?service_id=name";
+ url = "/services/name/keepalive";
ResponseEntity<?> entity = restClient().putForEntity(url).block();
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
// DELETE service
assertThat(services.size()).isEqualTo(1);
- url = "/services?service_id=name";
+ url = "/services/name";
restClient().delete(url).block();
assertThat(services.size()).isZero();
// Keep alive, no registered service
- testErrorCode(restClient().put("/services/keepalive?service_id=name", ""), HttpStatus.NOT_FOUND);
+ testErrorCode(restClient().put("/services/junk/keepalive", ""), HttpStatus.NOT_FOUND);
// PUT service with bad payload
testErrorCode(restClient().put("/services", "crap"), HttpStatus.BAD_REQUEST, false);
putService("service1", 1, HttpStatus.CREATED);
addPolicyType("type1", "ric1");
- String url = putPolicyUrl("service1", "ric1", "type1", "instance1");
- final String policyBody = jsonString();
- restClient().put(url, policyBody).block();
+ String policyBody = putPolicyBody("service1", "ric1", "type1", "instance1");
+ restClient().put("/policies", policyBody).block();
assertThat(policies.size()).isEqualTo(1);
assertThat(services.size()).isEqualTo(1);
addPolicy("id", "typeName", "service1", "ric1");
assertThat(policies.size()).isEqualTo(1);
- String url = "/policy-status?policy_id=id";
+ String url = "/policies/id/status";
String rsp = restClient().get(url).block();
- assertThat(rsp).isEqualTo("OK");
+ PolicyStatusInfo info = gson.fromJson(rsp, PolicyStatusInfo.class);
+ assertThat(info.status).isEqualTo("OK");
// GET non existing policy status
- url = "/policy-status?policy_id=XXX";
+ url = "/policies/XXX/status";
testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND);
+
+ // GET STATUS, the NearRT RIC returns error
+ MockA1Client a1Client = a1ClientFactory.getOrCreateA1Client("ric1");
+ url = "/policies/id/status";
+ WebClientResponseException a1Exception = new WebClientResponseException(404, "", null, null, null);
+ doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any());
+ rsp = restClient().get(url).block();
+ info = gson.fromJson(rsp, PolicyStatusInfo.class);
+ assertThat(info.status.toString()).isEqualTo("{}");
+
}
private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException {
.type(addPolicyType(typeName, ric)) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("/policy_status?id=XXX") //
.build();
policies.put(policy);
return policy;
return ric;
}
- private static PolicySchemaList parseSchemas(String jsonString) {
- return gson.fromJson(jsonString, PolicySchemaList.class);
- }
}
package org.onap.ccsdk.oran.a1policymanagementservice.controllers.v2;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
import java.time.Instant;
import java.util.concurrent.atomic.AtomicInteger;
private final PolicyTypes types;
private boolean failed = false;
+ private static Gson gson = new GsonBuilder().create();
+
ConcurrencyTestRunnable(AsyncRestClient client, RicSupervision supervision, MockA1ClientFactory a1ClientFactory,
Rics rics, PolicyTypes types) {
this.count = nextCount.incrementAndGet();
createInconsistency();
this.supervision.checkAllRics();
}
- String name = "policy:" + count + ":" + i;
+ String name = "policy_" + count + "_" + i;
putPolicy(name);
putPolicy(name + "-");
listPolicies();
.ownerServiceId("") //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("/policy_status?id=XXX") //
.build();
}
MockA1Client client = a1ClientFactory.getOrCreateA1Client("ric");
Policy policy = createPolicyObject("junk");
client.putPolicy(policy).block();
-
}
private void listPolicies() {
- String uri = "/policies";
+ String uri = "/policy_instances";
webClient.getForEntity(uri).block();
}
}
private void putPolicy(String name) {
- String putUrl = "/policy?policytype_id=type1&policy_id=" + name + "&ric_id=ric&service_id=service1";
- webClient.putForEntity(putUrl, "{}").block();
+ String putUrl = "/policies";
+ String body = putPolicyBody("service1", "ric", "type1", name, false);
+ webClient.putForEntity(putUrl, body).block();
+ }
+
+ private String putPolicyBody(String serviceName, String ricId, String policyTypeName, String policyInstanceId,
+ boolean isTransient) {
+ PolicyInfo info = new PolicyInfo();
+ info.policyId = policyInstanceId;
+ info.policyTypeId = policyTypeName;
+ info.ricId = ricId;
+ info.serviceId = serviceName;
+ info.policyData = gson.fromJson("{}", Object.class);
+
+ if (isTransient) {
+ info.isTransient = isTransient;
+ }
+ return gson.toJson(info);
}
private void deletePolicy(String name) {
- String deleteUrl = "/policy?policy_id=" + name;
+ String deleteUrl = "/policies/" + name;
webClient.delete(deleteUrl).block();
}
}
.json("{}") //
.ownerServiceId("ownerServiceId") //
.isTransient(false) //
+ .statusNotificationUri("/policy_status?id=XXX") //
.build();
return policy;
}
.type(POLICY_TYPE_1) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("statusNotificationUri") //
.build();
private static final Policy POLICY_2 = ImmutablePolicy.builder() //
.type(POLICY_TYPE_1) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("statusNotificationUri") //
.build();
@Mock
.type(POLICY_TYPE_1) //
.lastModified(Instant.now()) //
.isTransient(isTransient) //
+ .statusNotificationUri("statusNotificationUri") //
.build();
}
.type(policyType) //
.lastModified(Instant.now()) //
.isTransient(false) //
+ .statusNotificationUri("statusNotificationUri") //
.build();
@Test
}],
"tags": ["A1 Policy Management Version 1.0"]
}},
- "/v2/policy": {
+ "/v2/status": {"get": {
+ "summary": "Returns status and statistics of this service",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "operationId": "getStatusUsingGET_1",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/status_info_v2"},
+ "description": "Service is living"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {"description": "Not Found"}
+ },
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }},
+ "/v2/policy-types": {"get": {
+ "summary": "Query policy type identities",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "operationId": "getPolicyTypesUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/policy_type_id_list_v2"},
+ "description": "Policy type IDs"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC is not found"
+ }
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "ric_id",
+ "description": "The identity of the Near-RT RIC to get types for.",
+ "type": "string",
+ "required": false
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }},
+ "/services": {
"get": {
- "summary": "Returns a policy configuration",
+ "summary": "Returns service information",
"deprecated": false,
- "produces": ["application/json"],
- "operationId": "getPolicyUsingGET",
+ "produces": ["*/*"],
+ "operationId": "getServicesUsingGET_1",
"responses": {
"200": {
- "schema": {"$ref": "#/definitions/json_object"},
- "description": "Policy found"
+ "schema": {
+ "type": "array",
+ "items": {"$ref": "#/definitions/service_status_v1"}
+ },
+ "description": "OK"
},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
"404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Policy is not found"
+ "schema": {"type": "string"},
+ "description": "Service is not found"
}
},
"parameters": [{
"in": "query",
"allowEmptyValue": false,
- "name": "policy_id",
+ "name": "name",
+ "description": "The name of the service",
+ "type": "string",
+ "required": false
+ }],
+ "tags": ["A1 Policy Management Version 1.0"]
+ },
+ "delete": {
+ "summary": "Delete a service",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "deleteServiceUsingDELETE_1",
+ "responses": {
+ "200": {
+ "schema": {"type": "string"},
+ "description": "OK"
+ },
+ "401": {"description": "Unauthorized"},
+ "204": {
+ "schema": {"type": "string"},
+ "description": "Service deleted"
+ },
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "Service not found"
+ }
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "name",
+ "description": "The name of the service",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 1.0"]
+ }
+ },
+ "/policy": {
+ "get": {
+ "summary": "Returns a policy configuration",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getPolicyUsingGET_1",
+ "responses": {
+ "200": {
+ "schema": {"type": "object"},
+ "description": "Policy found"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {"description": "Policy is not found"}
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "id",
"description": "The identity of the policy instance.",
"type": "string",
"required": true
}],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ "tags": ["A1 Policy Management Version 1.0"]
},
"delete": {
"summary": "Delete a policy",
"deprecated": false,
"produces": ["*/*"],
- "operationId": "deletePolicyUsingDELETE",
+ "operationId": "deletePolicyUsingDELETE_1",
"responses": {
"200": {"description": "Not used"},
"401": {"description": "Unauthorized"},
"423": {
- "schema": {"$ref": "#/definitions/error_information"},
+ "schema": {"type": "string"},
"description": "Near-RT RIC is not operational"
},
"204": {"description": "Policy deleted"},
"403": {"description": "Forbidden"},
"404": {
- "schema": {"$ref": "#/definitions/error_information"},
+ "schema": {"type": "string"},
"description": "Policy is not found"
}
},
"parameters": [{
"in": "query",
"allowEmptyValue": false,
- "name": "policy_id",
+ "name": "id",
"description": "The identity of the policy instance.",
"type": "string",
"required": true
}],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ "tags": ["A1 Policy Management Version 1.0"]
},
"put": {
- "summary": "Create or update a policy",
+ "summary": "Put a policy",
"deprecated": false,
- "produces": ["application/json"],
- "operationId": "putPolicyUsingPUT",
+ "produces": ["*/*"],
+ "operationId": "putPolicyUsingPUT_1",
"responses": {
"200": {"description": "Policy updated"},
"201": {"description": "Policy created"},
"401": {"description": "Unauthorized"},
"423": {
- "schema": {"$ref": "#/definitions/error_information"},
+ "schema": {"type": "string"},
"description": "Near-RT RIC is not operational"
},
"403": {"description": "Forbidden"},
"404": {
- "schema": {"$ref": "#/definitions/error_information"},
+ "schema": {"type": "string"},
"description": "Near-RT RIC or policy type is not found"
}
},
"parameters": [
- {
- "schema": {"type": "object"},
- "in": "body",
- "name": "jsonBody",
- "description": "jsonBody",
- "required": true
- },
{
"in": "query",
"allowEmptyValue": false,
- "name": "policy_id",
+ "name": "id",
"description": "The identity of the policy instance.",
"type": "string",
"required": true
},
{
- "in": "query",
- "allowEmptyValue": false,
- "name": "policytype_id",
- "description": "The identity of the policy type.",
- "type": "string",
- "required": false
+ "schema": {"type": "object"},
+ "in": "body",
+ "name": "jsonBody",
+ "description": "jsonBody",
+ "required": true
},
{
"in": "query",
"allowEmptyValue": false,
- "name": "ric_id",
- "description": "The identity of the Near-RT RIC where the policy will be created.",
+ "name": "ric",
+ "description": "The name of the Near-RT RIC where the policy will be created.",
"type": "string",
"required": true
},
{
"in": "query",
"allowEmptyValue": false,
- "name": "service_id",
- "description": "The identity of the service creating the policy.",
+ "name": "service",
+ "description": "The name of the service creating the policy.",
"type": "string",
"required": true
},
"allowEmptyValue": false,
"name": "transient",
"x-example": false,
- "description": "If the policy is transient or not (boolean defaulted to false). A policy is transient if it will not be recreated in the Near-RT RIC when it has been lost (for instance due to a restart)",
+ "description": "If the policy is transient or not (boolean defaulted to false). A policy is transient if it will be forgotten when the service needs to reconnect to the Near-RT RIC.",
"type": "boolean",
"required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "type",
+ "description": "The name of the policy type.",
+ "type": "string",
+ "required": false
}
],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"],
+ "tags": ["A1 Policy Management Version 1.0"],
"consumes": ["application/json"]
}
},
- "/v2/status": {"get": {
- "summary": "Returns status and statistics of this service",
- "deprecated": false,
- "produces": ["application/json"],
- "operationId": "getStatusUsingGET_1",
- "responses": {
- "200": {
- "schema": {"$ref": "#/definitions/status_info_v2"},
- "description": "Service is living"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {"description": "Not Found"}
- },
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }},
- "/policy_ids": {"get": {
- "summary": "Query policies, only policy identities returned",
+ "/policies": {"get": {
+ "summary": "Query policies",
"deprecated": false,
"produces": ["*/*"],
- "operationId": "getPolicyIdsUsingGET_1",
+ "operationId": "getPoliciesUsingGET_1",
"responses": {
"200": {
"schema": {
"type": "array",
- "items": {"type": "string"}
+ "items": {"$ref": "#/definitions/policy_info_v1"}
},
- "description": "Policy identitiess"
+ "description": "Policies"
},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
],
"tags": ["A1 Policy Management Version 1.0"]
}},
- "/policy_schemas": {"get": {
- "summary": "Returns policy type schema definitions",
+ "/v2/policies/{policy_id}": {
+ "get": {
+ "summary": "Returns a policy",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "operationId": "getPolicyUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/policy_info_v2"},
+ "description": "Policy found"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Policy is not found"
+ }
+ },
+ "parameters": [{
+ "in": "path",
+ "name": "policy_id",
+ "description": "policy_id",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ },
+ "delete": {
+ "summary": "Delete a policy",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "deletePolicyUsingDELETE",
+ "responses": {
+ "200": {"description": "Not used"},
+ "401": {"description": "Unauthorized"},
+ "423": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC is not operational"
+ },
+ "204": {"description": "Policy deleted"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Policy is not found"
+ }
+ },
+ "parameters": [{
+ "in": "path",
+ "name": "policy_id",
+ "description": "policy_id",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }
+ },
+ "/policy_schema": {"get": {
+ "summary": "Returns one policy type schema definition",
"deprecated": false,
"produces": ["*/*"],
- "operationId": "getPolicySchemasUsingGET_1",
+ "operationId": "getPolicySchemaUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"type": "object"},
+ "description": "Policy schema"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "The policy type is not found"
+ }
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "id",
+ "description": "The identity of the policy type to get the definition for.",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 1.0"]
+ }},
+ "/rics": {"get": {
+ "summary": "Query Near-RT RIC information",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getRicsUsingGET",
"responses": {
"200": {
"schema": {
"type": "array",
- "items": {"type": "object"}
+ "items": {"$ref": "#/definitions/ric_info_v1"}
},
- "description": "Policy schemas"
+ "description": "OK"
},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
"404": {
"schema": {"type": "string"},
- "description": "Near-RT RIC is not found"
+ "description": "Policy type is not found"
}
},
"parameters": [{
"in": "query",
"allowEmptyValue": false,
- "name": "ric",
- "description": "The name of the Near-RT RIC to get the definitions for.",
+ "name": "policyType",
+ "description": "The name of the policy type",
"type": "string",
"required": false
}],
"tags": ["A1 Policy Management Version 1.0"]
}},
- "/v2/policy-types": {"get": {
- "summary": "Query policy type identities",
+ "/policy_status": {"get": {
+ "summary": "Returns a policy status",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getPolicyStatusUsingGET_1",
+ "responses": {
+ "200": {
+ "schema": {"type": "object"},
+ "description": "Policy status"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "Policy is not found"
+ }
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "id",
+ "description": "The identity of the policy.",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 1.0"]
+ }},
+ "/v2/policies/{policy_id}/status": {"get": {
+ "summary": "Returns a policy status",
"deprecated": false,
"produces": ["application/json"],
- "operationId": "getPolicyTypesUsingGET",
+ "operationId": "getPolicyStatusUsingGET",
"responses": {
"200": {
- "schema": {"$ref": "#/definitions/policy_type_id_list_v2"},
- "description": "Policy type IDs"
+ "schema": {"$ref": "#/definitions/policy_status_info_v2"},
+ "description": "Policy status"
},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
"404": {
"schema": {"$ref": "#/definitions/error_information"},
- "description": "Near-RT RIC is not found"
+ "description": "Policy is not found"
+ }
+ },
+ "parameters": [{
+ "in": "path",
+ "name": "policy_id",
+ "description": "policy_id",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }},
+ "/v2/rics": {"get": {
+ "summary": "Query Near-RT RIC information",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "description": "The call returns all Near-RT RICs that supports a given policy type identity",
+ "operationId": "getRicsUsingGET_1",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/ric_info_list_v2"},
+ "description": "OK"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Policy type is not found"
}
},
"parameters": [{
"in": "query",
"allowEmptyValue": false,
- "name": "ric_id",
- "description": "The identity of the Near-RT RIC to get types for.",
+ "name": "policytype_id",
+ "description": "The identity of a policy type. If given, all Near-RT RICs supporteing the policy type are returned",
"type": "string",
"required": false
}],
"tags": ["A1 Policy Management Version 2.0 (in progress)"]
}},
+ "/policy_ids": {"get": {
+ "summary": "Query policies, only policy identities returned",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getPolicyIdsUsingGET_1",
+ "responses": {
+ "200": {
+ "schema": {
+ "type": "array",
+ "items": {"type": "string"}
+ },
+ "description": "Policy identitiess"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "Near-RT RIC or type not found"
+ }
+ },
+ "parameters": [
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "ric",
+ "description": "The name of the Near-RT RIC to get policies for.",
+ "type": "string",
+ "required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "service",
+ "description": "The name of the service to get policies for.",
+ "type": "string",
+ "required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "type",
+ "description": "The name of the policy type to get policies for.",
+ "type": "string",
+ "required": false
+ }
+ ],
+ "tags": ["A1 Policy Management Version 1.0"]
+ }},
+ "/policy_schemas": {"get": {
+ "summary": "Returns policy type schema definitions",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getPolicySchemasUsingGET",
+ "responses": {
+ "200": {
+ "schema": {
+ "type": "array",
+ "items": {"type": "object"}
+ },
+ "description": "Policy schemas"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "Near-RT RIC is not found"
+ }
+ },
+ "parameters": [{
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "ric",
+ "description": "The name of the Near-RT RIC to get the definitions for.",
+ "type": "string",
+ "required": false
+ }],
+ "tags": ["A1 Policy Management Version 1.0"]
+ }},
"/v2/services": {
"get": {
"summary": "Returns service information",
}],
"tags": ["A1 Policy Management Version 2.0 (in progress)"]
},
- "delete": {
- "summary": "Unregister a service",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "deleteServiceUsingDELETE",
- "responses": {
- "200": {"description": "Not used"},
- "401": {"description": "Unauthorized"},
- "204": {
- "schema": {"type": "object"},
- "description": "Service unregistered"
- },
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Service not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "service_id",
- "description": "The idenitity of the service",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- },
"put": {
"summary": "Register a service",
"deprecated": false,
"consumes": ["application/json"]
}
},
- "/services": {
- "get": {
- "summary": "Returns service information",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getServicesUsingGET_1",
- "responses": {
- "200": {
- "schema": {
- "type": "array",
- "items": {"$ref": "#/definitions/service_status_v1"}
- },
- "description": "OK"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Service is not found"
- }
+ "/ric": {"get": {
+ "summary": "Returns the name of a RIC managing one Mananged Element",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getRicUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"type": "string"},
+ "description": "Near-RT RIC is found"
},
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "name",
- "description": "The name of the service",
- "type": "string",
- "required": false
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- },
- "delete": {
- "summary": "Delete a service",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "deleteServiceUsingDELETE_1",
- "responses": {
- "200": {
- "schema": {"type": "string"},
- "description": "OK"
- },
- "401": {"description": "Unauthorized"},
- "204": {
- "schema": {"type": "string"},
- "description": "Service deleted"
- },
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Service not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "name",
- "description": "The name of the service",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- }
- },
- "/ric": {"get": {
- "summary": "Returns the name of a RIC managing one Mananged Element",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getRicUsingGET",
- "responses": {
- "200": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC is found"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC is not found"
- }
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"type": "string"},
+ "description": "Near-RT RIC is not found"
+ }
},
"parameters": [{
"in": "query",
"allowEmptyValue": false,
- "name": "managedElementId",
- "description": "The identity of the Managed Element",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- }},
- "/services/keepalive": {"put": {
- "summary": "Heartbeat from a service",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "keepAliveServiceUsingPUT_1",
- "responses": {
- "200": {
- "schema": {"type": "string"},
- "description": "Service supervision timer refreshed, OK"
- },
- "201": {"description": "Created"},
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {"description": "The service is not found, needs re-registration"}
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "name",
- "description": "The name of the service",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"],
- "consumes": ["application/json"]
- }},
- "/v2/services/keepalive": {"put": {
- "summary": "Heartbeat indicates that the service is running",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "keepAliveServiceUsingPUT",
- "responses": {
- "200": {
- "schema": {"type": "object"},
- "description": "Service supervision timer refreshed, OK"
- },
- "201": {"description": "Created"},
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "The service is not found, needs re-registration"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "service_id",
- "description": "The identity of the service",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"],
- "consumes": ["application/json"]
- }},
- "/v2/policy-schemas": {"get": {
- "summary": "Returns policy type schema definitions",
- "deprecated": false,
- "produces": ["application/json"],
- "operationId": "getPolicySchemasUsingGET",
- "responses": {
- "200": {
- "schema": {"$ref": "#/definitions/policy_schema_list_v2"},
- "description": "Policy schemas"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Near-RT RIC is not found"
- }
- },
- "parameters": [
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "policytype_id",
- "description": "The identity of the policy type to get the definition for. When this parameter is given, max one schema will be returned",
- "type": "string",
- "required": true
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "ric_id",
- "description": "The identity of the Near-RT RIC to get the definitions for.",
- "type": "string",
- "required": false
- }
- ],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }},
- "/v2/ric": {"get": {
- "summary": "Returns info for a Near-RT RIC",
- "deprecated": false,
- "produces": ["application/json"],
- "description": "Either a Near-RT RIC identity or a Mananged Element identity can be specified.<br>The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU).",
- "operationId": "getRicUsingGET_1",
- "responses": {
- "200": {
- "schema": {"$ref": "#/definitions/ric_info_v2"},
- "description": "Near-RT RIC is found"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Near-RT RIC is not found"
- }
- },
- "parameters": [
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "managed_element_id",
- "description": "The identity of a Managed Element. If given, the Near-RT RIC managing the ME is returned.",
- "type": "string",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "ric_id",
- "description": "The identity of a Near-RT RIC to get information for.",
- "type": "string",
- "required": false
- }
- ],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }},
- "/policy": {
- "get": {
- "summary": "Returns a policy configuration",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getPolicyUsingGET_1",
- "responses": {
- "200": {
- "schema": {"type": "object"},
- "description": "Policy found"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {"description": "Policy is not found"}
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "id",
- "description": "The identity of the policy instance.",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- },
- "delete": {
- "summary": "Delete a policy",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "deletePolicyUsingDELETE_1",
- "responses": {
- "200": {"description": "Not used"},
- "401": {"description": "Unauthorized"},
- "423": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC is not operational"
- },
- "204": {"description": "Policy deleted"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Policy is not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "id",
- "description": "The identity of the policy instance.",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- },
- "put": {
- "summary": "Put a policy",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "putPolicyUsingPUT_1",
- "responses": {
- "200": {"description": "Policy updated"},
- "201": {"description": "Policy created"},
- "401": {"description": "Unauthorized"},
- "423": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC is not operational"
- },
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC or policy type is not found"
- }
- },
- "parameters": [
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "id",
- "description": "The identity of the policy instance.",
- "type": "string",
- "required": true
- },
- {
- "schema": {"type": "object"},
- "in": "body",
- "name": "jsonBody",
- "description": "jsonBody",
- "required": true
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "ric",
- "description": "The name of the Near-RT RIC where the policy will be created.",
- "type": "string",
- "required": true
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "service",
- "description": "The name of the service creating the policy.",
- "type": "string",
- "required": true
- },
- {
- "default": false,
- "in": "query",
- "allowEmptyValue": false,
- "name": "transient",
- "x-example": false,
- "description": "If the policy is transient or not (boolean defaulted to false). A policy is transient if it will be forgotten when the service needs to reconnect to the Near-RT RIC.",
- "type": "boolean",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "type",
- "description": "The name of the policy type.",
- "type": "string",
- "required": false
- }
- ],
- "tags": ["A1 Policy Management Version 1.0"],
- "consumes": ["application/json"]
- }
- },
- "/status": {"get": {
- "summary": "Returns status and statistics of this service",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getStatusUsingGET",
- "responses": {
- "200": {
- "schema": {"type": "string"},
- "description": "Service is living"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {"description": "Not Found"}
- },
- "tags": ["A1 Policy Management Version 1.0"]
- }},
- "/v2/policy-ids": {"get": {
- "summary": "Query policies, only policy identities are returned",
- "deprecated": false,
- "produces": ["application/json"],
- "description": "Returns a list of A1 policies matching given search criteria. <br>If several query parameters are defined, the policies matching all conditions are returned.",
- "operationId": "getPolicyIdsUsingGET",
- "responses": {
- "200": {
- "schema": {"$ref": "#/definitions/policy_id_list_v2"},
- "description": "Policy identities"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Near-RT RIC or type not found"
- }
- },
- "parameters": [
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "policytype_id",
- "description": "The identity of the policy type to get policies for.",
- "type": "string",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "ric_id",
- "description": "The identity of the Near-RT RIC to get policies for.",
- "type": "string",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "service_id",
- "description": "The identity of the service to get policies for.",
- "type": "string",
- "required": false
- }
- ],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }},
- "/policies": {"get": {
- "summary": "Query policies",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getPoliciesUsingGET_1",
- "responses": {
- "200": {
- "schema": {
- "type": "array",
- "items": {"$ref": "#/definitions/policy_info_v1"}
- },
- "description": "Policies"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Near-RT RIC or type not found"
- }
- },
- "parameters": [
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "ric",
- "description": "The name of the Near-RT RIC to get policies for.",
- "type": "string",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "service",
- "description": "The name of the service to get policies for.",
- "type": "string",
- "required": false
- },
- {
- "in": "query",
- "allowEmptyValue": false,
- "name": "type",
- "description": "The name of the policy type to get policies for.",
- "type": "string",
- "required": false
- }
- ],
- "tags": ["A1 Policy Management Version 1.0"]
- }},
- "/v2/policy-status": {"get": {
- "summary": "Returns a policy status",
- "deprecated": false,
- "produces": ["application/json"],
- "operationId": "getPolicyStatusUsingGET",
- "responses": {
- "200": {
- "schema": {"$ref": "#/definitions/json_object"},
- "description": "Policy status"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"$ref": "#/definitions/error_information"},
- "description": "Policy is not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "policy_id",
- "description": "The identity of the policy.",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }},
- "/policy_schema": {"get": {
- "summary": "Returns one policy type schema definition",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getPolicySchemaUsingGET",
- "responses": {
- "200": {
- "schema": {"type": "object"},
- "description": "Policy schema"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "The policy type is not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "id",
- "description": "The identity of the policy type to get the definition for.",
- "type": "string",
- "required": true
- }],
- "tags": ["A1 Policy Management Version 1.0"]
- }},
- "/rics": {"get": {
- "summary": "Query Near-RT RIC information",
- "deprecated": false,
- "produces": ["*/*"],
- "operationId": "getRicsUsingGET",
- "responses": {
- "200": {
- "schema": {
- "type": "array",
- "items": {"$ref": "#/definitions/ric_info_v1"}
- },
- "description": "OK"
- },
- "401": {"description": "Unauthorized"},
- "403": {"description": "Forbidden"},
- "404": {
- "schema": {"type": "string"},
- "description": "Policy type is not found"
- }
- },
- "parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "policyType",
- "description": "The name of the policy type",
+ "name": "managedElementId",
+ "description": "The identity of the Managed Element",
"type": "string",
- "required": false
+ "required": true
}],
"tags": ["A1 Policy Management Version 1.0"]
}},
- "/service": {"put": {
- "summary": "Register a service",
+ "/services/keepalive": {"put": {
+ "summary": "Heartbeat from a service",
"deprecated": false,
"produces": ["*/*"],
- "operationId": "putServiceUsingPUT_1",
+ "operationId": "keepAliveServiceUsingPUT_1",
"responses": {
"200": {
"schema": {"type": "string"},
- "description": "Service updated"
- },
- "201": {
- "schema": {"type": "string"},
- "description": "Service created"
- },
- "400": {
- "schema": {"type": "string"},
- "description": "The ServiceRegistrationInfo is not accepted"
+ "description": "Service supervision timer refreshed, OK"
},
+ "201": {"description": "Created"},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
- "404": {"description": "Not Found"}
+ "404": {"description": "The service is not found, needs re-registration"}
},
"parameters": [{
- "schema": {"$ref": "#/definitions/service_registration_info_v1"},
- "in": "body",
- "name": "registrationInfo",
- "description": "registrationInfo",
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "name",
+ "description": "The name of the service",
+ "type": "string",
"required": true
}],
"tags": ["A1 Policy Management Version 1.0"],
"consumes": ["application/json"]
}},
- "/v2/policies": {"get": {
- "summary": "Query for existing A1 policies",
+ "/v2/policy_instances": {"get": {
+ "summary": "Query for A1 policy instances",
"deprecated": false,
"produces": ["application/json"],
"description": "Returns a list of A1 policies matching given search criteria. <br>If several query parameters are defined, the policies matching all conditions are returned.",
],
"tags": ["A1 Policy Management Version 2.0 (in progress)"]
}},
- "/policy_status": {"get": {
- "summary": "Returns a policy status",
+ "/v2/services/{service_id}/keepalive": {"put": {
+ "summary": "Heartbeat indicates that the service is running",
"deprecated": false,
"produces": ["*/*"],
- "operationId": "getPolicyStatusUsingGET_1",
+ "operationId": "keepAliveServiceUsingPUT",
"responses": {
"200": {
"schema": {"type": "object"},
- "description": "Policy status"
+ "description": "Service supervision timer refreshed, OK"
},
+ "201": {"description": "Created"},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
"404": {
- "schema": {"type": "string"},
- "description": "Policy is not found"
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "The service is not found, needs re-registration"
}
},
"parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "id",
- "description": "The identity of the policy.",
+ "in": "path",
+ "name": "service_id",
+ "description": "service_id",
+ "type": "string",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"],
+ "consumes": ["application/json"]
+ }},
+ "/v2/policy-types/{policyTypeId}": {"get": {
+ "summary": "Returns a policy type definition",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "operationId": "getPolicyTypeUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/policy_type_v2"},
+ "description": "Policy type"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC is not found"
+ }
+ },
+ "parameters": [{
+ "in": "path",
+ "name": "policyTypeId",
+ "description": "policyTypeId",
"type": "string",
"required": true
}],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }},
+ "/status": {"get": {
+ "summary": "Returns status and statistics of this service",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "getStatusUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"type": "string"},
+ "description": "Service is living"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {"description": "Not Found"}
+ },
"tags": ["A1 Policy Management Version 1.0"]
}},
- "/v2/rics": {"get": {
- "summary": "Query Near-RT RIC information",
+ "/v2/rics/ric": {"get": {
+ "summary": "Returns info for one Near-RT RIC",
"deprecated": false,
"produces": ["application/json"],
- "description": "The call returns all Near-RT RICs that supports a given policy type identity",
- "operationId": "getRicsUsingGET_1",
+ "description": "Either a Near-RT RIC identity or a Mananged Element identity can be specified.<br>The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU).",
+ "operationId": "getRicUsingGET_1",
"responses": {
"200": {
- "schema": {"$ref": "#/definitions/ric_info_list_v2"},
- "description": "OK"
+ "schema": {"$ref": "#/definitions/ric_info_v2"},
+ "description": "Near-RT RIC is found"
},
"401": {"description": "Unauthorized"},
"403": {"description": "Forbidden"},
"404": {
"schema": {"$ref": "#/definitions/error_information"},
- "description": "Policy type is not found"
+ "description": "Near-RT RIC is not found"
+ }
+ },
+ "parameters": [
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "managed_element_id",
+ "description": "The identity of a Managed Element. If given, the Near-RT RIC managing the ME is returned.",
+ "type": "string",
+ "required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "ric_id",
+ "description": "The identity of a Near-RT RIC to get information for.",
+ "type": "string",
+ "required": false
+ }
+ ],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ }},
+ "/v2/services/{serviceId}": {"delete": {
+ "summary": "Unregister a service",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "deleteServiceUsingDELETE",
+ "responses": {
+ "200": {"description": "Not used"},
+ "401": {"description": "Unauthorized"},
+ "204": {
+ "schema": {"type": "object"},
+ "description": "Service unregistered"
+ },
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Service not found"
}
},
"parameters": [{
- "in": "query",
- "allowEmptyValue": false,
- "name": "policytype_id",
- "description": "The identity of a policy type. If given, all Near-RT RICs supporteing the policy type are returned",
+ "in": "path",
+ "name": "serviceId",
+ "description": "serviceId",
"type": "string",
- "required": false
+ "required": true
}],
"tags": ["A1 Policy Management Version 2.0 (in progress)"]
- }}
+ }},
+ "/service": {"put": {
+ "summary": "Register a service",
+ "deprecated": false,
+ "produces": ["*/*"],
+ "operationId": "putServiceUsingPUT_1",
+ "responses": {
+ "200": {
+ "schema": {"type": "string"},
+ "description": "Service updated"
+ },
+ "201": {
+ "schema": {"type": "string"},
+ "description": "Service created"
+ },
+ "400": {
+ "schema": {"type": "string"},
+ "description": "The ServiceRegistrationInfo is not accepted"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {"description": "Not Found"}
+ },
+ "parameters": [{
+ "schema": {"$ref": "#/definitions/service_registration_info_v1"},
+ "in": "body",
+ "name": "registrationInfo",
+ "description": "registrationInfo",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 1.0"],
+ "consumes": ["application/json"]
+ }},
+ "/v2/policies": {
+ "get": {
+ "summary": "Query policy identities",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "description": "Returns a list of A1 policies matching given search criteria. <br>If several query parameters are defined, the policies matching all conditions are returned.",
+ "operationId": "getPolicyIdsUsingGET",
+ "responses": {
+ "200": {
+ "schema": {"$ref": "#/definitions/policy_id_list_v2"},
+ "description": "Policy identities"
+ },
+ "401": {"description": "Unauthorized"},
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC or type not found"
+ }
+ },
+ "parameters": [
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "policytype_id",
+ "description": "The identity of the policy type to get policies for.",
+ "type": "string",
+ "required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "ric_id",
+ "description": "The identity of the Near-RT RIC to get policies for.",
+ "type": "string",
+ "required": false
+ },
+ {
+ "in": "query",
+ "allowEmptyValue": false,
+ "name": "service_id",
+ "description": "The identity of the service to get policies for.",
+ "type": "string",
+ "required": false
+ }
+ ],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"]
+ },
+ "put": {
+ "summary": "Create or update a policy",
+ "deprecated": false,
+ "produces": ["application/json"],
+ "operationId": "putPolicyUsingPUT",
+ "responses": {
+ "200": {"description": "Policy updated"},
+ "201": {"description": "Policy created"},
+ "401": {"description": "Unauthorized"},
+ "423": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC is not operational"
+ },
+ "403": {"description": "Forbidden"},
+ "404": {
+ "schema": {"$ref": "#/definitions/error_information"},
+ "description": "Near-RT RIC or policy type is not found"
+ }
+ },
+ "parameters": [{
+ "schema": {"$ref": "#/definitions/policy_info_v2"},
+ "in": "body",
+ "name": "policyInfo",
+ "description": "policyInfo",
+ "required": true
+ }],
+ "tags": ["A1 Policy Management Version 2.0 (in progress)"],
+ "consumes": ["application/json"]
+ }
+ }
},
- "host": "localhost:41437",
+ "host": "localhost:43287",
"definitions": {
"error_information": {
"description": "Problem as defined in https://tools.ietf.org/html/rfc7807",
}
}
},
- "policy_schema_list_v2": {
- "description": "Policy type json schemas",
- "type": "object",
- "title": "policy_schema_list_v2",
- "properties": {"policy_schemas": {
- "description": "Policy type json schemas. The schema is a json object following http://json-schema.org/draft-07/schema",
- "type": "array",
- "items": {"type": "object"}
- }}
- },
"Mono«ResponseEntity«object»»": {
"type": "object",
"title": "Mono«ResponseEntity«object»»"
}
}
},
+ "policy_status_info_v2": {
+ "description": "Status for one A1-P Policy",
+ "type": "object",
+ "title": "policy_status_info_v2",
+ "properties": {
+ "last_modified": {
+ "description": "timestamp, last modification time",
+ "type": "string"
+ },
+ "status": {
+ "description": "the Policy status",
+ "type": "object"
+ }
+ }
+ },
"policy_type_id_list_v2": {
"description": "Information about policy types",
"type": "object",
"items": {"$ref": "#/definitions/ric_info_v2"}
}}
},
+ "policy_type_v2": {
+ "description": "Policy type",
+ "type": "object",
+ "title": "policy_type_v2",
+ "properties": {"policy_schema": {
+ "description": "Policy type json scema. The schema is a json object following http://json-schema.org/draft-07/schema",
+ "type": "object"
+ }}
+ },
"policy_id_list_v2": {
"description": "A list of policy identities",
"type": "object",
"description": "Information for one A1-P Policy",
"type": "object",
"title": "policy_info_v2",
+ "required": [
+ "policy_data",
+ "policy_id",
+ "policy_type_id",
+ "ric_id",
+ "service_id"
+ ],
"properties": {
"ric_id": {
"description": "identity of the target Near-RT RIC",
"description": "identity of the policy",
"type": "string"
},
+ "transient": {
+ "description": "the name of the service owning the policy",
+ "type": "boolean"
+ },
"service_id": {
"description": "the name of the service owning the policy",
"type": "string"
"description": "the configuration of the policy",
"type": "object"
},
- "last_modified": {
- "description": "timestamp, last modification time",
+ "status_notification_uri": {
+ "description": "Callback URI for policy status updates",
"type": "string"
},
"policy_type_id": {
- "description": "name of the policy type",
+ "description": "identity of the policy type",
"type": "string"
}
}
},
- "json_object": {
- "description": "A JSON object defining the configuration of the policy. The schema is defined by the Policy Type.",
- "type": "object",
- "title": "json_object"
- },
"service_list_v2": {
"description": "List of service information",
"type": "object",
Code Review / ccsdk / oran.git / commitdiff