openstack/os-net-config
Code Issues Proposed changes

Allow adding sriov_pf over ovs_bridge, linux_bond and ovs_bond

Browse Source 
Change-Id: I55149d4a1a0fa36badd7480f521d73fbc116b1a5
Related-Bug: #1814510
This commit is contained in:
waleed mousa
2019-02-04 04:11:42 -05:00
parent fc9fbd4461
commit 3e3f928d19
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
os_net_config/cli.py
View File

@@ -133,6 +133,16 @@ def configure_logger(verbose=False, debug=False):
level=log_level) level=log_level)
def check_configure_sriov(obj):
configure_sriov = False
for member in obj.members:
if isinstance(member, objects.SriovPF):
configure_sriov = True
elif hasattr(member, "members") and member.members is not None:
configure_sriov = check_configure_sriov(member)
return configure_sriov
def main(argv=sys.argv): def main(argv=sys.argv):
opts = parse_opts(argv) opts = parse_opts(argv)
configure_logger(opts.verbose, opts.debug) configure_logger(opts.verbose, opts.debug)
@@ -263,6 +273,10 @@ def main(argv=sys.argv):
if isinstance(obj, objects.SriovPF): if isinstance(obj, objects.SriovPF):
configure_sriov = True configure_sriov = True
provider.add_object(obj) provider.add_object(obj)
elif hasattr(obj, 'members') and obj.members is not None:
if check_configure_sriov(obj):
configure_sriov = True
provider.add_object(obj)
if configure_sriov: if configure_sriov:
# Apply the ifcfgs for PFs now, so that NM_CONTROLLED=no is applied # Apply the ifcfgs for PFs now, so that NM_CONTROLLED=no is applied

3
os_net_config/schema.yaml
View File

@@ -475,6 +475,7 @@ definitions:
- $ref: "#/definitions/ovs_tunnel" - $ref: "#/definitions/ovs_tunnel"
- $ref: "#/definitions/ovs_patch_port" - $ref: "#/definitions/ovs_patch_port"
- $ref: "#/definitions/sriov_vf" - $ref: "#/definitions/sriov_vf"
- $ref: "#/definitions/sriov_pf"
ovs_options: ovs_options:
$ref: "#/definitions/ovs_options_string_or_param" $ref: "#/definitions/ovs_options_string_or_param"
ovs_extra: ovs_extra:
@@ -589,6 +590,7 @@ definitions:
- $ref: "#/definitions/interface" - $ref: "#/definitions/interface"
- $ref: "#/definitions/sriov_vf" - $ref: "#/definitions/sriov_vf"
- $ref: "#/definitions/vlan" - $ref: "#/definitions/vlan"
- $ref: "#/definitions/sriov_pf"
minItems: 1 minItems: 1
ovs_options: ovs_options:
$ref: "#/definitions/ovs_options_string_or_param" $ref: "#/definitions/ovs_options_string_or_param"
@@ -1110,6 +1112,7 @@ definitions:
- $ref: "#/definitions/interface" - $ref: "#/definitions/interface"
- $ref: "#/definitions/vlan" - $ref: "#/definitions/vlan"
- $ref: "#/definitions/sriov_vf" - $ref: "#/definitions/sriov_vf"
- $ref: "#/definitions/sriov_pf"
bonding_options: bonding_options:
$ref: "#/definitions/bonding_options" $ref: "#/definitions/bonding_options"
# common options: # common options: