Merge pull request #1726 from edsonarios/issue1722

Fix bug with command - slcli cdn edit

Author: allmightyspiff

SoftLayer/CLI/cdn/edit.py

@@ -19,6 +19,10 @@
               type=click.INT,
               help="HTTP port."
               )
+@click.option('--https-port', '-s',
+              type=click.INT,
+              help="HTTPS port."
+              )
 @click.option('--origin', '-o',
               type=click.STRING,
               help="Origin server address."
@@ -39,7 +43,7 @@
                    "the Dynamic content acceleration option is not added because this has a special configuration."
               )
 @environment.pass_env
-def cli(env, identifier, header, http_port, origin, respect_headers, cache, performance_configuration):
+def cli(env, identifier, header, http_port, https_port, origin, respect_headers, cache, performance_configuration):
     """Edit a CDN Account.
 
        Note: You can use the hostname or uniqueId as IDENTIFIER.
@@ -56,7 +60,7 @@ def cli(env, identifier, header, http_port, origin, respect_headers, cache, perf
         else:
             cache_result['cacheKeyQueryRule'] = cache[0]
 
-    cdn_result = manager.edit(cdn_id, header=header, http_port=http_port, origin=origin,
+    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,
                               performance_configuration=performance_configuration)
 
@@ -67,7 +71,10 @@ def cli(env, identifier, header, http_port, origin, respect_headers, cache, perf
     for cdn in cdn_result:
         table.add_row(['Create Date', cdn.get('createDate')])
         table.add_row(['Header', cdn.get('header')])
-        table.add_row(['Http Port', cdn.get('httpPort')])
+        if cdn.get('httpPort'):
+            table.add_row(['Http Port', cdn.get('httpPort')])
+        if cdn.get('httpsPort'):
+            table.add_row(['Https Port', cdn.get('httpsPort')])
         table.add_row(['Origin Type', cdn.get('originType')])
         table.add_row(['Performance Configuration', cdn.get('performanceConfiguration')])
         table.add_row(['Protocol', cdn.get('protocol')])

SoftLayer/managers/cdn.py

@@ -175,13 +175,14 @@ def end_date(self):
         """Retrieve the cdn usage metric end date."""
         return self._end_date
 
-    def edit(self, identifier, header=None, http_port=None, origin=None,
+    def edit(self, identifier, header=None, http_port=None, https_port=None, origin=None,
              respect_headers=None, cache=None, performance_configuration=None):
         """Edit the cdn object.
 
         :param string identifier: The CDN identifier.
         :param header: The cdn Host header.
         :param http_port: The cdn HTTP port.
+        :param https_port: The cdn HTTPS port.
         :param origin: The cdn Origin server address.
         :param respect_headers: The cdn Respect headers.
         :param cache: The cdn Cache key optimization.
@@ -199,17 +200,24 @@ def edit(self, identifier, header=None, http_port=None, origin=None,
             'vendorName': cdn_instance_detail.get('vendorName'),
             'cname': cdn_instance_detail.get('cname'),
             'domain': cdn_instance_detail.get('domain'),
-            'httpPort': cdn_instance_detail.get('httpPort'),
             'origin': cdn_instance_detail.get('originHost'),
             'header': cdn_instance_detail.get('header')
         }
+        if cdn_instance_detail.get('httpPort'):
+            config['httpPort'] = cdn_instance_detail.get('httpPort')
+
+        if cdn_instance_detail.get('httpsPort'):
+            config['httpsPort'] = cdn_instance_detail.get('httpsPort')
 
         if header:
             config['header'] = header
 
         if http_port:
             config['httpPort'] = http_port
 
+        if https_port:
+            config['httpsPort'] = https_port
+
         if origin:
             config['origin'] = origin