Augment document schemas

- Update schemas to add some missing allowed properties
- Use additionalProperties field to enforce structure of storage
  devices and network interfaces
- Remove duplicate unit tests

Change-Id: I8fb98205bc4a99208fc0e26a5724f6c0960a8278

drydock_provisioner/schemas/baremetalNode.yaml

@@ -10,30 +10,155 @@ data:
   id: 'http://att.com/att-comdev/drydock/baremetalNode.yaml'
   type: 'object'
   properties:
-    host_profile:
-      type: 'string'
-    interfaces:
-      type: 'object'
-      properties:
-        bond0:
-          type: 'object'
-          properties:
-            networks:
-              type: 'array'
-              items:
-                type: 'string'
     addressing:
       type: 'array'
       items:
         type: 'object'
         properties:
-          network:
-            type: 'string'
           address:
             type: 'string'
+          network:
+            type: 'string'
+    oob:
+      type: 'object'
+      properties:
+        type:
+          type: 'string'
+        network:
+          type: 'string'
+        account:
+          type: 'string'
+        credetial:
+          type: 'string'
+      additionalProperties: true
+    storage:
+      type: 'object'
+      properties:
+        physical_devices:
+          type: 'object'
+          additionalProperties:
+            type: 'object'
+            properties:
+              labels:
+                type: 'object'
+                additionalProperties:
+                  type: 'string'
+              volume_group:
+                type: 'string'
+              partitions:
+                type: 'array'
+                items:
+                  type: 'object'
+                  properties:
+                    name:
+                      type: 'string'
+                    size:
+                      type: 'string'
+                    part_uuid:
+                      type: 'string'
+                    volume_group:
+                      type: 'string'
+                    labels:
+                      type: 'object'
+                      additionalProperties:
+                        type: 'string'
+                    bootable:
+                      type: 'boolean'
+                    volume_group:
+                      type: 'string'
+                    filesystem:
+                      type: 'object'
+                      properties:
+                        mountpoint:
+                          type: 'string'
+                        fstype:
+                          type: 'string'
+                        mount_options:
+                          type: 'string'
+                        fs_uuid:
+                          type: 'string'
+                        fs_label:
+                          type: 'string'
+                      additionalProperties: false
+                  additionalProperties: false
+        volume_groups:
+          type: 'object'
+          additionalProperties:
+            type: 'object'
+            properties:
+              vg_uuid:
+                type: 'string'
+              logical_volumes:
+                type: 'array'
+                items:
+                  type: 'object'
+                  properties:
+                    name:
+                      type: 'string'
+                    lv_uuid:
+                      type: 'string'
+                    size:
+                      type: 'string'
+                    filesystem:
+                      type: 'object'
+                      properties:
+                        mountpoint:
+                          type: 'string'
+                        fstype:
+                          type: 'string'
+                        mount_options:
+                          type: 'string'
+                        fs_uuid:
+                          type: 'string'
+                        fs_label:
+                          type: 'string'
+    platform:
+      type: 'object'
+      properties:
+        image:
+          type: 'string'
+        kernel:
+          type: 'string'
+        kernel_params:
+          type: 'object'
+          additionalProperties: true
+      additionalProperties: false
     metadata:
       type: 'object'
       properties:
+        tags:
+          type: 'array'
+          items:
+            type: 'string'
+        owner_data:
+          type: 'object'
+          additionalProperties:
+            type: 'string'
         rack:
           type: 'string'
+        boot_mac:
+          type: 'string'
       additionalProperties: false
+    host_profile:
+      type: 'string'
+    hardware_profile:
+      type: 'string'
+    primary_network:
+      type: 'string'
+    interfaces:
+      type: 'object'
+      additionalProperties:
+        type: 'object'
+        properties:
+          device_link:
+           type: 'string'
+          slaves:
+            type: 'array'
+            items:
+              type: 'string'
+          networks:
+            type: 'array'
+            items:
+              type: 'string'
+  additionalProperties: false
+...

drydock_provisioner/schemas/hardwareProfile.yaml

@@ -33,11 +33,5 @@ data:
       type: 'number'
     device_aliases:
       type: 'object'
