Allow adding sriov_pf over ovs_bridge, linux_bond and ovs_bond
Change-Id: I55149d4a1a0fa36badd7480f521d73fbc116b1a5
Related-Bug: #1814510
(cherry picked from commit 3e3f928d19
)
This commit is contained in:
parent
adff3c49df
commit
9245f31d70
|
@ -133,6 +133,16 @@ def configure_logger(verbose=False, debug=False):
|
|||
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):
|
||||
opts = parse_opts(argv)
|
||||
configure_logger(opts.verbose, opts.debug)
|
||||
|
@ -262,6 +272,10 @@ def main(argv=sys.argv):
|
|||
if isinstance(obj, objects.SriovPF):
|
||||
configure_sriov = True
|
||||
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:
|
||||
# Apply the ifcfgs for PFs now, so that NM_CONTROLLED=no is applied
|
||||
|
|
|
@ -401,6 +401,7 @@ definitions:
|
|||
- $ref: "#/definitions/ovs_tunnel"
|
||||
- $ref: "#/definitions/ovs_patch_port"
|
||||
- $ref: "#/definitions/sriov_vf"
|
||||
- $ref: "#/definitions/sriov_pf"
|
||||
ovs_options:
|
||||
$ref: "#/definitions/ovs_options_string_or_param"
|
||||
ovs_extra:
|
||||
|
@ -507,6 +508,7 @@ definitions:
|
|||
- $ref: "#/definitions/interface"
|
||||
- $ref: "#/definitions/sriov_vf"
|
||||
- $ref: "#/definitions/vlan"
|
||||
- $ref: "#/definitions/sriov_pf"
|
||||
minItems: 1
|
||||
ovs_options:
|
||||
$ref: "#/definitions/ovs_options_string_or_param"
|
||||
|
@ -989,6 +991,7 @@ definitions:
|
|||
- $ref: "#/definitions/interface"
|
||||
- $ref: "#/definitions/vlan"
|
||||
- $ref: "#/definitions/sriov_vf"
|
||||
- $ref: "#/definitions/sriov_pf"
|
||||
bonding_options:
|
||||
$ref: "#/definitions/bonding_options"
|
||||
# common options:
|
||||
|
|
Loading…
Reference in New Issue