Fix subclass init issue

All subclass should invoke parent class __init__()

Change-Id: Id7537156dc65f4c4739d2b70cc705d2ff39f4ff0
Issue-ID: MULTICLOUD-337
Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>

diff --git a/windriver/titanium_cloud/extensions/views/extensions.py b/windriver/titanium_cloud/extensions/views/extensions.py
index 5b85730..9360cbb 100644 (file)
--- a/windriver/titanium_cloud/extensions/views/extensions.py
+++ b/windriver/titanium_cloud/extensions/views/extensions.py
@@ -32,7 +32,8 @@ logger = logging.getLogger(__name__)
 class Extensions(newton_extensions.Extensions):
 
     def __init__(self):
-        self._logger = logger
+        super(Extensions, self).__init__()
+        # self._logger = logger
         self.proxy_prefix = settings.MULTICLOUD_PREFIX
 
 
@@ -76,7 +77,8 @@ class Extensions(newton_extensions.Extensions):
 class APIv1Extensions(Extensions):
 
     def __init__(self):
-        self._logger = logger
+        super(APIv1Extensions, self).__init__()
+        # self._logger = logger
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
 
 

diff --git a/windriver/titanium_cloud/proxy/views/identityV3.py b/windriver/titanium_cloud/proxy/views/identityV3.py
index e6dc16a..85fec08 100644 (file)
--- a/windriver/titanium_cloud/proxy/views/identityV3.py
+++ b/windriver/titanium_cloud/proxy/views/identityV3.py
@@ -25,20 +25,23 @@ logger = logging.getLogger(__name__)
 class Tokens(newton_identityV3.Tokens):
 
     def __init__(self):
