openstack
/
os-net-config
Code Issues Proposed changes

Replace use_dhcp6 with use_dhcpv6 

Change-Id: Ic245a16bc22961479cc8aa3b83d01b241662caf8
Closes-Bug: #1819839
This commit is contained in:
GongYongSheng 2019-03-13 15:38:42 +08:00
parent e912b02c3b
commit cdee5596e8
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/os-net-config/samples/interface.json
View File

@ -3,6 +3,7 @@
"type": "interface",
"name": "em1",
"use_dhcp": false,
"use_dhcpv6": false,
"addresses": [
{
"ip_netmask": "192.0.2.1/24"

1
etc/os-net-config/samples/interface.yaml
View File

@ -3,6 +3,7 @@ network_config:
type: interface
name: em1
use_dhcp: false
use_dhcpv6: false
addresses:
-
ip_netmask: 192.0.2.1/24

46
os_net_config/schema.yaml
View File

@ -257,7 +257,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -323,7 +323,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -387,7 +387,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -433,7 +433,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -492,7 +492,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -551,7 +551,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -606,7 +606,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -658,7 +658,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -709,7 +709,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -761,7 +761,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -821,7 +821,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -867,7 +867,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -912,7 +912,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -969,7 +969,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1028,7 +1028,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1073,7 +1073,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1125,7 +1125,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1175,7 +1175,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1221,7 +1221,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1266,7 +1266,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1314,7 +1314,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1360,7 +1360,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"
@ -1405,7 +1405,7 @@ definitions:
# common options:
use_dhcp:
$ref: "#/definitions/bool_or_param"
use_dhcp6:
use_dhcpv6:
$ref: "#/definitions/bool_or_param"
addresses:
$ref: "#/definitions/list_of_address"

6
os_net_config/tests/test_objects.py
View File

@ -160,6 +160,12 @@ class TestInterface(base.TestCase):
self.assertEqual("em1", interface.name)
self.assertTrue(interface.use_dhcp)
def test_from_json_dhcpv6(self):
data = '{"type": "interface", "name": "em1", "use_dhcpv6": true}'
interface = objects.object_from_json(json.loads(data))
self.assertEqual("em1", interface.name)
self.assertTrue(interface.use_dhcpv6)
def test_from_json_dotted_vlan(self):
def dummy_mapped_nics(nic_mapping=None):
return {"nic1": "em3"}