Change in vdsm[master]: persistence: fails while removing non-existing network

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

Change subject: persistence: fails while removing non-existing network
......................................................................

persistence: fails while removing non-existing network

vdsm-restore-netconfig:unified_restoration() removes current networks
(listed in runningConfig) before it tries to restore persisted ones.

Problem occurs when current network (listed in runningConfig) does not
exist in the system (for example when we manualy delete its nic). In
this case, setupNetwork() returns exception (network does not exist)
and restoration can not continue.

I added new condition to setupNetworks(), it checks if network is in
runningConfig in case it was not listed in netinfo and libvirt_nets. If
so, invalid network is removed from runningConfig.

Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Signed-off-by: Petr Horáček <phoracek(a)redhat.com&gt;
---
M vdsm/network/api.py
M vdsm/vdsm-restore-net-config
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/33995/1

diff --git a/vdsm/network/api.py b/vdsm/network/api.py
index e70d954..dc372a7 100755
--- a/vdsm/network/api.py
+++ b/vdsm/network/api.py
@@ -719,6 +719,16 @@
                     del networks[network]
                     del libvirt_nets[network]
                 _netinfo.updateDevices()
+            elif network in configurator.runningConfig.networks:
+                # If the network was not in _netinfo or libvirt_nets but is in
+                # the networks returned by running configurator, we might
+                # remove it from runningConfig.
+                logger.debug('Removing non-existing network %r from '
+                             'runningConfig', network)
+                configurator.runningConfig.removeNetwork(network)
+                if 'remove' in networkAttrs:
+                    del networks[network]
+                _netinfo.updateDevices()
             elif 'remove' in networkAttrs:
                 raise ConfigNetworkError(ne.ERR_BAD_BRIDGE, "Cannot delete "
                                          "network %r: It doesn't exist in the
"
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index f9ca589..6c9681a 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -31,6 +31,7 @@
 # Unified persistence restoration
 from network.api import setupNetworks
 from network import configurators
+from network import errors as ne
 from vdsm.netconfpersistence import RunningConfig, PersistentConfig
 import pkgutil
 


-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 12:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/4155/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc21-x86_64_merged/147/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el6-x86_64_merged/170/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/363/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5995/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-el7-x86_64_merged/168/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_create-rpms-fc20-x86_64_merged/163/ : SUCCESS

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


setupNetworks: doesn't remove broken nw from runningConfig

This patch extends http://gerrit.ovirt.org/#/c/22354/:
network/api.py:setupNetworks() removes broken networks - if network
is not listed in netinfo, but it's in libvirt, _delBrokenNetwork()
is called.

The problem is that when the network doesn't have an existing device,
we only remove it from libvirt and leave it in RunningConfig.

TODO: this problem occurs on 3.4 with libvirt 1.2.9

Now _delBrokenNetwork() remove broken network from runningConfig.

NOTE: This patch doesn't handle the case, when the network is only in
RunningConfig, not in libvirt, not in netinfo. This should be solved in
a separate patch.

Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Signed-off-by: Petr Horáček <phoracek(a)redhat.com&gt;
Reviewed-on: http://gerrit.ovirt.org/33995
Reviewed-by: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com&gt;
---
M vdsm/network/api.py
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Antoni Segura Puimedon: Looks good to me, but someone else must approve
  Petr Horáček: Verified
  Dan Kenigsberg: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 11: Code-Review+2

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 11:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13299/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/13139/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12349/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 11
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 10:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13017/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12859/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12068/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 10
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 9:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/13016/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12858/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/12067/ : FAILURE

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 9
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8:

(1 comment)

http://gerrit.ovirt.org/#/c/33995/8//COMMIT_MSG
Commit Message:

Line 10: is not listed in netinfo, but it's in libvirt, _delBrokenNetwork()
Line 11: is called.
Line 12: 
Line 13: The problem is that when the network doesn't have an existing device,
Line 14: we only remove it from libvirt and leave it in RunningConfig.
>  For that we should have a better handling of out of sync conditions
> in a se 
Cool, I'm not asking to fix everything in this patch. I only ask to
specify in the commit message what happens in can of inconsistency.
Line 15: 
Line 16: Now _delBrokenNetwork() remove broken network from runningConfig.
Line 17: 
Line 18: Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12


-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

Antoni Segura Puimedon has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8:

(1 comment)

http://gerrit.ovirt.org/#/c/33995/8//COMMIT_MSG
Commit Message:

Line 10: is not listed in netinfo, but it's in libvirt, _delBrokenNetwork()
Line 11: is called.
Line 12: 
Line 13: The problem is that when the network doesn't have an existing device,
Line 14: we only remove it from libvirt and leave it in RunningConfig.
>  What happens if a stale network remains in RunningConfig? (There is
> still a 
For that we should have a better handling of out of sync conditions in a
separate patch. I would say keep if fully configured, delete otherwise.
Line 15: 
Line 16: Now _delBrokenNetwork() remove broken network from runningConfig.
Line 17: 
Line 18: Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12


-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8: Code-Review-1

-1 for visibility

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8:

(1 comment)

http://gerrit.ovirt.org/#/c/33995/8//COMMIT_MSG
Commit Message:

Line 10: is not listed in netinfo, but it's in libvirt, _delBrokenNetwork()
Line 11: is called.
Line 12: 
Line 13: The problem is that when the network doesn't have an existing device,
Line 14: we only remove it from libvirt and leave it in RunningConfig.
What happens if a stale network remains in RunningConfig? (There is still a chance for
this to happen, as the process may die before writing the amended config to file.)
Line 15: 
Line 16: Now _delBrokenNetwork() remove broken network from runningConfig.
Line 17: 
Line 18: Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12


-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12879/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12721/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11930/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

Antoni Segura Puimedon has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 8: Code-Review+1

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 8
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 7:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12878/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12720/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11929/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

Antoni Segura Puimedon has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 6: Code-Review-1

(1 comment)

Just a change in the commit msg

http://gerrit.ovirt.org/#/c/33995/6//COMMIT_MSG
Commit Message:

Line 9: network/api.py:setupNetworks() removes broken networks - if network
Line 10: is not listed in netinfo, but it's in libvirt, _delBrokenNetwork()
Line 11: is called.
Line 12: 
Line 13: Problem is, that _delBrokenNetwork() removes network only from libvirt
"The problem is that when the network doesn't have an existing device, we only
remove it from libvirt and leave it in RunningConfig."
Line 14: but leaves it in runningConfig. Due to this problem, we might get
Line 15: exceptions while restore-persistent-conf.
Line 16: 
Line 17: Now _delBrokenNetwork() remove broken network from runningConfig.


-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

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

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 6: Verified+1

Before the patch, functional tests after:

In [14]: !ip l add dummy_4444 type dummy

In [15]:
conn.setupNetworks({'test-network18':{'nic':'dummy_4444','bridged':False,'bootproto':False,'ipaddr':'240.0.0.1','netmask':'255.255.255.0','gateway':'240.0.0.254'}},{},{'connectivityCheck':False})
Out[15]: {'status': {'code': 0, 'message': 'Done'}}

In [16]: !ip l del dummy_4444

fail with 'EnvironmentError: Failed to restore the persisted networks'

With this change it passes mentioned test (and all network's functional tests except:
testIPv6ConfigNetwork which still fails on my ENV, testSetupNetworkOutboundQos which i
solved in another patch, testRuleExists which used to fail before this patch)

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 5:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12876/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12718/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11927/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 4:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12875/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12717/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11926/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 3:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12874/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12716/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11925/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

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

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 2: -Verified

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

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

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 2: Verified+1

Before the patch, functional tests after:
In [14]: !ip l add dummy_4444 type dummy

In [15]:
conn.setupNetworks({'test-network18':{'nic':'dummy_4444','bridged':False,'bootproto':False,'ipaddr':'240.0.0.1','netmask':'255.255.255.0','gateway':'240.0.0.254'}},{},{'connectivityCheck':False})
Out[15]: {'status': {'code': 0, 'message': 'Done'}}

In [16]: !ip l del dummy_4444

fail with 'EnvironmentError: Failed to restore the persisted networks'

With this change it passes mentioned test (and all network's functional tests except:
testIPv6ConfigNetwork which still fails on my ENV, testSetupNetworkOutboundQos which i
solved in another patch, testRuleExists which used to fail before this patch)

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 2:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12871/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12713/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11922/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: persistence: fails while removing non-existing network
......................................................................


Patch Set 1:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12870/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12712/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11921/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No

Change in vdsm[master]: setupNetworks: doesn't remove broken nw from runningConfig

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: setupNetworks: doesn't remove broken nw from runningConfig
......................................................................


Patch Set 6:

Build Failed 

http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12877/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_network_functional_tests_gerrit/... : There was
an infra issue, please contact infra(a)ovirt.org

http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12719/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11928/ : FAILURE

-- 
To view, visit http://gerrit.ovirt.org/33995
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I0c507626705d7ead84db2f3aa15e4032f9558d12
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;
Gerrit-Reviewer: Petr Horáček <phoracek(a)redhat.com&gt;
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No