-      properties:
+      additionalProperties: true
-        address:
-          type: 'string'
-        dev_type:
-          type: 'string'
-        bus_type:
-          type: 'string'
   additionalProperties: false

drydock_provisioner/schemas/hostProfile.yaml

@@ -21,19 +21,20 @@ data:
           type: 'string'
         credetial:
           type: 'string'
+      additionalProperties: true
     storage:
       type: 'object'
       properties:
         physical_devices:
           type: 'object'
-          properties:
+          additionalProperties:
-            sda:
             type: 'object'
             properties:
               labels:
                 type: 'object'
-                  properties:
+                additionalProperties:
-                    role:
+                  type: 'string'
+              volume_group:
                 type: 'string'
               partitions:
                 type: 'array'
@@ -44,8 +45,18 @@ data:
                       type: 'string'
                     size:
                       type: 'string'
+                    part_uuid:
+                      type: 'string'
+                    volume_group:
+                      type: 'string'
+                    labels:
+                      type: 'object'
+                      additionalProperties:
+                        type: 'string'
                     bootable:
                       type: 'boolean'
+                    volume_group:
+                      type: 'string'
                     filesystem:
                       type: 'object'
                       properties:
@@ -55,17 +66,19 @@ data:
                           type: 'string'
                         mount_options:
                           type: 'string'
-            sdb:
+                        fs_uuid:
-              type: 'object'
-              properties:
-                volume_group:
                           type: 'string'
+                        fs_label:
+                          type: 'string'
+                      additionalProperties: false
+                  additionalProperties: false
         volume_groups:
           type: 'object'
-          properties:
+          additionalProperties:
-            log_vg:
             type: 'object'
             properties:
+              vg_uuid:
+                type: 'string'
               logical_volumes:
                 type: 'array'
                 items:
@@ -73,6 +86,8 @@ data:
                   properties:
                     name:
                       type: 'string'
+                    lv_uuid:
+                      type: 'string'
                     size:
                       type: 'string'
                     filesystem:
@@ -84,6 +99,10 @@ data:
                           type: 'string'
                         mount_options:
                           type: 'string'
+                        fs_uuid:
+                          type: 'string'
+                        fs_label:
+                          type: 'string'
     platform:
       type: 'object'
       properties:
@@ -93,11 +112,8 @@ data:
           type: 'string'
         kernel_params:
           type: 'object'
-          properties:
+          additionalProperties: true
-            quiet:
+      additionalProperties: false
-              type: 'boolean'
-            console:
-              type: 'string'
     metadata:
       type: 'object'
       properties:
@@ -107,9 +123,13 @@ data:
             type: 'string'
         owner_data:
           type: 'object'
-          properties:
+          additionalProperties:
-            foo:
             type: 'string'
+        rack:
+          type: 'string'
+        boot_mac:
+          type: 'string'
+      additionalProperties: false
     host_profile:
       type: 'string'
     hardware_profile:
@@ -118,27 +138,7 @@ data:
       type: 'string'
     interfaces:
       type: 'object'
-      properties:
+      additionalProperties:
-        pxe:
-          type: 'object'
-          properties:
-            device_link:
-              type: 'string'
-            labels:
-              type: 'object'
-              properties:
-                nonconfig:
-                  type: 'boolean'
-            slaves:
-              type: 'array'
-              items:
-                type: 'string'
-            networks:
-              type: 'array'
-              items:
-                type: 'string'
-
-        bond0:
         type: 'object'
         properties:
           device_link:
@@ -152,3 +152,4 @@ data:
             items:
               type: 'string'
   additionalProperties: false
+...

drydock_provisioner/schemas/network.yaml

@@ -10,11 +10,8 @@ data:
   id: 'http://att.com/att-comdev/drydock/network.yaml'
   type: 'object'
   properties:
-    allocation:
-      type: 'string'
     cidr:
       type: 'string'
-      format: 'ipv4'
     ranges:
       type: 'array'
       items:
@@ -28,6 +25,7 @@ data:
           end:
             type: 'string'
             format: 'ipv4'
+        additionalProperties: false
     dns:
       type: 'object'
       properties:
@@ -35,7 +33,7 @@ data:
           type: 'string'
         servers:
           type: 'string'
