Merge "Add additional null checks when building pserver objects from openstack server object. This error is not reproduceable with mitaka and queens release of openstack"

2 files changed, 13 insertions, 2 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 4df58484d8..390ed38764 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
@@ -277,6 +277,9 @@ public class HeatBridgeImpl implements HeatBridgeApi {
     @Override
     public void createPserversAndPinterfacesIfNotPresentInAai(final List<Resource> stackResources)
             throws HeatBridgeException {
+        if (stackResources == null) {
+            return;
+        }
         Map<String, Pserver> serverHostnames = getPserverMapping(stackResources);
         createPServerIfNotExists(serverHostnames);
         List<String> portIds =
@@ -293,8 +296,13 @@ public class HeatBridgeImpl implements HeatBridgeApi {
     private Map<String, Pserver> getPserverMapping(final List<Resource> stackResources) {
         List<Server> osServers = getAllOpenstackServers(stackResources);
         Map<String, Pserver> pserverMap = new HashMap<>();
-        for (Server server : osServers) {
-            pserverMap.put(server.getHost(), aaiHelper.buildPserver(server));
+        if (osServers != null) {
+            for (Server server : osServers) {
+                Pserver pserver = aaiHelper.buildPserver(server);
+                if (pserver != null) {
+                    pserverMap.put(server.getHost(), pserver);
+                }
+            }
         }
         return pserverMap;
     }
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 adcde92917..727cdccff5 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
@@ -146,6 +146,9 @@ public class AaiHelper {
      * @return AAI Pserver object
      */
     public Pserver buildPserver(final Server server) {
+        if (server == null || server.getHypervisorHostname() == null) {
+            return null;
+        }
         Pserver pserver = new Pserver();
         pserver.setInMaint(false);
         pserver.setHostname(server.getHypervisorHostname());