Fix bug 1721: charms can include reference to .charm files
[osm/osmclient.git] / osmclient / sol005 / client.py
index 495c425..c7f043b 100644 (file)
@@ -35,8 +35,10 @@ from osmclient.sol005 import user as usermodule
 from osmclient.sol005 import role
 from osmclient.sol005 import pdud
 from osmclient.sol005 import k8scluster
+from osmclient.sol005 import vca
 from osmclient.sol005 import repo
 from osmclient.sol005 import osmrepo
+from osmclient.sol005 import subscription
 from osmclient.common import package_tool
 import json
 import logging
@@ -95,9 +97,11 @@ class Client(object):
         self.role = role.Role(self._http_client, client=self)
         self.pdu = pdud.Pdu(self._http_client, client=self)
         self.k8scluster = k8scluster.K8scluster(self._http_client, client=self)
+        self.vca = vca.VCA(self._http_client, client=self)
         self.repo = repo.Repo(self._http_client, client=self)
         self.osmrepo = osmrepo.OSMRepo(self._http_client, client=self)
         self.package_tool = package_tool.PackageTool(client=self)
+        self.subscription = subscription.Subscription(self._http_client, client=self)
         """
         self.vca = vca.Vca(http_client, client=self, **kwargs)
         self.utils = utils.Utils(http_client, **kwargs)
@@ -149,9 +153,9 @@ class Client(object):
 
     def set_default_params(self, **kwargs):
         host = kwargs.pop("host", None)
-        if host != None:
+        if host is not None:
             self._host = host
         port = kwargs.pop("port", None)
-        if port != None:
+        if port is not None:
             self._so_port = port
         self._http_client.set_query_admin(**kwargs)