added --cache-description sub feature of cdn edit

Author: Ramkishor Chaladi

SoftLayer/CLI/cdn/edit.py

@@ -31,19 +31,25 @@
               type=click.Choice(['1', '0']),
               help="Respect headers. The value 1 is On and 0 is Off."
               )
-@click.option('--cache', '-c', multiple=True, type=str,
+@click.option('--cache', '-c', type=str,
               help="Cache key optimization. These are the valid options to choose: 'include-all', 'ignore-all', "
                    "'include-specified', 'ignore-specified'. If you select 'include-specified' or 'ignore-specified' "
-                   "please add a description too using again --cache, "
-                   "e.g --cache=include-specified --cache=description."
+                   "please add to option --cache-description.\n"
+                   " e.g --cache=include-specified --cache-description=description."
+              )
+@click.option('--cache-description', '-C', type=str,
+              help="In cache option, if you select 'include-specified' or 'ignore-specified', "
+                   "please add a description too using this option.\n"
+                   "e.g --cache include-specified --cache-description description."
               )
 @click.option('--performance-configuration', '-p',
               type=click.Choice(['General web delivery', 'Large file optimization', 'Video on demand optimization']),
               help="Optimize for, General web delivery', 'Large file optimization', 'Video on demand optimization', "
                    "the Dynamic content acceleration option is not added because this has a special configuration."
               )
 @environment.pass_env
-def cli(env, identifier, header, http_port, https_port, origin, respect_headers, cache, performance_configuration):
+def cli(env, identifier, header, http_port, https_port, origin, respect_headers, cache,
+        cache_description, performance_configuration):
     """Edit a CDN Account.
 
        Note: You can use the hostname or uniqueId as IDENTIFIER.
@@ -53,15 +59,14 @@ def cli(env, identifier, header, http_port, https_port, origin, respect_headers,
     cdn_id = helpers.resolve_id(manager.resolve_ids, identifier, 'CDN')
 
     cache_result = {}
-    if cache:
+    if cache or cache_description:
         if len(cache) > 1:
-            cache_result['cacheKeyQueryRule'] = cache[0]
-            cache_result['description'] = cache[1]
+            cache_result['cacheKeyQueryRule'] = cache
         else:
             cache_result['cacheKeyQueryRule'] = cache[0]
 
     cdn_result = manager.edit(cdn_id, header=header, http_port=http_port, https_port=https_port, origin=origin,
-                              respect_headers=respect_headers, cache=cache_result,
+                              respect_headers=respect_headers, cache=cache_result, cache_description=cache_description,
                               performance_configuration=performance_configuration)
 
     table = formatting.KeyValueTable(['name', 'value'])

SoftLayer/managers/cdn.py

@@ -175,7 +175,7 @@ def end_date(self):
         return self._end_date
 
     def edit(self, identifier, header=None, http_port=None, https_port=None, origin=None,
-             respect_headers=None, cache=None, performance_configuration=None):
+             respect_headers=None, cache=None, cache_description=None, performance_configuration=None):
         """Edit the cdn object.
 
         :param string identifier: The CDN identifier.
@@ -223,12 +223,12 @@ def edit(self, identifier, header=None, http_port=None, https_port=None, origin=
         if respect_headers:
             config['respectHeaders'] = respect_headers
 
-        if cache:
+        if cache or cache_description:
             if 'include-specified' in cache['cacheKeyQueryRule']:
-                cache_key_rule = self.get_cache_key_query_rule('include', cache)
+                cache_key_rule = self.get_cache_key_query_rule('include', cache_description)
                 config['cacheKeyQueryRule'] = cache_key_rule
             elif 'ignore-specified' in cache['cacheKeyQueryRule']:
-                cache_key_rule = self.get_cache_key_query_rule('ignore', cache)
+                cache_key_rule = self.get_cache_key_query_rule('ignore', cache_description)
                 config['cacheKeyQueryRule'] = cache_key_rule
             else:
                 config['cacheKeyQueryRule'] = cache['cacheKeyQueryRule']
@@ -254,18 +254,18 @@ def _get_ids_from_hostname(self, hostname):
         return result
 
     @staticmethod
-    def get_cache_key_query_rule(cache_type, cache):
+    def get_cache_key_query_rule(cache_type, cache_description):
         """Get the cdn object detail.
 
         :param string cache_type: Cache type.
         :param  cache: Cache description.
 
         :return: string value.
         """
-        if 'description' not in cache:
+        if cache_description is None:
             raise SoftLayer.SoftLayerError('Please add a description to be able to update the'
                                            ' cache.')
-        cache_result = '%s: %s' % (cache_type, cache['description'])
+        cache_result = '%s: %s' % (cache_type, cache_description)
 
         return cache_result