refactor vMM cord-3.0

Change-Id: I2672d03515178057180e172b6a8f47ea8da68056
diff --git a/xos/tosca/resources/vmmtenant.py b/xos/tosca/resources/vmmtenant.py
index 3d987f2..f559fc7 100644
--- a/xos/tosca/resources/vmmtenant.py
+++ b/xos/tosca/resources/vmmtenant.py
@@ -1,18 +1,19 @@
-from services.vmm.models import VMMTenant, VMMService
 from xosresource import XOSResource
+from core.models import Tenant, Service
+from services.vmm.models import VMMTenant
 
 class XOSVMMTenant(XOSResource):
     provides = "tosca.nodes.VMMTenant"
     xos_model = VMMTenant
-    copyin_props = ["tenant_message", "image_name"]  
+    copyin_props = ("tenant_message",)  
     name_field = None  
 
     def get_xos_args(self, throw_exception=True):
         args = super(XOSVMMTenant, self).get_xos_args()
 
-        provider_name = self.get_requirement("tosca.relationships.MemberOfService", throw_exception=throw_exception)
+        provider_name = self.get_requirement("tosca.relationships.TenantOfService", throw_exception=throw_exception)
         if provider_name:
-            args["provider_service"] = self.get_xos_object(VMMService, throw_exception=throw_exception, name=provider_name)
+            args["provider_service"] = self.get_xos_object(Service, throw_exception=throw_exception, name=provider_name)
 
         return args