Remove sessions command, update services command.

racker · Mar 11, 2013 · ed35b7e · ed35b7e
1 parent d21f2c8
commit ed35b7e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 96 deletions.
diff --git a/service_registry_cli/commands/services/get.py b/service_registry_cli/commands/services/get.py
@@ -28,7 +28,7 @@
 
 class GetCommand(BaseShowCommand, ShowOne):
     """
-    Return a single session.
+    Return a single service.
     """
     log = logging.getLogger(__name__)
 
@@ -37,8 +37,9 @@ def take_action(self, parsed_args):
         value = client.services.get(parsed_args.object_id)
         metadata_str = format_metadata(value['metadata'])
         service_tuple = (value['id'],
-                         value['session_id'],
+                         value['heartbeat_timeout'],
+                         value['last_seen'],
                          ', '.join(value['tags']),
                          metadata_str)
-        return (('Service ID', 'Session ID', 'Tags', 'Metadata'),
-                service_tuple)
+        return (('Service ID', 'Heartbeat Timeout', 'Last Seen', 'Tags',
+                 'Metadata'), service_tuple)
diff --git a/service_registry_cli/commands/services/list.py b/service_registry_cli/commands/services/list.py
@@ -20,7 +20,7 @@
 from cliff.lister import Lister
 
 from service_registry_cli.utils import BaseListCommand, get_client
-from service_registry_cli.utils import format_metadata
+from service_registry_cli.utils import format_metadata, format_timestamp
 
 
 class ListCommand(BaseListCommand, Lister):
@@ -53,9 +53,10 @@ def take_action(self, parsed_args):
         parsed_args.returned_metadata = metadata
 
         service_tuples = [(value['id'],
-                          value['session_id'],
+                          value['heartbeat_timeout'],
+                          format_timestamp(value['last_seen']),
                           ', '.join(value['tags']),
                           format_metadata(value['metadata']))
                           for value in values]
-        return (('Service ID', 'Session ID', 'Tags', 'Metadata'),
-                service_tuples)
+        return (('Service ID', 'Heartbeat Timeout', 'Last Seen', 'Tags',
+                  'Metadata'), service_tuples)
diff --git a/service_registry_cli/commands/sessions/__init__.py b/service_registry_cli/commands/sessions/__init__.py
diff --git a/service_registry_cli/commands/sessions/get.py b/service_registry_cli/commands/sessions/get.py
diff --git a/service_registry_cli/commands/sessions/list.py b/service_registry_cli/commands/sessions/list.py