Refactor cdn network.

Author: Fernando Ojeda

SoftLayer/CLI/cdn/load.py

@@ -28,6 +28,8 @@
         "originType": "HOST_SERVER",
         "path": "/example",
         "status": "RUNNING",
+        "bucketName": "test-bucket",
+        'fileExtension': 'jpg',
         "performanceConfiguration": "General web delivery"
     }
 ]

SoftLayer/fixtures/SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path.py

@@ -96,7 +96,7 @@ def add_origin(self, unique_id, origin, path, origin_type="server", header=None,
             'uniqueId': unique_id,
             'path': path,
             'origin': origin,
-            'originType': types.get(origin_type, 'HOST_SERVER'),
+            'originType': types.get(origin_type),
             'httpPort': port,
             'protocol': protocol.upper(),
             'performanceConfiguration': performance_config.get(optimize_for, 'General web delivery'),
@@ -109,8 +109,6 @@ def add_origin(self, unique_id, origin, path, origin_type="server", header=None,
         if types.get(origin_type) == 'OBJECT_STORAGE':
             if bucket_name:
                 new_origin['bucketName'] = bucket_name
-            else:
-                raise exceptions.SoftLayerError("Bucket name is required when the origin type is OBJECT_STORAGE")
 
             if file_extensions:
                 new_origin['fileExtension'] = file_extensions

SoftLayer/fixtures/SoftLayer_Network_ContentDelivery_Account.py

@@ -7,6 +7,7 @@
 import json
 
 from SoftLayer import testing
+from SoftLayer.CLI import exceptions
 
 
 class CdnTests(testing.TestCase):
@@ -61,9 +62,30 @@ def test_list_origins(self):
                                                       'Path': '/example1',
                                                       'Status': 'RUNNING'}])
 
-    def test_add_origin(self):
-        result = self.run_command(['cdn', 'origin-add', '-H=test.example.com', '-p', 80, '-o', 'web', '-c=include-all',
-                                   '1234', '10.10.10.1', '/example/videos2'])
+    def test_add_origin_server(self):
+        result = self.run_command(
+            ['cdn', 'origin-add', '-t', 'server', '-H=test.example.com', '-p', 80, '-o', 'web', '-c=include-all',
+             '1234', '10.10.10.1', '/example/videos2'])
+
+        self.assert_no_fail(result)
+
+    def test_add_origin_storage(self):
+        result = self.run_command(['cdn', 'origin-add', '-t', 'storage', '-b=test-bucket', '-H=test.example.com',
+                                   '-p', 80, '-o', 'web', '-c=include-all', '1234', '10.10.10.1', '/example/videos2'])
+
+        self.assert_no_fail(result)
+
+    def test_add_origin_without_storage(self):
+        result = self.run_command(['cdn', 'origin-add', '-t', 'storage', '-H=test.example.com', '-p', 80,
+                                   '-o', 'web', '-c=include-all', '1234', '10.10.10.1', '/example/videos2'])
+
+        self.assertEqual(result.exit_code, 2)
+        self.assertIsInstance(result.exception, exceptions.ArgumentError)
+
+    def test_add_origin_storage_with_file_extensions(self):
+        result = self.run_command(
+            ['cdn', 'origin-add', '-t', 'storage', '-b=test-bucket', '-e', 'jpg', '-H=test.example.com', '-p', 80,
+             '-o', 'web', '-c=include-all', '1234', '10.10.10.1', '/example/videos2'])
 
         self.assert_no_fail(result)
 

SoftLayer/managers/cdn.py

@@ -5,9 +5,9 @@
     :license: MIT, see LICENSE for more details.
 """
 
-from SoftLayer.managers import cdn
 from SoftLayer import testing
 from SoftLayer import utils
+from SoftLayer.managers import cdn
 
 
 class CDNTests(testing.TestCase):
@@ -70,6 +70,28 @@ def test_add_origin(self):
                                 'createOriginPath',
                                 args=args)
 
+    def test_add_origin_with_bucket_and_file_extension(self):
+        self.cdn_client.add_origin("12345", "10.10.10.1", "/example/videos", origin_type="storage",
+                                   bucket_name="test-bucket", file_extensions="jpg", header="test.example.com", port=80,
+                                   protocol='http', optimize_for="web", cache_query="include all")
+
+        args = ({
+                    'uniqueId': "12345",
+                    'origin': '10.10.10.1',
+                    'path': '/example/videos',
+                    'originType': 'OBJECT_STORAGE',
+                    'header': 'test.example.com',
+                    'httpPort': 80,
+                    'protocol': 'HTTP',
+                    'bucketName': 'test-bucket',
+                    'fileExtension': 'jpg',
+                    'performanceConfiguration': 'General web delivery',
+                    'cacheKeyQueryRule': "include all"
+                },)
+        self.assert_called_with('SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path',
+                                'createOriginPath',
+                                args=args)
+
     def test_remove_origin(self):
         self.cdn_client.remove_origin("12345", "/example1")