OpenStack: Add manifest tests for root volume AZs

This commit adds specific manifests tests to check Machines and
MachineSets manifests generating when Root Volume availability
zones are set.

scripts/openstack/manifest-tests/cinder-availability-zones/install-config.yaml

@@ -0,0 +1,45 @@
+apiVersion: v1
+baseDomain: shiftstack.example.com
+clusterID: manifests1
+controlPlane:
+  hyperthreading: Enabled
+  architecture: amd64
+  name: master
+  platform:
+    openstack:
+      type: ${COMPUTE_FLAVOR}
+      zones: ["MasterAZ1", "MasterAZ2", "MasterAZ3"]
+      rootVolume:
+        size: 30
+        type: performance
+        zones: ["VolumeAZ1", "VolumeAZ2", "VolumeAZ3"]
+  replicas: 10
+compute:
+- name: worker
+  platform:
+    openstack:
+      type: ${COMPUTE_FLAVOR}
+      zones: ["ComputeAZ1", "ComputeAZ2", "ComputeAZ3"]
+      rootVolume:
+        size: 30
+        type: performance
+        zones: ["VolumeAZ1", "VolumeAZ2", "VolumeAZ3"]
+  replicas: 1000
+metadata:
+  name: manifests1
+networking:
+  clusterNetwork:
+  - cidr: 10.128.0.0/14
+    hostPrefix: 23
+  machineNetwork:
+  - cidr: 10.0.128.0/17
+  networkType: OpenShiftSDN
+  serviceNetwork:
+  - 172.30.0.0/16
+platform:
+  openstack:
+    cloud: ${OS_CLOUD}
+    externalNetwork: ${EXTERNAL_NETWORK}
+    computeFlavor: ${COMPUTE_FLAVOR}  # deprecated in 4.7
+    lbFloatingIP: ${API_FIP}
+pullSecret: ${PULL_SECRET}

scripts/openstack/manifest-tests/cinder-availability-zones/test_machines.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+
+import sys
+import glob
+import yaml
+
+ASSETS_DIR = ""
+
+EXPECTED_MACHINES_NUMBER = 10
+EXPECTED_MASTER_ZONE_NAMES = ["MasterAZ1", "MasterAZ2", "MasterAZ3"]
+EXPECTED_VOLUME_ZONE_NAMES = ["VolumeAZ1", "VolumeAZ2", "VolumeAZ3"]
+
+
+class TestVolumeAZMachines(unittest.TestCase):
+    def setUp(self):
+        """Parse the Machines into a Python data structure."""
+        self.machines = []
+        for machine_path in glob.glob(
+                f'{ASSETS_DIR}/openshift/99_openshift-cluster-api_master-machines-*.yaml'
+        ):
+            with open(machine_path) as f:
+                self.machines.append(yaml.load(f, Loader=yaml.FullLoader))
+
+    def test_zone_names(self):
+        """Assert that all machines have one valid compute az that matches volume az."""
+        for machine in self.machines:
+            master_zone = machine["spec"]["providerSpec"]["value"]["availabilityZone"]
+            volume_zone = machine["spec"]["providerSpec"]["value"]["rootVolume"]["availabilityZone"]
+            self.assertIn(master_zone, EXPECTED_MASTER_ZONE_NAMES)
+            self.assertIn(volume_zone, EXPECTED_VOLUME_ZONE_NAMES)
+            self.assertEqual(master_zone[-3:], volume_zone[-3:])
+
+    def test_total_instance_number(self):
+        """Assert that there are as many Machines as required ControlPlane replicas."""
+        self.assertEqual(len(self.machines), EXPECTED_MACHINES_NUMBER)
+
+    def test_replica_distribution(self):
+        """Assert that machines are evenly distributed across volume azs."""
+        zones = {}
+        for machine in self.machines:
+            volume_zone = machine["spec"]["providerSpec"]["value"]["rootVolume"]["availabilityZone"]
+            zones[volume_zone] = zones.get(volume_zone, 0) + 1
+
+        setpoint = 0
+        for replicas in zones.values():
+            if setpoint == 0:
+                setpoint = replicas
+            else:
+                self.assertTrue(-2 < replicas - setpoint < 2)
+
+
+if __name__ == '__main__':
+    ASSETS_DIR = sys.argv.pop()
+    unittest.main(verbosity=2)

scripts/openstack/manifest-tests/cinder-availability-zones/test_machinesets.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import unittest
+
+import sys
+import glob
+import yaml
+
+ASSETS_DIR = ""
+
+EXPECTED_MACHINES_NUMBER = 1000
+EXPECTED_COMPUTE_ZONE_NAMES = ["ComputeAZ1", "ComputeAZ2", "ComputeAZ3"]
+EXPECTED_VOLUME_ZONE_NAMES = ["VolumeAZ1", "VolumeAZ2", "VolumeAZ3"]
+
+
+class TestVolumeAZMachinesets(unittest.TestCase):
+    def setUp(self):
+        """Parse the MachineSets into a Python data structure."""
+        self.machinesets = []
+        for machineset_path in glob.glob(
+                f'{ASSETS_DIR}/openshift/99_openshift-cluster-api_worker-machineset-*.yaml'
+        ):
+            with open(machineset_path) as f:
+                self.machinesets.append(yaml.load(f, Loader=yaml.FullLoader))
+
+    def test_machineset_zone_name(self):
+        """Assert that there is exactly one MachineSet per volume availability zone."""
+        found = []
+        for machineset in self.machinesets:
+            master_zone = machineset["spec"]["template"]["spec"]["providerSpec"]["value"]["availabilityZone"]
+            volume_zone = machineset["spec"]["template"]["spec"]["providerSpec"]["value"]["rootVolume"]["availabilityZone"]
+            self.assertIn(volume_zone, EXPECTED_VOLUME_ZONE_NAMES)
+            self.assertNotIn(volume_zone, found)
+            self.assertEqual(master_zone[-3:], volume_zone[-3:])
+            found.append(volume_zone)
+        self.assertEqual(len(self.machinesets), len(EXPECTED_VOLUME_ZONE_NAMES))
+
+    def test_total_replica_number(self):
+        """Assert that replicas spread across the MachineSets add up to the expected number."""
+        total_found = 0
+        for machineset in self.machinesets:
+            total_found += machineset["spec"]["replicas"]
+        self.assertEqual(total_found, EXPECTED_MACHINES_NUMBER)
+
+    def test_replica_distribution(self):
+        """Assert that replicas are evenly distributed across machinesets."""
+        setpoint = 0
+        for machineset in self.machinesets:
+            replicas = machineset["spec"]["replicas"]
+            if setpoint == 0:
+                setpoint = replicas
+            else:
+                self.assertTrue(-2 < replicas - setpoint < 2)
+
+
+if __name__ == '__main__':
+    ASSETS_DIR = sys.argv.pop()
+    unittest.main(verbosity=2)