Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 15:

* #1195208::Update tracker: OK
* Set MODIFIED::bug 1195208#1195208IGNORE, not all related patches are 
closed, check 52336

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 15
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: net: fake OVS networks as bridgeless
..


net: fake OVS networks as bridgeless

Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Bug-Url: https://bugzilla.redhat.com/1195208
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/57068
Continuous-Integration: Jenkins CI
Reviewed-by: Edward Haas 
Reviewed-by: Dan Kenigsberg 
---
M lib/vdsm/network/ovs/info.py
M tests/network/ovs_info_test.py
2 files changed, 142 insertions(+), 4 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Petr Horáček: Verified
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 15
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 14: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 14: Verified+1

Passed ovs_info_test.py

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 14:

(6 comments)

https://gerrit.ovirt.org/#/c/57068/8/lib/vdsm/network/ovs/info.py
File lib/vdsm/network/ovs/info.py:

Line 263: 'ipv6gateway': get_gateway(routes, iface, family=6),
Line 264: 'ipv6autoconf': is_ipv6_local_auto(iface), 'dhcpv6': 
is_dhcpv6}
Line 265: 
Line 266: 
Line 267: def fake_bridgeless(ovs_netinfo, nic_netinfo, 
running_bridgeless_networks):
> I think it will be more clear and efficient to call this func like this:
Done
Line 268: """
Line 269: An OVS setup does not support bridgeless networks. Requested 
bridgeless
Line 270: networks (as seen in running_config) are faked to appear as if 
they are
Line 271: bridgeless. Faking involves modifying the netinfo report, 
removing the


Line 265: 
Line 266: 
Line 267: def fake_bridgeless(ovs_netinfo, nic_netinfo, 
running_bridgeless_networks):
Line 268: """
Line 269: An OVS setup does not support bridgeless networks. Requested 
bridgeless
> Lets put some useful comment here, something that is not already described 
Done
Line 270: networks (as seen in running_config) are faked to appear as if 
they are
Line 271: bridgeless. Faking involves modifying the netinfo report, 
removing the
Line 272: faked bridge and creating the faked device that replaces it 
(vlan, bond
Line 273: or a nic).


PS8, Line 277: f
> What is this for?
Done


