Added 'username', 'abort', 'service_url', 'clouds' and removed 'cloud' from Deployment

* Retrieving username and abort status of deployments

* retrieving username and abort status

* retrieving ss:url.service for deployments

* Minor code improvement

7 times faster xml searching
4 lines less

* Provide the list of Clouds a deployment is involved in ...
... instead of providing a CSV string.

* Renamed 'service' to 'service_url'

Author: bryan-brancotte

src/slipstream/api/api.py

@@ -376,7 +376,11 @@ def list_deployments(self, inactive=False):
                                     status=elem.get('status').lower(),
                                     started_at=elem.get('startTime'),
                                     last_state_change=elem.get('lastStateChangeTime'),
-                                    cloud=elem.get('cloudServiceNames'))
+                                    cloud=elem.get('cloudServiceNames'),
+                                    username=elem.get('username'),
+                                    abort=elem.get('abort'),
+                                    service_url=elem.get('serviceUrl'),
+                                    )
 
     def get_deployment(self, deployment_id):
         """
@@ -387,12 +391,20 @@ def get_deployment(self, deployment_id):
 
         """
         root = self._xml_get('/run/' + str(deployment_id))
+
+        abort = root.findtext('runtimeParameters/entry/runtimeParameter[@key="ss:abort"]')
+        service_url = root.findtext('runtimeParameters/entry/runtimeParameter[@key="ss:url.service"]')
+
         return models.Deployment(id=uuid.UUID(root.get('uuid')),
                                  module=_mod(root.get('moduleResourceUri')),
                                  status=root.get('state').lower(),
                                  started_at=root.get('startTime'),
                                  last_state_change=root.get('lastStateChangeTime'),
-                                 cloud=root.get('cloudServiceNames'))
+                                 clouds=root.get('cloudServiceNames','').split(','),
+                                 username=root.get('user'),
+                                 abort=abort,
+                                 service_url=service_url,
+                                 )
 
     def list_virtualmachines(self, deployment_id=None, offset=0, limit=20):
         """

src/slipstream/api/models.py

@@ -15,7 +15,10 @@
     'status',
     'started_at',
     'last_state_change',
-    'cloud',
+    'clouds',
+    'username',
+    'abort',
+    'service_url',
 ])
 
 Component = collections.namedtuple('Component', [