+        super(Tokens, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_PREFIX
-        self._logger = logger
+        # self._logger = logger
 
 class TokensV2(newton_identityV3.TokensV2):
 
     def __init__(self):
+        super(TokensV2, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_PREFIX
-        self._logger = logger
+        # self._logger = logger
 
 
 class APIv1Tokens(Tokens):
     def __init__(self):
+        super(APIv1Tokens, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
-        self._logger = logger
+        # self._logger = logger
 
 
     def get(self, request, cloud_owner="", cloud_region_id=""):
@@ -52,8 +55,8 @@ class APIv1Tokens(Tokens):
 
     def post(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        #self._logger.debug("META> %s" % request.META)
-        #self._logger.debug("data> %s" % request.data)
+        # self._logger.debug("META> %s" % request.META)
+        # self._logger.debug("data> %s" % request.data)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1Tokens,self).post(request, vimid)
@@ -61,14 +64,15 @@ class APIv1Tokens(Tokens):
 
 class APIv1TokensV2(TokensV2):
     def __init__(self):
+        super(APIv1TokensV2, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
-        self._logger = logger
+        # self._logger = logger
 
 
     def get(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        #self._logger.debug("META> %s" % request.META)
-        #self._logger.debug("data> %s" % request.data)
+        # self._logger.debug("META> %s" % request.META)
+        # self._logger.debug("data> %s" % request.data)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1TokensV2,self).get(request, vimid)
@@ -76,8 +80,8 @@ class APIv1TokensV2(TokensV2):
 
     def post(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner,cloud_region_id))
-        #self._logger.debug("META> %s" % request.META)
-        #self._logger.debug("data> %s" % request.data)
+        # self._logger.debug("META> %s" % request.META)
+        # self._logger.debug("data> %s" % request.data)
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1TokensV2,self).post(request, vimid)

diff --git a/windriver/titanium_cloud/proxy/views/services.py b/windriver/titanium_cloud/proxy/views/services.py
index 6f4ec32..2ea4663 100644 (file)
--- a/windriver/titanium_cloud/proxy/views/services.py
+++ b/windriver/titanium_cloud/proxy/views/services.py
@@ -27,7 +27,8 @@ logger = logging.getLogger(__name__)
 class Services(newton_services.Services):
 
     def __init__(self):
-        self._logger = logger
+        super(Services, self).__init__()
+        # self._logger = logger
 
 
 class GetTenants(newton_services.GetTenants):
@@ -36,7 +37,8 @@ class GetTenants(newton_services.GetTenants):
     '''
 
     def __init__(self):
-        self._logger = logger
+        super(GetTenants, self).__init__()
+        # self._logger = logger
 
     def get(self, request, vimid="", servicetype="identity", requri='v3/projects'):
         self._logger.info("vimid: %s" % (vimid))
@@ -47,12 +49,13 @@ class GetTenants(newton_services.GetTenants):
 class APIv1Services(Services):
 
     def __init__(self):
-        self._logger = logger
+        super(APIv1Services, self).__init__()
+        # self._logger = logger
 
     def head(self, request, cloud_owner="", cloud_region_id="", servicetype="", requri=""):
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id))
-#        self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri))
-#        self._logger.debug("META, data> %s , %s" % (request.META, request.data))
+        # self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri))
+        # self._logger.debug("META, data> %s , %s" % (request.META, request.data))
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1Services,self).head(request, vimid, servicetype, requri)
@@ -94,12 +97,13 @@ class APIv1GetTenants(GetTenants):
     '''
 
     def __init__(self):
-        self._logger = logger
+        super(APIv1GetTenants, self).__init__()
+        # self._logger = logger
 
     def head(self, request, cloud_owner="", cloud_region_id="", servicetype="identity", requri=""):
         self._logger.info("cloud_owner,cloud_region_id: %s,%s" % (cloud_owner, cloud_region_id))
-#        self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri))
-#        self._logger.debug("META, data> %s , %s" % (request.META, request.data))
+        # self._logger.info("servicetype, requri> %s,%s" % (servicetype, requri))
+        # self._logger.debug("META, data> %s , %s" % (request.META, request.data))
 
         vimid = extsys.encode_vim_id(cloud_owner, cloud_region_id)
         return super(APIv1GetTenants,self).head(request, vimid, servicetype, requri)

diff --git a/windriver/titanium_cloud/registration/views/registration.py b/windriver/titanium_cloud/registration/views/registration.py
index 4225ff3..9d05247 100644 (file)
--- a/windriver/titanium_cloud/registration/views/registration.py
+++ b/windriver/titanium_cloud/registration/views/registration.py
@@ -33,9 +33,10 @@ logger = logging.getLogger(__name__)
 class Registry(newton_registration.Registry):
 
     def __init__(self):
+        super(Registry, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_PREFIX
         self.aai_base_url = settings.AAI_BASE_URL
-        self._logger = logger
+        # self._logger = logger
 
     def _discover_flavors(self, vimid="", session=None, viminfo=None):
         try:
@@ -370,9 +371,10 @@ class Registry(newton_registration.Registry):
 class APIv1Registry(Registry):
 
     def __init__(self):
+        super(APIv1Registry, self).__init__()
         self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
         self.aai_base_url = settings.AAI_BASE_URL
-        self._logger = logger
+        # self._logger = logger
 
 
     def _update_cloud_region(self, cloud_owner, cloud_region_id, openstack_region_id, viminfo, session=None):

diff --git a/windriver/titanium_cloud/resource/views/capacity.py b/windriver/titanium_cloud/resource/views/capacity.py
index 1b4566c..0619e83 100644 (file)
--- a/windriver/titanium_cloud/resource/views/capacity.py
+++ b/windriver/titanium_cloud/resource/views/capacity.py
@@ -145,10 +145,11 @@ class CapacityCheck(APIView):
 
 
 
-class APIv1CapacityCheck(APIView):
+class APIv1CapacityCheck(CapacityCheck):
 
     def __init__(self):
-        self._logger = logger
+        super(APIv1CapacityCheck, self).__init__()
+        # self._logger = logger
 
     def post(self, request, cloud_owner="", cloud_region_id=""):
         self._logger.info("vimid, data> %s,%s, %s" % (cloud_owner, cloud_region_id, request.data))

diff --git a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
index a85ce15..8bfa3c3 100644 (file)
--- a/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
+++ b/windriver/titanium_cloud/vesagent/vesagent_ctrl.py
@@ -409,8 +409,9 @@ class VesAgentCtrl(APIView):
 class APIv1VesAgentCtrl(VesAgentCtrl):
 
     def __init__(self):
-        self._logger = logger
-        self.proxy_prefix = settings.MULTICLOUD_PREFIX
+        super(APIv1VesAgentCtrl, self).__init__()
+        # self._logger = logger
+        self.proxy_prefix = settings.MULTICLOUD_API_V1_PREFIX
 
 
     def get(self, request, cloud_owner="", cloud_region_id=""):