From 31ca89dd1d0f90bf0249585093435926eee88cb5 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Wed, 2 Nov 2016 11:10:42 +0200 Subject: [2/7] networkmanager: Fix regression re activation of virtual interfaces https://bugzilla.redhat.com/show_bug.cgi?id=1394667 Upstream commit: 6961a619a3d9012f7a2ac19e8c235e43a2cd216d networkmanager: Fix regression re activation of virtual interfaces Closes #5363 Signed-off-by: Stef Walter * Signing off inclusion in the rhel-7.3.1 branch --- dist/networkmanager/network.js | Bin 132973 -> 132949 bytes dist/networkmanager/network.js.map | Bin 1028824 -> 1028731 bytes pkg/networkmanager/interfaces.js | 12 ++++++------ test/verify/check-networking | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dist/networkmanager/network.js b/dist/networkmanager/network.js index e734b5eb9154334f16b67e6560398e3b4eb02b40..2cdd210a34666121baf778b40b08a492e131861b 100644 GIT binary patch delta 75 zcmaFc$8oifV}oWjYf5TaeBNY(YIz82b6E9eMkb)h#+j0nHEVfT;`0)7H`~>!K?RlB S!5R{Cn`hN+pH;_rxdQ-J3>~fj delta 110 zcmccG$MLq0V}oWjduCcOMwJJ zbo6v|*?iz|03!!nD)F$WsFS0kqq&QYE06-JN_8xAa;%D)9C-8svN92|OmuZQAa%`2 z$J&#QF#<8u_M~IX`;=KzQp@7=rf*1Pk(}=Eidl^V%umcsoqq8FyU6qfvdpa0SN&k& z-9GIV^G9YTh*Ht%vXLyp)8!{{u}$ai;}T|#&jaaT4K3g@(3TWfF!nS k_i=4u!m0-Dda%NF{fS&a%nigmK+FroeB1RW@~>0`0ICb9^Z)<= delta 534 zcmezU#O}sZy9x0^smaEM21ZF1DaMwTrUofVsTLax1rD=VI_daMc6h8JZtkMv>gebQ z;sdF2FP%U~Pe+TO%^ME~F!Fopcmf5Bopiz-ogK5hCVzY=DGAk3371QEax8Ol)c2lj zeDnf_j>N+vljV=`3L>k{0jX{_J=Sh|j1h>LwwoSf-lsgh(VInKx`Hzs$MgjsnYpJM zykusbuK9|YZ+b!~i{$hN!a%OW2PT&3nJTRO+tXe#e_-a+^UNzrElNvFp58d0S$KNG zTV~1Wa|2npr=RKN;+XDO$SgL!W*Rf^_U-SOPcdOt{r5c=&-A??nUPda-=D+cFr7D< znWJ6%6EhIA05K~NvjH*tcI{6b%sE(sb$X!)PtbI`bxeZWuZZw0W@>j!$0 will break the connection to the server, " + "and will make the administration UI unavailable."), - self.iface.Name), - cockpit.format(_("Delete $0"), self.iface.Name)); + self.dev_name), + cockpit.format(_("Delete $0"), self.dev_name)); } }, @@ -2171,8 +2171,8 @@ PageNetworkInterface.prototype = { modify, cockpit.format(_("Switching on $0 will break the connection to the server, " + "and will make the administration UI unavailable."), - self.dev.Interface), - cockpit.format(_("Switch on $0"), self.dev.Interface)); + self.dev_name), + cockpit.format(_("Switch on $0"), self.dev_name)); }, disconnect: function() { @@ -2196,8 +2196,8 @@ PageNetworkInterface.prototype = { modify, cockpit.format(_("Switching off $0 will break the connection to the server, " + "and will make the administration UI unavailable."), - self.dev.Interface), - cockpit.format(_("Switch off $0"), self.dev.Interface)); + self.dev_name), + cockpit.format(_("Switch off $0"), self.dev_name)); }, update: function() { diff --git a/test/verify/check-networking b/test/verify/check-networking index a318e5c..1133eec 100755 --- a/test/verify/check-networking +++ b/test/verify/check-networking @@ -371,6 +371,36 @@ class TestNetworking(MachineCase): b.wait_visible("#networking") b.wait_not_present("#networking-interfaces tr[data-interface='tbridge']") + def testVlan(self): + b = self.browser + m = self.machine + + iface = self.get_iface(m, m.macaddr) + + self.login_and_go("/network") + self.wait_for_iface(iface) + + # Make a VLAN interface + b.click("button:contains('Add VLAN')") + b.wait_popup("network-vlan-settings-dialog") + b.set_val("#network-vlan-settings-dialog tr:contains('Name') input", "tvlan") + b.set_val("#network-vlan-settings-dialog tr:contains('VLAN Id') input", "123") + b.click("#network-vlan-settings-dialog button:contains('Apply')") + b.wait_popdown("network-vlan-settings-dialog") + b.wait_present("#networking-interfaces tr[data-interface='tvlan']") + + # Activate it. It wont get an IP address, but that's okay. + b.click("#networking-interfaces tr[data-interface='tvlan'] td:first-child") + b.wait_visible("#network-interface") + b.wait_in_text("tr:contains('Status')", "Inactive") + b.click(".panel-heading .btn:contains('On')") + b.wait_not_in_text("tr:contains('Status')", "Inactive") + + # Delete it + b.click("#network-interface button:contains('Delete')") + b.wait_visible("#networking") + b.wait_not_present("#networking-interfaces tr[data-interface='tvlan']") + def testOther(self): b = self.browser m = self.machine -- 2.5.5