-vim_config = "'{project_domain_name: " + vim_project_domain_name + ", user_domain_name: " + vim_user_domain_name + ", vim_network_name: " + os.environ.get("VIM_MGMT_NET") + "}'"
+vim_config_dict = {}
+vim_config_dict["vim_network_name"] = os.environ.get("VIM_MGMT_NET")
+if vim_project_domain_name:
+ vim_config_dict["project_domain_name"] = vim_project_domain_name
+if vim_user_domain_name:
+ vim_config_dict["user_domain_name"] = vim_user_domain_name
+if vim_insecure:
+ vim_config_dict["insecure"] = True
+vim_config = "'{}'".format(yaml.safe_dump(vim_config_dict, default_flow_style=True, width=10000).rstrip('\r\n'))