Refactor the cdn edit option.

Author: Fernando

SoftLayer/CLI/cdn/edit.py

@@ -20,7 +20,6 @@
               help="HTTP port."
               )
 @click.option('--origin', '-o',
-              required=True,
               type=click.STRING,
               help="Origin server address."
               )
@@ -43,7 +42,7 @@
 def cli(env, identifier, header, http_port, origin, respect_headers, cache, performance_configuration):
     """Edit a CDN Account.
 
-       You can use the hostname or uniqueId as IDENTIFIER.
+       Note: You can use the hostname or uniqueId as IDENTIFIER.
     """
 
     manager = SoftLayer.CDNManager(env.client)
@@ -77,5 +76,6 @@ def cli(env, identifier, header, http_port, origin, respect_headers, cache, perf
         table.add_row(['Vendor Name', cdn.get('vendorName')])
         table.add_row(['Cache key optimization', cdn.get('cacheKeyQueryRule')])
         table.add_row(['cname', cdn.get('cname')])
+        table.add_row(['Origin server address', cdn.get('originHost')])
 
     env.fout(table)

SoftLayer/managers/cdn.py

@@ -199,7 +199,8 @@ 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')
+            'httpPort': cdn_instance_detail.get('httpPort'),
+            'origin': cdn_instance_detail.get('originHost')
         }
 
         if header:

tests/CLI/modules/cdn_tests.py

@@ -97,36 +97,32 @@ def test_remove_origin(self):
         self.assertEqual(result.output, "Origin with path /example1 has been deleted\n")
 
     def test_edit_header(self):
-        result = self.run_command(['cdn', 'edit', 'test.example.com',
-                                   '--origin=10.34.12.125', '--header=www.test.com'])
+        result = self.run_command(['cdn', 'edit', 'test.example.com', '--header=www.test.com'])
         self.assert_no_fail(result)
         header_result = json.loads(result.output)
         self.assertEqual('www.test.com', header_result['Header'])
 
     def test_edit_http_port(self):
-        result = self.run_command(['cdn', 'edit', 'test.example.com',
-                                   '--origin=10.34.12.125', '--http-port=83'])
+        result = self.run_command(['cdn', 'edit', 'test.example.com', '--http-port=83'])
         self.assert_no_fail(result)
         header_result = json.loads(result.output)
         self.assertEqual(83, header_result['Http Port'])
 
     def test_edit_respect_headers(self):
-        result = self.run_command(['cdn', 'edit', 'test.example.com',
-                                   '--origin=10.34.12.125', '--respect-headers=1'])
+        result = self.run_command(['cdn', 'edit', 'test.example.com', '--respect-headers=1'])
         self.assert_no_fail(result)
         header_result = json.loads(result.output)
         self.assertEqual(True, header_result['Respect Headers'])
 
     def test_edit_cache(self):
-        result = self.run_command(['cdn', 'edit', 'test.example.com',
-                                   '--origin=10.34.12.125', '--cache', 'include-specified', '--cache', 'test'])
+        result = self.run_command(['cdn', 'edit', 'test.example.com', '--cache', 'include-specified',
+                                   '--cache', 'test'])
         self.assert_no_fail(result)
         header_result = json.loads(result.output)
         self.assertEqual('include: test', header_result['Cache key optimization'])
 
     def test_edit_cache_by_uniqueId(self):
-        result = self.run_command(['cdn', 'edit', '9934111111111',
-                                   '--origin=10.34.12.125', '--cache', 'include-specified', '--cache', 'test'])
+        result = self.run_command(['cdn', 'edit', '9934111111111', '--cache', 'include-specified', '--cache', 'test'])
         self.assert_no_fail(result)
         header_result = json.loads(result.output)
         self.assertEqual('include: test', header_result['Cache key optimization'])

tests/managers/cdn_tests.py

@@ -107,8 +107,7 @@ def test_purge_content(self):
     def test_cdn_edit(self):
         identifier = '9934111111111'
         header = 'www.test.com'
-        origin = '1.1.1.1'
-        result = self.cdn_client.edit(identifier, header=header, origin=origin)
+        result = self.cdn_client.edit(identifier, header=header)
 
         self.assertEqual(fixtures.SoftLayer_Network_CdnMarketplace_Configuration_Mapping.
                          updateDomainMapping, result)