Line 274: """
Line 275: for net in running_bridgeless_networks:
Line 276: net_attrs = ovs_netinfo['networks'][net]
Line 277: iface_type, iface_name = _bridgeless_fake_iface(net_attrs)
Line 278: 
> Returning the iface_type and iface_name seems to fir a separate func:
Done
Line 279: if iface_type == 'nics':
Line 280: 
nic_netinfo[iface_name].update(_shared_net_attrs(net_attrs))
Line 281: else:
Line 282: ovs_netinfo[iface_type][iface_name].update(


PS8, Line 281: :
> It is already used once, better give it a proper name and move to a func.
Done


https://gerrit.ovirt.org/#/c/57068/8/tests/network/ovs_info_test.py
File tests/network/ovs_info_test.py:

PS8, Line 375: test_nic_net
> nit: 'copy' trail is redundant.
Done


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 14:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 14
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 13:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 13
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 12:

(1 comment)

A nit

https://gerrit.ovirt.org/#/c/57068/11/lib/vdsm/network/ovs/info.py
File lib/vdsm/network/ovs/info.py:

PS11, Line 267: 
Too long and ovs is redundant.
How about one of these options:
running_networks
running_bridgeless_networks
bridgeless_networks


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 12:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 11:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 10:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 9:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 8:

(1 comment)

https://gerrit.ovirt.org/#/c/57068/8/tests/network/ovs_info_test.py
File tests/network/ovs_info_test.py:

PS8, Line 375: netinfo_copy
nit: 'copy' trail is redundant.
How about test_netinfo?


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 8: Code-Review-1

(5 comments)

https://gerrit.ovirt.org/#/c/57068/8/lib/vdsm/network/ovs/info.py
File lib/vdsm/network/ovs/info.py:

Line 263: 'ipv6gateway': get_gateway(routes, iface, family=6),
Line 264: 'ipv6autoconf': is_ipv6_local_auto(iface), 'dhcpv6': 
is_dhcpv6}
Line 265: 
Line 266: 
Line 267: def fake_bridgeless(netinfo, running_networks):
I think it will be more clear and efficient to call this func like this:
fake_bridgeless(ovs_netinfo, nic_netinfo, bridgeless(running_networks))

Where nic_netinfo is currently netinfo['nics']
(It also fits the startegy of future splitting netinfo into subjects)

In order to avoid re-asking if a net is in the bridgeless running config now, 
it can be done in advance, filtering non relevant nets.
Line 268: """
Line 269: Fake OVS networks in netinfo as bridgeless if it is what Engine 
expects.
Line 270: Note that netinfo must contain system nics.
Line 271: """


Line 265: 
Line 266: 
Line 267: def fake_bridgeless(netinfo, running_networks):
Line 268: """
Line 269: Fake OVS networks in netinfo as bridgeless if it is what Engine 
expects.
Lets put some useful comment here, something that is not already described in 
the func name.
Maybe something like this:
An OVS setup does not support bridgeless networks (at the moment).
Requested bridgeless networks (as seen in running_config) are faked to appear 
as if they are bridgeless.
Faking involves modifying the netinfo report, removing the (faked) bridge and 
creating the faked device that replaces it (vlan, bond or a nic).
Line 270: Note that netinfo must contain system nics.
Line 271: """
Line 272: for net, attrs in _bridgeless_ovs_networks(
Line 273: netinfo['networks'], running_networks):


PS8, Line 277: (
What is this for?


Line 274: vlanid = attrs['vlanid']
Line 275: bond = attrs['bond']
Line 276: nics = attrs['nics']
Line 277: iface_type = ('vlans' if vlanid else 'bondings' if bond else 
'nics')
Line 278: iface_name = ('{}.{}'.format(bond or nics[0], vlanid) if 
vlanid
Returning the iface_type and iface_name seems to fir a separate func:
iface_type, iface_name = _bridgeless_fake_iface(net_attrs)

There are also several double if/s here, perhaps they can be avoided using a 
simple if-elif-else statement.
Line 279:   else bond if bond else nics[0])
Line 280: netinfo[iface_type][iface_name].update(
Line 281: {key: attrs[key] for key in SHARED_NETWORK_ATTRIBUTES})
Line 282: netinfo['networks'][net]['iface'] = iface_name


PS8, Line 281: {key: attrs[key] for key in SHARED_NETWORK_ATTRIBUTES}
It is already used once, better give it a proper name and move to a func.


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 8: Verified+1

Passed network tests OK.

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 8:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 7:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 6: Verified+1

(3 comments)

Passed ovs_info_test.py

https://gerrit.ovirt.org/#/c/57068/5/lib/vdsm/network/ovs/info.py
File lib/vdsm/network/ovs/info.py:

PS5, Line 289: 
> Lets drop it and make it clear below that we change netinfo.
Done


PS5, Line 291: def _ovs_networks(networks):
 : return ((net, attrs) for net, attrs in six.iter
> Please avoid it and make sure the caller supplies it.
Done


PS5, Line 299: 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
 : 
> How about this?
Done


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 6:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[edwardh]

Edward Haas has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 5: Code-Review-1

(3 comments)

https://gerrit.ovirt.org/#/c/57068/5/lib/vdsm/network/ovs/info.py
File lib/vdsm/network/ovs/info.py:

PS5, Line 289: deepcopy
Lets drop it and make it clear below that we change netinfo.


PS5, Line 291: if running_networks is None:
 : running_networks = RunningConfig().networks
Please avoid it and make sure the caller supplies it.


PS5, Line 299: vlanid = attrs['vlanid']
 : bond = attrs['bond']
 : nics = attrs['nics']
 : if vlanid is not None:
 : expected_vlan_name = '%s.%s' % (bond or nics[0], 
vlanid)
 : faked_netinfo['networks'][net]['iface'] = 
expected_vlan_name
 : _copy_port_info(faked_netinfo['networks'][net],
 : 
faked_netinfo['vlans'][expected_vlan_name])
 : elif bond:
 : faked_netinfo['networks'][net]['iface'] = bond
 : _copy_port_info(faked_netinfo['networks'][net],
 : faked_netinfo['bondings'][bond])
 : elif nics:
 : faked_netinfo['networks'][net]['iface'] = nics[0]
 : _copy_port_info(faked_netinfo['networks'][net],
 : faked_netinfo['nics'][nics[0]])
How about this?

dev_name, dev = _southbound_device(attrs)
netinfo['networks'][net]['iface'] = dev_name
_copy_blabla(netinfo['networks'][net], dev)


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: Yes
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 5: Verified+1

Passed ovs_info_test.py

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 4: Verified+1

Passed ovs_info_test.py

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 5:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 4:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 3:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 2: Verified+1

Passed ovs_info_test.py

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 2:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[automation]

gerrit-hooks has posted comments on this change.

Change subject: net: fake OVS networks as bridgeless
..


Patch Set 1:

* #1195208::Update tracker: OK
* Check Bug-Url::OK
* Check Public Bug::#1195208::OK, public bug
* Check Product::#1195208::OK, Correct classification oVirt
* Check TM::SKIP, not in a monitored branch (ovirt-3.6)
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6'])

-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: net: fake OVS networks as bridgeless

[phoracek]

Petr Horáček has uploaded a new change for review.

Change subject: net: fake OVS networks as bridgeless
..

net: fake OVS networks as bridgeless

Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Bug-Url: https://bugzilla.redhat.com/1195208
Signed-off-by: Petr Horáček 
---
M lib/vdsm/network/ovs/info.py
1 file changed, 33 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/68/57068/1

diff --git a/lib/vdsm/network/ovs/info.py b/lib/vdsm/network/ovs/info.py
index b652c44..c7e0e1c 100644
--- a/lib/vdsm/network/ovs/info.py
+++ b/lib/vdsm/network/ovs/info.py
@@ -23,6 +23,7 @@
 from vdsm.netinfo.routes import get_routes, get_gateway
 from vdsm.netinfo.addresses import getIpAddrs, getIpInfo, is_ipv6_local_auto
 from vdsm.netinfo.dhcp import dhcp_status
+from vdsm.network.netconfpersistence import RunningConfig
 
 from . import driver
 
@@ -281,5 +282,35 @@
 return netinfo
 
 
-def get_netinfo(ovs_bridges=None):
-return _fake_expected_devices(_get_netinfo(ovs_bridges))
+def _fake_bridgeless(netinfo):
+running_networks = RunningConfig().networks
+
+for net, attrs in six.iteritems(netinfo['networks']):
+running_attrs = running_networks.get(net)
+if running_attrs is None or running_attrs['bridged']:
+continue
+
+bond = running_attrs.get('bonding')
+nic = running_attrs.get('nic')
+tag = running_attrs.get('vlan')
+if 'vlan'in running_attrs:
+expected_vlan_name = '%s.%s' % (bond or nic, tag)
+_copy_port_info(netinfo['networks'][net],
+netinfo['vlans'][expected_vlan_name])
+elif 'bond' in running_attrs:
+_copy_port_info(netinfo['networks'][net],
+netinfo['bondings'][bond])
+elif 'nic' in running_attrs:
+_copy_port_info(netinfo['networks'][net], netinfo['nics'][nic])
+
+netinfo['bridges'].pop(net)
+netinfo['networks'][net]['bridged'] = False
+
+return netinfo
+
+
+def get_netinfo(ovs_bridges=None, fake_bridgeless=False):
+netinfo = _fake_expected_devices(_get_netinfo(ovs_bridges))
+if fake_bridgeless:
+netinfo = _fake_bridgeless(netinfo)
+return netinfo


-- 
To view, visit https://gerrit.ovirt.org/57068
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0eac59a993c86fe067f2eb53937929dc65ca8581
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches