Merge "Add ability to specify multiple search domains"

os_net_config/impl_ifcfg.py

@@ -610,7 +610,10 @@ class IfcfgNetConfig(os_net_config.NetConfig):
                 if len(base_opt.dns_servers) > 2:
                     logger.warning('ifcfg format supports max 2 resolvers.')
         if base_opt.domain:
-            data += "DOMAIN=%s\n" % base_opt.domain
+            if type(base_opt.domain) == list:
+                data += "DOMAIN=\"%s\"\n" % ' '.join(base_opt.domain)
+            else:
+                data += "DOMAIN=%s\n" % base_opt.domain
         return data
 
     def _add_routes(self, interface_name, routes=[]):

os_net_config/schema.yaml

@@ -117,6 +117,14 @@ definitions:
         pattern: >-
           ^(?=^.{1,255}$)(?!.*\.\..*)(.{1,63}\.)+(.{0,63}\.?)|(?!\.)(?!.*\.\..*)(^.{1,63}$)|(^\.$)$
 
+    list_of_domain_name_string_or_domain_name_string:
+        oneOf:
+          - type: array
+            items:
+                $ref: "#/definitions/domain_name_string"
+            minItems: 0
+          - $ref: "#/definitions/domain_name_string"
+
     # os-net-config derived types
     address:
         type: object
@@ -282,7 +290,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -348,7 +356,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
             link_mode:
                 $ref: "#/definitions/sriov_link_mode_or_param"
         required:
@@ -412,7 +420,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - device
@@ -458,7 +466,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
             ovs_options:
                 $ref: "#/definitions/ovs_options_string_or_param"
             ovs_extra:
@@ -521,7 +529,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -580,7 +588,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -635,7 +643,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -687,7 +695,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -738,7 +746,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -790,7 +798,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -850,7 +858,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -896,7 +904,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -941,7 +949,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
             members:
                 type: array
                 items:
@@ -1102,7 +1110,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -1154,7 +1162,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -1204,7 +1212,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name
@@ -1250,7 +1258,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - members
@@ -1295,7 +1303,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - vlan_id
@@ -1343,7 +1351,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - options
@@ -1389,7 +1397,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - vlan_id
@@ -1434,7 +1442,7 @@ definitions:
             onboot:
                 $ref: "#/definitions/bool_or_param"
             domain:
-                $ref: "#/definitions/domain_name_string"
+                $ref: "#/definitions/list_of_domain_name_string_or_domain_name_string"
         required:
           - type
           - name

os_net_config/tests/test_impl_ifcfg.py

@@ -1235,7 +1235,7 @@ DNS2=5.6.7.8
 """
         self.assertEqual(em1_config, self.get_interface_config('em1'))
 
-    def test_interface_domain(self):
+    def test_interface_single_domain(self):
         interface1 = objects.Interface('em1', dns_servers=['1.2.3.4'],
                                        domain='openstack.local')
         self.provider.add_interface(interface1)
@@ -1247,6 +1247,38 @@ NM_CONTROLLED=no
 BOOTPROTO=none
 DNS1=1.2.3.4
 DOMAIN=openstack.local
+"""
+        self.assertEqual(em1_config, self.get_interface_config('em1'))
+
+    def test_interface_single_domain_in_list(self):
+        interface1 = objects.Interface('em1', dns_servers=['1.2.3.4'],
+                                       domain=['openstack.local'])
+        self.provider.add_interface(interface1)
+        em1_config = """# This file is autogenerated by os-net-config
+DEVICE=em1
+ONBOOT=yes
+HOTPLUG=no
+NM_CONTROLLED=no
+BOOTPROTO=none
+DNS1=1.2.3.4
+DOMAIN="openstack.local"
+"""
+        self.assertEqual(em1_config, self.get_interface_config('em1'))
+
+    def test_interface_multiple_domains(self):
+        interface1 = objects.Interface(
+            'em1',
+            dns_servers=['1.2.3.4'],
+            domain=['openstack.local', 'subdomain.openstack.local'])
+        self.provider.add_interface(interface1)
+        em1_config = """# This file is autogenerated by os-net-config
+DEVICE=em1
+ONBOOT=yes
+HOTPLUG=no
+NM_CONTROLLED=no
+BOOTPROTO=none
+DNS1=1.2.3.4
+DOMAIN="openstack.local subdomain.openstack.local"
 """
         self.assertEqual(em1_config, self.get_interface_config('em1'))
 

os_net_config/tests/test_objects.py

@@ -323,6 +323,19 @@ class TestInterface(base.TestCase):
         interface1 = objects.object_from_json(json.loads(data))
         self.assertEqual("openstack.local", interface1.domain)
 
+    def test_from_json_domain_list(self):
+        data = """{
+"type": "interface",
+"name": "em1",
+"use_dhcp": true,
+"domain": ["openstack.local", "subdomain.openstack.local"]
+}
+"""
+        interface1 = objects.object_from_json(json.loads(data))
+        self.assertEqual(
+            ["openstack.local", "subdomain.openstack.local"],
+            interface1.domain)
+
     def test_from_json_dhcp_nic1(self):
         def dummy_mapped_nics(nic_mapping=None):
             return {"nic1": "em3"}