From fbf8714df61d38f2606609d78bab663b04f323ca Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall@hp.com>
Date: Mon, 4 Mar 2013 13:29:36 +0000
Subject: [PATCH] Sync JSONSchemas

Change-Id: Ia9a67ce8d777fb5cc8bb711049174d707b79b407
---
 .../resources/schemas/v1/domain.json          |  6 ++++-
 .../resources/schemas/v1/record.json          | 19 +++++++++++--
 .../resources/schemas/v1/server.json          | 27 -------------------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/monikerclient/resources/schemas/v1/domain.json b/monikerclient/resources/schemas/v1/domain.json
index a056624..4eb2e9a 100644
--- a/monikerclient/resources/schemas/v1/domain.json
+++ b/monikerclient/resources/schemas/v1/domain.json
@@ -18,7 +18,8 @@
             "description": "Domain name",
             "format": "host-name",
             "maxLength": 255,
-            "required": true
+            "required": true,
+            "readonly": true
         },
         "email": {
             "type": "string",
@@ -56,6 +57,9 @@
     }, {
         "rel": "records",
         "href": "/domains/{id}/records"
+    }, {
+        "rel": "servers",
+        "href": "/domains/{id}/servers"
     }, {
         "rel": "collection",
         "href": "/domains"
diff --git a/monikerclient/resources/schemas/v1/record.json b/monikerclient/resources/schemas/v1/record.json
index 375e276..12c8f78 100644
--- a/monikerclient/resources/schemas/v1/record.json
+++ b/monikerclient/resources/schemas/v1/record.json
@@ -22,14 +22,14 @@
         "name": {
             "type": "string",
             "description": "DNS Record Name",
-            "pattern": "^(\\*\\.)?(([a-zA-Z0-9_]|[a-zA-Z0-9_][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9_]|[A-Za-z0-9_][A-Za-z0-9\\-]*[A-Za-z0-9])\\.$",
+            "format": "host-name",
             "maxLength": 255,
             "required": true
         },
         "type": {
             "type": "string",
             "description": "DNS Record Type",
-            "enum": ["A", "AAAA", "CNAME", "MX", "SRV", "TXT", "SPF", "NS", "PTR"],
+            "enum": ["A", "AAAA", "CNAME", "MX", "SRV", "TXT", "SPF", "NS", "PTR", "SSHFP"],
             "required": true
         },
         "data": {
@@ -191,6 +191,21 @@
                 "type": "null"
             }
         }
+    }, {
+        "description": "A SSHFP Record",
+        "properties": {
+            "type": {
+                "type": "string",
+                "enum": ["SSHFP"]
+            },
+            "data": {
+                "pattern": "^[1-2] 1 [0-9A-Fa-f]{40}$",
+                "required": true
+            },
+            "priority": {
+                "type": "null"
+            }
+        }
     }],
     "links": [{
         "rel": "self",
diff --git a/monikerclient/resources/schemas/v1/server.json b/monikerclient/resources/schemas/v1/server.json
index 25f6f1c..66e348c 100644
--- a/monikerclient/resources/schemas/v1/server.json
+++ b/monikerclient/resources/schemas/v1/server.json
@@ -20,16 +20,6 @@
             "maxLength": 255,
             "required": true
         },
-        "ipv4": {
-            "type": ["string", "null"],
-            "description": "IPv4 address of server",
-            "format": "ip-address"
-        },
-        "ipv6": {
-            "type": ["string", "null"],
-            "description": "IPv6 address of server",
-            "format": "ipv6"
-        },
         "created_at": {
             "type": "string",
             "description": "Date and time of server creation",
@@ -43,23 +33,6 @@
             "readonly": true
         }
     },
-    "anyOf": [{
-        "description": "IPv4",
-        "properties": {
-            "ipv4": {
-                "type": "string",
-                "required": true
-            }
-        }
-    }, {
-        "description": "IPv6",
-        "properties": {
-            "ipv6": {
-                "type": "string",
-                "required": true
-            }
-        }
-    }],
     "links": [{
         "rel": "self",
         "href": "/servers/{id}"