Merge pull request #50 from jamesottinger/unifynodebalancerconfigssl

ssl changes to /nodebalancers/$id/configs/$id/ssl and PUT /nodebalancers/$id/configs/$id

Author: Dorthu

src/data/endpoints/nodebalancers.yaml

@@ -212,10 +212,14 @@ endpoints:
             type: Boolean
             optional: true
             value: true
-          # ssl_cert:
-          #  description: SSL certificate served by the NodeBalancer when the protocol is "https".
-          # ssl_key:
-          #  description: Unpassphrased private key for the SSL certificate when the protocol is "https".
+          ssl_cert:
+            description: SSL certificate served by the NodeBalancer when the protocol is "https".
+            type: String
+            optional: true
+          ssl_key:
+            description: Unpassphrased private key for the SSL certificate when the protocol is "https".
+            type: String
+            optional: true
           cipher_suite:
             description: SSL cipher suite to enforce.
             type: Enum
@@ -282,27 +286,6 @@ endpoints:
           python: |
             nb_config = linode.NodeBalancerConfig(client, 456, 123) # linode_client, nodebalancer_config_id, nodebalancer_id
             nb_config.delete()
-  /nodebalancers/$id/configs/$id/ssl:
-    group: Configs
-    type: resource
-    authenticated: true
-    description: >
-      Add or update SSL certificate and https protocol to an existing config profile.
-    methods:
-      POST:
-        oauth: nodebalancers:modify
-        description: Adds/updates SSL certificates
-        examples:
-          curl: |
-            curl -H "Content-Type: application/json" \
-                -H "Authorization: Bearer $TOKEN" \
-                -X POST -d '{
-                  "ssl_cert": "----- BEGIN CERTIFICATE ----- < etc...> ----- END CERTIFICATE -----",
-                  "ssl_key": "----- BEGIN PRIVATE KEY ----- < etc...> ----- END PRIVATE KEY -----"
-                }' \
-                https://$api_root/$version/nodebalancers/$nodebalancer_id/configs/$config_id/ssl
-          python: |
-            # currently unimplemented
   /nodebalancers/$id/configs/$id/nodes:
     group: Configs
     authenticated: true

src/data/objects/nodebalancer_config.yaml

@@ -70,13 +70,23 @@ schema:
   ssl_commonname:
     editable: true
     type: String
-    value: 
+    value: "www.example.com"
     description: Common Name of the configured SSL certificate, if present.
   ssl_fingerprint:
     editable: true
     type: String
-    value: 
+    value: "00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33"
     description: SSL Certificate fingerprint, if present.
+  ssl_cert:
+    editable: true
+    type: String
+    value: 
+    description: SSL Certificate, if present.
+  ssl_key:
+    editable: true
+    type: String
+    value: 
+    description: SSL Key, if present.
   cipher_suite:
     editable: true
     type: Enum