diff options
3 files changed, 45 insertions, 3 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java index 0512912b9f..04c6ea4ff7 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/HeatBridgeImpl.java @@ -488,7 +488,13 @@ public class HeatBridgeImpl implements HeatBridgeApi { for (Pserver pserver : serverHostnames.values()) { AAIResourceUri uri = AAIUriFactory .createResourceUri(AAIFluentTypeBuilder.cloudInfrastructure().pserver(pserver.getHostname())); - resourcesClient.createIfNotExists(uri, Optional.of(pserver)); + if (resourcesClient.exists(uri)) { + Pserver updatePserver = new Pserver(); + updatePserver.setPserverId(pserver.getPserverId()); + resourcesClient.update(uri, updatePserver); + } else { + resourcesClient.create(uri, pserver); + } } } diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/helpers/AaiHelper.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/helpers/AaiHelper.java index 1f6c0df90f..bbdd05bddc 100644 --- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/helpers/AaiHelper.java +++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/helpers/AaiHelper.java @@ -247,8 +247,8 @@ public class AaiHelper { Pserver pserver = new Pserver(); pserver.setInMaint(false); pserver.setHostname(server.getHypervisorHostname()); - if (server.getId() != null) { - pserver.setPserverId(server.getId()); + if (server.getHostId() != null) { + pserver.setPserverId(server.getHostId()); } if (server.getHost() != null) { pserver.setPserverName2(server.getHost()); diff --git a/releases/1.8.0.yaml b/releases/1.8.0.yaml new file mode 100644 index 0000000000..99bf277e47 --- /dev/null +++ b/releases/1.8.0.yaml @@ -0,0 +1,36 @@ + +--- +distribution_type: 'container' +container_release_tag: '1.8.0' +project: 'so' +log_dir: 'so-maven-docker-stage-master/635/' +ref: '31aba9aba28d7be2417a99ba7e862a7a8c68005b' +containers: + - name: 'so/vnfm-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/catalog-db-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/request-db-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/openstack-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/sdnc-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/vfc-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/sdc-controller' + version: '1.8.0-20210215T1458' + - name: 'so/bpmn-infra' + version: '1.8.0-20210215T1458' + - name: 'so/so-monitoring' + version: '1.8.0-20210215T1458' + - name: 'so/api-handler-infra' + version: '1.8.0-20210215T1458' + - name: 'so/nssmf-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/mso-cnf-adapter' + version: '1.8.0-20210210T0420' + - name: 'so/so-oof-adapter' + version: '1.8.0-20210215T1458' + - name: 'so/so-etsi-nfvo-ns-lcm' + version: '1.8.0-20210215T1458' |