* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* Makes a request, given the target VNF. This is a support function for
* {@link #makeRequest(int)}.
*
- * @param attempt attempt number
* @param targetVnf target VNF
* @return a new request
*/
- protected Request makeRequest(int attempt, GenericVnf targetVnf) {
+ protected Request makeRequest(GenericVnf targetVnf) {
var request = new Request();
request.setCommonHeader(new CommonHeader());
request.getCommonHeader().setRequestId(params.getRequestId());
"unknown APPC-C response status code: " + response.getStatus().getCode());
}
- switch (code) {
- case SUCCESS:
- return Status.SUCCESS;
- case FAILURE:
- return Status.FAILURE;
- case ERROR:
- case REJECT:
- throw new IllegalArgumentException("APP-C request was not accepted, code=" + code);
- case ACCEPT:
- default:
- // awaiting a "final" response
- return Status.STILL_WAITING;
- }
+ return switch (code) {
+ case SUCCESS -> Status.SUCCESS;
+ case FAILURE -> Status.FAILURE;
+ case ERROR, REJECT -> throw new IllegalArgumentException("APP-C request was not accepted, code=" + code);
+ // awaiting a "final" response
+ default -> Status.STILL_WAITING;
+ };
}
/**
* ONAP
* ================================================================================
* Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@Override
protected Request makeRequest(int attempt) {
- return makeRequest(attempt, getRequiredProperty(OperationProperties.AAI_RESOURCE_VNF, "resource VNF"));
+ return makeRequest(getRequiredProperty(OperationProperties.AAI_RESOURCE_VNF, "resource VNF"));
}
}
String subreq = oper.getSubRequestId();
assertNotNull(subreq);
- Request request = oper.makeRequest(2, genvnf);
+ Request request = oper.makeRequest(genvnf);
assertEquals(DEFAULT_OPERATION, request.getAction());
assertNotNull(request.getPayload());
assertEquals(subreq, header.getSubRequestId());
- request = oper.makeRequest(2, genvnf);
+ request = oper.makeRequest(genvnf);
assertEquals(subreq, request.getCommonHeader().getSubRequestId());
// repeat using a null payload
params = params.toBuilder().payload(null).build();
oper = new MyOper(params, config);
- assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(2, genvnf).getPayload());
+ assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(genvnf).getPayload());
}
@Test
public void testConvertPayload() {
- Request request = oper.makeRequest(2, genvnf);
+ Request request = oper.makeRequest(genvnf);
// @formatter:off
assertEquals(
params = params.toBuilder().payload(payload).build();
oper = new MyOper(params, config);
- request = oper.makeRequest(2, genvnf);
+ request = oper.makeRequest(genvnf);
// @formatter:off
assertEquals(
params = params.toBuilder().payload(payload).build();
oper = new MyOper(params, config);
- request = oper.makeRequest(2, genvnf);
+ request = oper.makeRequest(genvnf);
payload.put(AppcOperation.VNF_ID_KEY, MY_VNF);
payload.put(KEY1, "abc");
@Test
public void testGetExpectedKeyValues() {
oper.generateSubRequestId(2);
- Request request = oper.makeRequest(2, genvnf);
+ Request request = oper.makeRequest(genvnf);
assertEquals(Arrays.asList(request.getCommonHeader().getSubRequestId()),
oper.getExpectedKeyValues(50, request));
}
@Override
protected Request makeRequest(int attempt) {
- return makeRequest(attempt, genvnf);
+ return makeRequest(genvnf);
}
}
}
* ONAP
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
throw new IllegalArgumentException("unknown APPC-LCM response status code: " + status.getCode());
}
- switch (code) {
- case AppcLcmResponseCode.SUCCESS:
- return Status.SUCCESS;
- case AppcLcmResponseCode.FAILURE:
- return Status.FAILURE;
- case AppcLcmResponseCode.ERROR:
- case AppcLcmResponseCode.REJECT:
+ return switch (code) {
+ case AppcLcmResponseCode.SUCCESS -> Status.SUCCESS;
+ case AppcLcmResponseCode.FAILURE -> Status.FAILURE;
+ case AppcLcmResponseCode.ERROR, AppcLcmResponseCode.REJECT ->
throw new IllegalArgumentException("APPC-LCM request was not accepted, code=" + code);
- case AppcLcmResponseCode.ACCEPTED:
- default:
- return Status.STILL_WAITING;
- }
+ default -> Status.STILL_WAITING;
+ };
}
/**
* SdnrOperation
* ================================================================================
* Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
return Status.FAILURE;
}
- switch (code) {
- case SUCCESS:
- case PARTIAL_SUCCESS:
- return Status.SUCCESS;
- case FAILURE:
- case PARTIAL_FAILURE:
- return Status.FAILURE;
- case ERROR:
- case REJECT:
+ return switch (code) {
+ case SUCCESS, PARTIAL_SUCCESS -> Status.SUCCESS;
+ case FAILURE, PARTIAL_FAILURE -> Status.FAILURE;
+ case ERROR, REJECT -> {
logger.warn("SDNR request was not accepted, code={}", code);
- return Status.FAILURE;
- case ACCEPTED:
- default:
+ yield Status.FAILURE;
+ }
+ default ->
// awaiting a "final" response
- return Status.STILL_WAITING;
- }
+ Status.STILL_WAITING;
+ };
}
/**
<dependency>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema</artifactId>
- <version>1.7.2</version>
+ <version>1.9.6</version>
<exclusions>
<exclusion>
<groupId>com.google.code.javaparser</groupId>
</description>
<properties>
- <grpc.version>1.25.0</grpc.version>
+ <grpc.version>1.29.0</grpc.version>
</properties>
<dependencies>
private static ToscaServiceTemplate createToscaNodeTemplate;
private PfDao pfDao;
private StandardCoder standardCoder;
- private AuthorativeToscaProvider authorativeToscaProvider = new AuthorativeToscaProvider();
- private YamlJsonTranslator yamlJsonTranslator = new YamlJsonTranslator();
+ private final AuthorativeToscaProvider authorativeToscaProvider = new AuthorativeToscaProvider();
+ private final YamlJsonTranslator yamlJsonTranslator = new YamlJsonTranslator();
/**
* Read policy metadataSet input json.
}
@Test
- public void testToscaNodeTemplatetDelete() throws Exception {
+ public void testToscaNodeTemplateDelete() throws Exception {
assertThatThrownBy(() -> {
authorativeToscaProvider.deleteToscaNodeTemplate(null, null, null);
}).hasMessageMatching(DAO_IS_NULL);
Code Review / policy / models.git / commitdiff