-          format: 'ipv4'
+      additionalProperties: false
     dhcp_relay:
       type: 'object'
       properties:
@@ -45,6 +43,7 @@ data:
         upstream_target:
           type: 'string'
           format: 'ipv4'
+      additionalProperties: false
     mtu:
       type: 'number'
     vlan:
@@ -56,10 +55,13 @@ data:
         properties:
           subnet:
             type: 'string'
-            format: 'ipv4'
           gateway:
             type: 'string'
             format: 'ipv4'
           metric:
             type: 'number'
         additionalProperties: false
+    labels:
+      type: 'object'
+      additionalProperties: true
+  additionalProperties: false

drydock_provisioner/schemas/networkLink.yaml

@@ -19,6 +19,13 @@ data:
           type: 'string'
         peer_rate:
           type: 'string'
+        mon_rate:
+          type: 'number'
+        up_delay:
+          type: 'number'
+        down_delay:
+          type: 'number'
+      additionalProperties: false
     mtu:
       type: 'number'
     linkspeed:
@@ -30,8 +37,12 @@ data:
           type: 'string'
         default_network:
           type: 'string'
+      additionalProperties: false
     allowed_networks:
       type: 'array'
       items:
         type: 'string'
+    labels:
+      type: 'object'
+      additionalProperties: true
   additionalProperties: false

drydock_provisioner/schemas/rack.yaml

@@ -30,4 +30,7 @@ data:
       type: 'array'
       items:
         type: 'string'
+    labels:
+      type: 'object'
+      additionalProperties: true
   additionalProperties: false

tests/yaml_samples/fullsite.yaml

@@ -151,7 +151,6 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  allocation: static
   cidr: 172.16.100.0/24
   ranges:
     - type: static

tests/yaml_samples/fullsite_networks.yaml

@@ -98,7 +98,6 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  allocation: static
   cidr: 172.16.100.0/24
   ranges:
   - type: static
@@ -119,8 +118,6 @@ metadata:
 spec:
     # Layer 2 VLAN segment id, could support other segmentations. Optional
   vlan_id: '99'
-    # How are addresses assigned?
-  allocation: dhcp
     # MTU for this VLAN interface, if not specified it will be inherited from the link
   mtu: 1500
     # Network address
@@ -148,7 +145,6 @@ metadata:
 spec:
   vlan_id: '100'
     # How are addresses assigned?
-  allocation: static
     # Allow MTU to be inherited from link the network rides on
   mtu: 1500
     # Network address
@@ -182,7 +178,6 @@ metadata:
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
   vlan_id: '101'
-  allocation: static
   mtu: 9000
   cidr: 172.16.2.0/24
     # Desribe IP address ranges
@@ -207,7 +202,6 @@ metadata:
 spec:
   vlan_id: '102'
     # How are addresses assigned?
-  allocation: static
     # MTU size for the VLAN interface
   mtu: 1500
   cidr: 172.16.3.0/24

tests/yaml_samples/invalid.yaml

@@ -11,7 +11,6 @@ metadata:
 spec:
   vlan_id: '102'
     # How are addresses assigned?
-  allocation: static
     # MTU size for the VLAN interface
   mtu: 1500
   cidr: 172.16.3.0/24

tests/yaml_samples/invalid_hostProfile2.yaml

@@ -8,5 +8,14 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  foo: bar
+  storage:
+    physical_devices:
+      sda:
+        labels:
+          a: 'b'
+        volume_group: 'a'
+        partitions:
+          - name: 'test'
+            size: '100%'
+      sdb: 'invalid_device'
 ...

tests/yaml_samples/network.yaml

@@ -8,7 +8,6 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  allocation: static
   cidr: 172.16.100.0/24
   ranges:
     - type: static

tests/yaml_samples/oob.yaml

@@ -53,7 +53,6 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  allocation: static
   cidr: 172.16.100.0/24
   ranges:
   - type: static

tests/yaml_samples/singledoc.yaml

@@ -8,7 +8,6 @@ metadata:
   author: sh8121@att.com
   description: Describe layer 2/3 attributes. Primarily CIs used for configuring server interfaces
 spec:
-  allocation: static
   cidr: 172.16.100.0/24
   ranges:
   - type: static