Merge "Enable complex data types in service instanceParams"
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java
index c281dbd..17fd994 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/heatbridge/utils/HeatBridgeUtils.java
@@ -35,6 +35,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -71,6 +72,9 @@
     }
 
     public static List<String> extractPciIdsFromVServer(Vserver vserver) {
+        if (vserver.getLInterfaces() == null) {
+            return Collections.emptyList();
+        }
         return vserver.getLInterfaces().getLInterface().stream()
                 .filter(lInterface -> lInterface.getSriovVfs() != null
                         && CollectionUtils.isNotEmpty(lInterface.getSriovVfs().getSriovVf()))