Fixed name conflict in auto-generated code

[osm/N2VC.git] / juju / cloud.py

diff --git a/juju/cloud.py b/juju/cloud.py
index b1a1276..b430a13 100644 (file)
--- a/juju/cloud.py
+++ b/juju/cloud.py
@@ -18,9 +18,11 @@ class Cloud(object):
         """
         pass
 
-    def remove_credential(self):
+    def remove_credential(self, credential_name):
         """Remove a credential for this cloud.
 
+        :param str credential_name: Name of the credential to remove
+
         """
         pass
 
@@ -39,14 +41,15 @@ class Cloud(object):
         :param str agent_version: Version of tools to use for Juju agents
         :param bool auto_upgrade: Upgrade to latest path release tools on first
             bootstrap
-        :param :class:`juju.Constraints` bootstrap_constraints: Constraints
-            for the bootstrap machine
+        :param bootstrap_constraints: Constraints for the bootstrap machine
+        :type bootstrap_constraints: :class:`juju.Constraints`
         :param str bootstrap_series: Series of the bootstrap machine
         :param dict config: Controller configuration
-        :param :class:`juju.Constraints` constraints: Default constraints for
-            all future workload machines
-        :param :class:`juju.Credential` credential: Credential to use when
-            bootstrapping
+        :param constraints: Default constraints for all future workload
+            machines
+        :type constraints: :class:`juju.Constraints`
+        :param credential: Credential to use when bootstrapping
+        :type credential: :class:`juju.Credential`
         :param str default_model: Name to give the default model
         :param bool keep_broken: Don't destroy model if bootstrap fails
         :param str metadata_source: Local path to use as tools and/or metadata
@@ -61,14 +64,18 @@ class Cloud(object):
         """
         pass
 
-    def set_default_credential(self):
+    def set_default_credential(self, credential_name):
         """Set the default credentials for this cloud.
 
+        :param str credential_name: Credential to make default
+
         """
         pass
 
-    def set_default_region(self):
+    def set_default_region(self, region):
         """Set the default region for this cloud.
 
+        :param str region: Name of region to make default
+
         """
         pass