Merge pull request #5 from racker/remove_session_commands

Remove session commands

README.md

@@ -4,7 +4,6 @@ Command line client for Rackspace Service Registry. The client currently allows
 users to:
 
 * view account limits
-* view display active sessions
 * vite active services
 * view events
 * view, set and remove configuration values

service_registry_cli/__init__.py

@@ -15,4 +15,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '0.1.15'
+__version__ = '0.2.0'

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)

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)

service_registry_cli/utils.py

@@ -19,7 +19,9 @@
 from cliff.command import Command
 from cliff.lister import Lister
 
-from service_registry import Client
+from service_registry.client import Client
+
+SERVICE_EVENTS = ['service.join', 'service.timeout', 'service.remove']
 
 
 class BaseCommand(Command):
@@ -101,23 +103,21 @@ def format_timestamp(timestamp):
 
 def format_event_payload(event_response):
     event_payload_str = ''
+    event_type = event_response['type']
     event_payload = event_response['payload']
-    if event_payload == []:
-        event_payload_str = ''
+
+    if not event_payload:
         return event_payload_str
-    if event_response['type'] in ['service.join', 'services.timeout']:
-        if event_response['type'] == 'service.join':
-            event_payload = [event_payload]
-
-        for service in event_payload:
-            for key, value in service.iteritems():
-                if key == 'metadata':
-                    metadata_str = format_metadata(value)
-                    event_payload_str += 'metadata: %s\n' % (metadata_str)
-                elif key == 'tags':
-                    event_payload_str += '%s: %s\n' % (key, ', '.join(value))
-                else:
-                    event_payload_str += '%s: %s\n' % (key, value)
+
+    if event_type in SERVICE_EVENTS:
+        for key, value in event_payload.iteritems():
+            if key == 'metadata':
+                metadata_str = format_metadata(value)
+                event_payload_str += 'metadata: %s\n' % (metadata_str)
+            elif key == 'tags':
+                event_payload_str += '%s: %s\n' % (key, ', '.join(value))
+            else:
+                event_payload_str += '%s: %s\n' % (key, value)
     else:
         for key, value in event_payload.iteritems():
             event_payload_str += '%s: %s\n' % (key, value)

setup.py

@@ -73,7 +73,7 @@ def run(self):
         'cliff >= 1.2.2-dev',
         'cliff-tablib >= 1.0',
         'cliff-rackspace >= 0.1.1',
-        'service-registry == 0.1.9'
+        'service-registry >= 0.2.0, < 0.3.0'
     ],
     dependency_links = [
         'https://github.com/Kami/cliff/tarball/dev#egg=cliff-1.2.2-dev'