commit 0a0e0a55f5092a1a59fd19f7ba6f8b443186caf1
author Scott Baker <smbaker@gmail.com> Mon Oct 23 11:28:51 2017 -0700
committer Scott Baker <scottb@onlab.us> Mon Oct 30 10:19:20 2017 -0700
tree 47440143a56e3f68883b72c1823ec5ddfbd3b291
parent cf5d9ccc017341e6a5c2af4e090b4f5003179972

CORD-1951 backport recent vEG changes to vSG

Change-Id: I5d63ce97eca8094b6915f7132648dda55bddedf7
(cherry picked from commit df383adc0b1e7756ffaf817496c8ddb2f35ad1f3)

xos/xos_client/xosapi/convenience/vsgserviceinstance.py

diff --git a/xos/xos_client/xosapi/convenience/vsgserviceinstance.py b/xos/xos_client/xosapi/convenience/vsgserviceinstance.py
index 26bf0bc..800ad53 100644
--- a/xos/xos_client/xosapi/convenience/vsgserviceinstance.py
+++ b/xos/xos_client/xosapi/convenience/vsgserviceinstance.py
@@ -22,15 +22,19 @@
                        "wan_vm_ip", "wan_vm_mac")
 
     @property
-    def volt(self):
+    def ingress_service_instance(self):
         links = self.provided_links.all()
         for link in links:
-            # cast from ServiceInstance to VoltTenant
-            volts = self.stub.VOLTTenant.objects.filter(id = link.subscriber_service_instance.id)
-            if volts:
-                return volts[0]
+            subscriber_service_instance = link.subscriber_service_instance.leaf_model
+            # Look for something that has an s_tag attribute
+            if (hasattr(subscriber_service_instance, "s_tag")):
+                return subscriber_service_instance
         return None
-    
+
+    @property
+    def volt(self):
+        return self.ingress_service_instance
+
     def is_address_manager_service_instance(self, si):
         # TODO: hardcoded dependency
         # TODO: VRouterTenant is deprecated