From c324e006a02c57d2b8e70c8a6a9c8ea73b3dc479 Mon Sep 17 00:00:00 2001 From: kate Date: Fri, 23 Dec 2016 00:54:47 -0800 Subject: [PATCH] Changes in vimconn_vmware.py : 1.Fixed Bug 118 - VMWARE Connector: Alter datacenter name to not match with OSM identifier 2.Removed unused code Change-Id: Ia0b357f927c9cb1ba05770907239873293f47f41 Signed-off-by: kate --- vimconn_vmware.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/vimconn_vmware.py b/vimconn_vmware.py index c8fc73a8..4ed76b6a 100644 --- a/vimconn_vmware.py +++ b/vimconn_vmware.py @@ -50,7 +50,6 @@ from pyvcloud.schema.vcd.v1_5.schemas.admin.vCloudEntities import TasksInProgres import logging import json -import vimconn import time import uuid import httplib @@ -68,8 +67,8 @@ DELETE_INSTANCE_RETRY = 3 VCAVERSION = '5.9' -__author__ = "Mustafa Bayramov" -__date__ = "$26-Aug-2016 11:09:29$" +__author__ = "Mustafa Bayramov, Arpita Kate" +__date__ = "$23-Dec-2016 11:09:29$" __version__ = '0.1' # -1: "Could not be created", @@ -164,16 +163,13 @@ class vimconnector(vimconn.vimconnector): if tenant_name is not None: orgnameandtenant = tenant_name.split(":") if len(orgnameandtenant) == 2: - self.tenant_name = orgnameandtenant[0] - self.org_name = orgnameandtenant[1] + self.tenant_name = orgnameandtenant[1] + self.org_name = orgnameandtenant[0] else: self.tenant_name = tenant_name elif "orgname" in config: self.org_name = config['orgname'] - else: - raise vimconn.vimconnException(message="Please indicate valid organization name. " - "Either pass by org config attribute " - "or as tenant_name:tenant_id.") + if log_level: self.logger.setLevel(getattr(logging, log_level)) -- 2.25.1