Yedidyah Bar David has posted comments on this change. Change subject: Update engine's mgmt net to have the correct vlan id ......................................................................
Patch Set 7: (4 comments) http://gerrit.ovirt.org/#/c/32269/7/src/ovirt_hosted_engine_setup/network.py File src/ovirt_hosted_engine_setup/network.py: Line 14: # Line 15: # You should have received a copy of the GNU Lesser General Public Line 16: # License along with this library; if not, write to the Free Software Line 17: # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Line 18: # I'd use a different name for this file instead of network.py . vds_capabilities is unrelated to networking. Perhaps vds.py? vds.capabilities, vds.net_info? Or vds_info.py (better for searching)? vds_info.caps, vds_info.net? Or something like that. Line 19: Line 20: Line 21: """ Line 22: host networking utilities http://gerrit.ovirt.org/#/c/32269/7/src/plugins/ovirt-hosted-engine-setup/engine/add_host.py File src/plugins/ovirt-hosted-engine-setup/engine/add_host.py: Line 430: net_info = netinfo.NetInfo(network.vds_capabilities(conn)) Line 431: bridge_port = self.environment[ohostedcons.NetworkEnv.BRIDGE_IF] Line 432: if bridge_port in net_info.vlans: Line 433: self.logger.debug('Updating engine\'s management network to ' Line 434: 'be vlanned') ')' in own line Line 435: vlan_id = net_info.vlans[bridge_port]['vlanid'] Line 436: mgmt_network = engine_api.networks.get( Line 437: name=self.environment[ohostedcons.NetworkEnv.BRIDGE_NAME] Line 438: ) Line 436: mgmt_network = engine_api.networks.get( Line 437: name=self.environment[ohostedcons.NetworkEnv.BRIDGE_NAME] Line 438: ) Line 439: mgmt_network.set_vlan( Line 440: self._ovirtsdk_xml.params.VLAN(id=vlan_id)) last ')' in own line Line 441: mgmt_network.update() Line 442: Line 443: self.logger.debug('Adding the host to the cluster') Line 444: cluster_name = self.environment[ http://gerrit.ovirt.org/#/c/32269/7/src/plugins/ovirt-hosted-engine-setup/network/bridge.py File src/plugins/ovirt-hosted-engine-setup/network/bridge.py: Line 200: networks = { Line 201: self.environment[ohostedcons.NetworkEnv.BRIDGE_NAME]: Line 202: network.net_info( Line 203: network.vds_capabilities(conn), Line 204: self.environment[ohostedcons.NetworkEnv.BRIDGE_IF])} ) and } in own lines . Perhaps it's not difficult to test for this automatically, not sure how. Line 205: _setupNetworks(conn, networks, {}, {'connectivityCheck': False}) Line 206: _setSafeNetworkConfig(conn) Line 207: Line 208: @plugin.event( -- To view, visit http://gerrit.ovirt.org/32269 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ica4c5804395d364438f1e142387376cc7adc7172 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegu...@redhat.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegu...@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Lev Veyde <lve...@redhat.com> Gerrit-Reviewer: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stira...@redhat.com> Gerrit-Reviewer: Yedidyah Bar David <d...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches