commit 5d906b22974b49c9fc4711059e800ddf67bbb1c4
author Scott Baker <smbaker@gmail.com> Fri Aug 18 14:09:34 2017 -0700
committer Scott Baker <scottb@onlab.us> Fri Aug 18 22:20:20 2017 -0700
tree df1ee976461fda76f303686d0afa1b577dc6cbb5
parent 5f38c7b210a3c13ac3e18f991684bf9eeed8f307

CORD-1741 Fix request of VRouterTenent that doesn't exist

Change-Id: Ic71a518d9a50b186705216f2b6a7505bea44d548

xos/xos_client/xosapi/convenience/vsgtenant.py

diff --git a/xos/xos_client/xosapi/convenience/vsgtenant.py b/xos/xos_client/xosapi/convenience/vsgtenant.py
index e9648bb..ab3c477 100644
--- a/xos/xos_client/xosapi/convenience/vsgtenant.py
+++ b/xos/xos_client/xosapi/convenience/vsgtenant.py
@@ -71,8 +71,10 @@
     def wan_vm_ip(self):
         tags = self.stub.Tag.objects.filter(name="vm_vrouter_tenant", object_id=self.instance.id, content_type=self.instance.self_content_type_id)
         if tags:
-            tenant = self.stub.VRouterTenant.objects.get(id=int(tags[0].value))
-            return tenant.public_ip
+            tenants = self.stub.VRouterTenant.objects.filter(id=int(tags[0].value))
+            if not tenants:
+                raise Exception("VRouterTenent %d linked to vsg %s does not exist" % (int(tags[0].value), self))
+            return tenants[0].public_ip
         else:
             raise Exception("no vm_vrouter_tenant tag for instance %s" % self.instance)
 
@@ -80,8 +82,10 @@
     def wan_vm_mac(self):
         tags = self.stub.Tag.objects.filter(name="vm_vrouter_tenant", object_id=self.instance.id, content_type=self.instance.self_content_type_id)
         if tags:
-            tenant = self.stub.VRouterTenant.objects.get(id=int(tags[0].value))
-            return tenant.public_mac
+            tenants = self.stub.VRouterTenant.objects.filter(id=int(tags[0].value))
+            if not tenants:
+                raise Exception("VRouterTenent %d linked to vsg %s does not exist" % (int(tags[0].value), self))
+            return tenants[0].public_mac
         else:
             raise Exception("no vm_vrouter_tenant tag for instance %s" % self.instance)