Merge "Remove hardcoded CloudOwner from heatbridge"

diff --combined adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index 77e1449,7fc0db7..b99e34e
--- 1/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
--- 2/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@@ -221,7 -221,7 +221,7 @@@ public class MsoVnfAdapterImpl implemen
                                }
                        } catch (Exception e) {
                                // might be ok - both are just blank
 -                              logger.debug("ERROR trying to parse the volumeGroupHeatStackId " + volumeGroupHeatStackId,e);
 +                              logger.debug("ERROR trying to parse the volumeGroupHeatStackId {}", volumeGroupHeatStackId,e);
                        }
                        this.createVfModule(cloudSiteId,
                                cloudOwner,
@@@ -520,7 -520,7 +520,7 @@@
        }
      }
  
-     private void heatbridge(StackInfo heatStack, String cloudSiteId, String tenantId, String genericVnfName,
+     private void heatbridge(StackInfo heatStack, String cloudOwner, String cloudSiteId, String tenantId, String genericVnfName,
          String vfModuleId) {
          try {
              CloudSite cloudSite = cloudConfig.getCloudSite(cloudSiteId).orElseThrow(
@@@ -528,7 -528,6 +528,6 @@@
              CloudIdentity cloudIdentity = cloudSite.getIdentityService();
              String heatStackId = heatStack.getCanonicalName().split("/")[1];
  
-             String cloudOwner = "CloudOwner";//cloud owner needs to come from bpmn-adapter
              List<String> oobMgtNetNames = new ArrayList<>();
  
              HeatBridgeApi heatBridgeClient = new HeatBridgeImpl(new AAIResourcesClient(), cloudIdentity,
@@@ -586,9 -585,9 +585,9 @@@
              final Object obj = JSON_MAPPER.treeToValue(node, Object.class);
              return JSON_MAPPER.writeValueAsString(obj);
          } catch (JsonParseException jpe) {
 -            logger.debug("Error converting json to string " + jpe.getMessage(),jpe);
 +            logger.debug("Error converting json to string: {}", jpe.getMessage(),jpe);
          } catch (Exception e) {
 -            logger.debug("Error converting json to string " + e.getMessage(),e);
 +            logger.debug("Error converting json to string: {}", e.getMessage(),e);
          }
          return "[Error converting json to string]";
      }
@@@ -1345,7 -1344,7 +1344,7 @@@
              }
              logger.debug ("VF Module {} successfully created", vfModuleName);
              //call heatbridge
-             heatbridge(heatStack, cloudSiteId, tenantId, genericVnfName, vfModuleId);
+             heatbridge(heatStack, cloudOwner, cloudSiteId, tenantId, genericVnfName, vfModuleId);
              return;
          } catch (Exception e) {
                logger.debug("unhandled exception in create VF",e);
@@@ -1904,13 -1903,14 +1903,13 @@@
                                        jsonNode = JSON_MAPPER.readTree(jsonString);
                                } catch (JsonParseException jpe) {
                                        //TODO - what to do here?
 -                                      //for now - send the error to debug, but just leave it as a String
 -                                      String errorMessage = jpe.getMessage();
 -                                      logger.debug("Json Error Converting " + parm.getParamName() + " - " + errorMessage,jpe);
 +                                      //for now - send the error to debug
 +                                      logger.debug("Json Error Converting {} - {}", parm.getParamName(), jpe.getMessage(), jpe);
                                        hasJson = false;
                                        jsonNode = null;
                                } catch (Exception e) {
                          // or here?
 -                        logger.debug("Json Error Converting " + parm.getParamName() + " " + e.getMessage(), e);
 +                        logger.debug("Json Error Converting {} {}", parm.getParamName(), e.getMessage(), e);
                          hasJson = false;
                          jsonNode = null;
                      }