changed mutable to scalable in help messages.

Author: konstan

client/README.md

@@ -1,9 +1,9 @@
 
-# Mutable deployments
+# Scalable deployments
 
 
-In the case of mutable deployments during a scaling action the following 
-environment variables are available for the user hook scripts (`OnVmAdd`, `OnVmRemove`, 
+In the case of scalable deployments during a scaling action the following
+environment variables are available for the user hook scripts (`OnVmAdd`, `OnVmRemove`,
 `Pre-Scale`, `Post-Scale`).
 
 ```
@@ -15,8 +15,8 @@ SLIPSTREAM_SCALING_ACTION # name of the scaling action <vm_resize|disk_attach|di
 
 ## Horizontal scalability
 
-If required, the script should be defined in the image module's `OnVmAdd` and/or `OnVmRemove` 
-targets. `SLIPSTREAM_SCALING_NODE` and `SLIPSTREAM_SCALING_VMS` are intended to be used in 
+If required, the script should be defined in the image module's `OnVmAdd` and/or `OnVmRemove`
+targets. `SLIPSTREAM_SCALING_NODE` and `SLIPSTREAM_SCALING_VMS` are intended to be used in
 the following way (`Bash` example).
 
 ```bash
@@ -56,9 +56,9 @@ esac
 
 ## Vertical and horizontal scalability
 
-If required, the scripts should be defined in the image module's `Pre-Scale` and/or `Post-Scale` 
+If required, the scripts should be defined in the image module's `Pre-Scale` and/or `Post-Scale`
 targets and are intended to be used before and/or after the scaling up/down actions.  The scripts
-are only executed on the VMs that are subject to the current scaling action.  Below are the 
+are only executed on the VMs that are subject to the current scaling action.  Below are the
 example scripts for `Bash`.
 
 `Pre-Scale` script.  Note that it can be used on VM remove horizontal scalability action.
@@ -67,7 +67,7 @@ example scripts for `Bash`.
 #!/bin/bash
 set -e
 
-# Pre-scale: intended to be ran before any vertical scaling and horizontal downscaling action. 
+# Pre-scale: intended to be ran before any vertical scaling and horizontal downscaling action.
 
 function before_vm_remove() { echo "Before VM remove"; }
 function before_vm_resize() { echo "Before VM resize"; }
@@ -93,7 +93,7 @@ esac
 #!/bin/bash
 set -e
 
-# Post-Scale: intended to be ran after vertical scaling action. 
+# Post-Scale: intended to be ran after vertical scaling action.
 
 function after_vm_resize() { echo "After VM resize"; }
 function after_disk_attach() { echo "After disk attach"; }

client/src/main/python/slipstream/command/VerticalScaleCommandBase.py

@@ -61,8 +61,8 @@ def _validate_and_set_scale_options(self):
 
     def parse(self):
         usage = """%(prog)s %(usage_options)s
-<run>        Run ID. Run should be mutable and in Ready state.
-<node-name>  Node name to scale the instances of.
+<run>        Run ID. Run should be scalable and in Ready state.
+<node-name>  Node name of the instance to scale.
 <ids>        IDs of the node instances to scale.""" % {'prog': '%prog',
                                                        'usage_options': self._usage_options}
 
@@ -134,14 +134,14 @@ def _set_run_provisioning(self, client):
         client.put(self.run_url + '/ss:state', 'Provisioning')
 
     def _check_allowed_to_scale(self, client):
-        err_msg = "ERROR: Run should be mutable and in Ready state."
+        err_msg = "ERROR: Run should be scalable and in Ready state."
 
         ss_state = self._get_ss_state(client)
         if 'Ready' != ss_state:
             self.usageExit(err_msg + " Run is in %s state." % ss_state)
 
-        if not self._is_run_mutable():
-            self.usageExit(err_msg + " Run is not mutable.")
+        if not self._is_run_scalable():
+            self.usageExit(err_msg + " Run is not scalable.")
 
     def _get_ss_state(self, client):
         ss_state_url = self.run_url + "/" + NodeDecorator.globalNamespacePrefix + 'state'
@@ -152,6 +152,6 @@ def _retrieve_and_set_run(self, client):
         _, run_xml = client.get(self.run_url, 'application/xml')
         self.run_dom = etree.fromstring(run_xml)
 
-    def _is_run_mutable(self):
-        mutable = DomExtractor.extract_mutable_from_run(self.run_dom)
-        return util.str2bool(mutable)
+    def _is_run_scalable(self):
+        scalable = DomExtractor.extract_mutable_from_run(self.run_dom)
+        return util.str2bool(scalable)

client/src/main/python/ss-execute.py

@@ -108,11 +108,6 @@ def parse(self):
                                help='Launch a scalable application.',
                                default=False, action='store_true')
 
-        self.parser.add_option('--mutable-run',
-                               dest='scalable',
-                               help='deprecated: use --scalable',
-                               default=False, action='store_true')
-
         self.parser.add_option('--check-ssh-key',
                                dest='bypass_ssh_check',
                                help="Check if there is an SSH key in the user profile",

client/src/main/python/ss-node-add.py

@@ -28,7 +28,7 @@
 from slipstream.NodeDecorator import NodeDecorator
 
 class MainProgram(CommandBase):
-    '''A command-line program to add node instance(s) to a mutable deployment.'''
+    '''A command-line program to add node instance(s) to a scalable deployment.'''
 
     def __init__(self, argv=None):
         self.runId = None
@@ -46,11 +46,9 @@ def __init__(self, argv=None):
     def parse(self):
         usage = '''usage: %prog [options] <run> <node-name> [<number>]
 
-<run>        Run id of the mutable deployment to which to add instance(s).
-
+<run>        Run id of the scalable deployment to which to add instance(s).
 <node-name>  Node name to add instances to.
-
-<number>     Number of node instances to add to the mutable deployment run.
+<number>     Number of node instances to add to the scalable deployment run.
              By default, add one.
 
 <number-tolerate>   Max number of failed instances to tolerate.

client/src/main/python/ss-node-remove.py

@@ -27,7 +27,7 @@
 import slipstream.commands.NodeInstanceRuntimeParameter as NodeInstanceRuntimeParameter
 
 class MainProgram(CommandBase):
-    '''A command-line program to remove node instance(s) from a mutable deployment.'''
+    '''A command-line program to remove node instance(s) from a scalable deployment.'''
 
     def __init__(self, argv=None):
         self.runId = None
@@ -43,11 +43,9 @@ def __init__(self, argv=None):
     def parse(self):
         usage = '''usage: %prog [options] <run> <node-name> <ids> [<ids> ...]
 
-<run>        Run id of the mutable deployment from which to remove instance(s).
-
+<run>        Run id of the scalable deployment from which to remove instance(s).
 <node-name>  Node name to remove instances from.
-
-<ids>        Ids of the node instances to to remove from a mutable deployment run.'''
+<ids>        Ids of the node instances to to remove from a scalable deployment run.'''
 
         self.parser.usage = usage
         self.add_authentication_options()