Fixes a couple mq CLI issues

sudorandom · sudorandom · commit 56f37be07f11 · 2014-10-24T11:38:15.000-05:00
diff --git a/SoftLayer/CLI/core.py b/SoftLayer/CLI/core.py
@@ -75,6 +75,7 @@ class CliClient(SoftLayer.Client):
 
     def __init__(self, client, *args, **kwargs):
         self.real_client = client
+        self.auth = client.auth
         self.last_calls = []
         # NOTE(kmcdonald): I really don't like this pattern.
 
diff --git a/SoftLayer/CLI/mq/queue_add.py b/SoftLayer/CLI/mq/queue_add.py
@@ -24,23 +24,20 @@
               type=click.INT,
               default=604800,
               help="Time in seconds that messages will live")
-@click.option('--tags', help="Comma-separated list of tags")
+@click.option('--tag', '-g', multiple=True, help="Tags to add to the queue")
 @environment.pass_env
 def cli(env, account_id, queue_name, datacenter, network, visibility_interval,
-        expiration, tags):
+        expiration, tag):
     """Create a queue."""
 
     manager = SoftLayer.MessagingManager(env.client)
     mq_client = manager.get_connection(account_id,
                                        datacenter=datacenter, network=network)
-    tag_list = None
-    if tags:
-        tag_list = [tag.strip() for tag in tags.split(',')]
 
     queue = mq_client.create_queue(
         queue_name,
         visibility_interval=visibility_interval,
         expiration=expiration,
-        tags=tag_list,
+        tags=tag,
     )
     return mq.queue_table(queue)
diff --git a/SoftLayer/CLI/mq/queue_edit.py b/SoftLayer/CLI/mq/queue_edit.py
@@ -24,23 +24,20 @@
               type=click.INT,
               default=604800,
               help="Time in seconds that messages will live")
-@click.option('--tags', help="Comma-separated list of tags")
+@click.option('--tag', '-g', multiple=True, help="Tags to add to the queue")
 @environment.pass_env
 def cli(env, account_id, queue_name, datacenter, network, visibility_interval,
-        expiration, tags):
+        expiration, tag):
     """Modify a queue."""
 
     manager = SoftLayer.MessagingManager(env.client)
     mq_client = manager.get_connection(account_id,
                                        datacenter=datacenter, network=network)
-    tag_list = None
-    if tags:
-        tag_list = [tag.strip() for tag in tags.split(',')]
 
     queue = mq_client.modify_queue(
         queue_name,
         visibility_interval=visibility_interval,
         expiration=expiration,
-        tags=tag_list,
+        tags=tag,
     )
     return mq.queue_table(queue)
diff --git a/SoftLayer/CLI/mq/topic_add.py b/SoftLayer/CLI/mq/topic_add.py
@@ -24,24 +24,20 @@
               type=click.INT,
               default=604800,
               help="Time in seconds that messages will live")
-@click.option('--tags', help="Comma-separated list of tags")
+@click.option('--tag', '-g', multiple=True, help="Tags to add to the topic")
 @environment.pass_env
 def cli(env, account_id, topic_name, datacenter, network,
-        visibility_interval, expiration, tags):
+        visibility_interval, expiration, tag):
     """Create a new topic."""
 
     manager = SoftLayer.MessagingManager(env.client)
     mq_client = manager.get_connection(account_id,
                                        datacenter=datacenter, network=network)
 
-    tag_list = None
-    if tags:
-        tag_list = [tag.strip() for tag in tags.split(',')]
-
     topic = mq_client.create_topic(
         topic_name,
         visibility_interval=visibility_interval,
         expiration=expiration,
-        tags=tag_list,
+        tags=tag,
     )
     return mq.topic_table(topic)
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,4 +1,4 @@
 requests
 click
 prettytable >= 0.7.0
-six >= 1.7.0
+six >= 1.7.0
