Hello community,
here is the log from the commit of package yast2-iscsi-lio-server for
openSUSE:Factory checked in at 2015-03-19 21:16:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-lio-server (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-lio-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-iscsi-lio-server/yast2-iscsi-lio-server.changes
2015-02-06 22:38:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-lio-server.new/yast2-iscsi-lio-server.changes
2015-03-19 21:16:57.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 4 12:04:33 CET 2015 - [email protected]
+
+- use 'ip addr show', don't show deprecated IPs
+- 3.1.14
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-lio-server-3.1.13.tar.bz2
New:
----
yast2-iscsi-lio-server-3.1.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-lio-server.spec ++++++
--- /var/tmp/diff_new_pack.lAQzDm/_old 2015-03-19 21:16:58.000000000 +0100
+++ /var/tmp/diff_new_pack.lAQzDm/_new 2015-03-19 21:16:58.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.13
+Version: 3.1.14
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-lio-server-3.1.13.tar.bz2 ->
yast2-iscsi-lio-server-3.1.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.13/package/yast2-iscsi-lio-server.changes
new/yast2-iscsi-lio-server-3.1.14/package/yast2-iscsi-lio-server.changes
--- old/yast2-iscsi-lio-server-3.1.13/package/yast2-iscsi-lio-server.changes
2015-02-04 12:19:11.000000000 +0100
+++ new/yast2-iscsi-lio-server-3.1.14/package/yast2-iscsi-lio-server.changes
2015-03-18 14:24:11.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Mar 4 12:04:33 CET 2015 - [email protected]
+
+- use 'ip addr show', don't show deprecated IPs
+- 3.1.14
+
+-------------------------------------------------------------------
Tue Feb 3 09:41:55 CET 2015 - [email protected]
- show a warning popup in case of empty client list (bnc #898261)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.13/package/yast2-iscsi-lio-server.spec
new/yast2-iscsi-lio-server-3.1.14/package/yast2-iscsi-lio-server.spec
--- old/yast2-iscsi-lio-server-3.1.13/package/yast2-iscsi-lio-server.spec
2015-02-04 12:19:11.000000000 +0100
+++ new/yast2-iscsi-lio-server-3.1.14/package/yast2-iscsi-lio-server.spec
2015-03-18 14:24:11.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-lio-server
-Version: 3.1.13
+Version: 3.1.14
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-lio-server-3.1.13/src/modules/IscsiLioData.rb
new/yast2-iscsi-lio-server-3.1.14/src/modules/IscsiLioData.rb
--- old/yast2-iscsi-lio-server-3.1.13/src/modules/IscsiLioData.rb
2015-02-04 12:19:11.000000000 +0100
+++ new/yast2-iscsi-lio-server-3.1.14/src/modules/IscsiLioData.rb
2015-03-18 14:24:11.000000000 +0100
@@ -566,31 +566,34 @@
end
#
- # Get information about network interfaces from 'ifconfig'
+ # Get information about network interfaces from 'ip addr show'
#
def GetNetConfig
out = Convert.to_map(
- SCR.Execute(path(".target.bash_output"), "LC_ALL=POSIX /sbin/ifconfig")
+ SCR.Execute(path(".target.bash_output"), "LC_ALL=POSIX ip addr show")
)
ls = out.fetch("stdout", "").split("\n")
deep_copy(ls)
end
#
- # Get list of IP addresses
+ # Get list of IP addresses (filters stdout of 'ip addr show')
+ #
+ # @return [Array]<String> list of IP addresses (IPv4 and IPv6), if no IP
is found
+ # returns array with an empty string element
#
def GetIpAddr
ip_list = GetNetConfig()
ip_list.select! do |line|
- line.include?("inet") && !line.include?("Scope:Link")
+ line.include?("inet") && !line.include?("deprecated") # don't show
deprecated IPs
end
ip_list = ip_list.map do |ip|
ip.lstrip!
case ip
- when /^inet addr: *([.\w]+)[\t ].*/
+ when /^inet *([.\d]+)\/.*/
$1
- when /^inet6 addr: *([:\w]+)\/.*/
+ when /^inet6 *([.:\w]+)\/.*/
$1
else
ip
@@ -599,7 +602,8 @@
ip_list.reject! do |address|
address.start_with?("127.") || # local IPv4
- address.start_with?("::1") # local IPv6
+ address.start_with?("::1") || # local IPv6
+ address.start_with?("fe80:") # scope link IPv6
end
ip_list = [""] if ip_list.empty?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-lio-server-3.1.13/test/GetIpAddr_spec.rb
new/yast2-iscsi-lio-server-3.1.14/test/GetIpAddr_spec.rb
--- old/yast2-iscsi-lio-server-3.1.13/test/GetIpAddr_spec.rb 2015-02-04
12:19:11.000000000 +0100
+++ new/yast2-iscsi-lio-server-3.1.14/test/GetIpAddr_spec.rb 2015-03-18
14:24:11.000000000 +0100
@@ -16,27 +16,43 @@
it "returns list of available IP addresses" do
@iscsilib.stub(:GetNetConfig).
and_return([
- "enp3s0f0 Link encap:Ethernet HWaddr
00:21:5A:F6:69:80",
- " inet addr:10.121.8.83 Bcast:10.121.63.255
Mask:255.255.192.0",
- " inet6 addr:
2620:113:80c0:8000:19ca:2ad:d755:fd68/64 Scope:Global",
- " inet6 addr: fe80::221:5aff:fef6:6980/64
Scope:Link",
- " inet6 addr:
2620:113:80c0:8000:a845:8232:ab79:6a7c/64 Scope:Global",
- " UP BROADCAST RUNNING MULTICAST MTU:1500
Metric:1",
- " RX packets:807334589 errors:0 dropped:96
overruns:0 frame:0",
- " TX packets:147793653 errors:0 dropped:0
overruns:0 carrier:0",
- " collisions:0 txqueuelen:1000",
- " RX bytes:1138190820596 (1085463.3 Mb) TX
bytes:121179938780 (115566.1 Mb)",
- " Interrupt:16 Memory:fd000000-fd7fffff",
- "",
- "lo Link encap:Local Loopback ",
- " inet addr:127.0.0.1 Mask:255.0.0.0",
- " inet6 addr: ::1/128 Scope:Host",
- " UP LOOPBACK RUNNING MTU:65536 Metric:1"
+ "1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue
state UNKNOWN group default",
+ " link/loopback 00:00:00:00:00:00 brd
00:00:00:00:00:00",
+ " inet 127.0.0.1/8 scope host lo",
+ " valid_lft forever preferred_lft forever",
+ " inet6 ::1/128 scope host",
+ " valid_lft forever preferred_lft forever",
+ "2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500
qdisc pfifo_fast state UP group default qlen 1000",
+ " link/ether 08:00:27:77:e8:2c brd ff:ff:ff:ff:ff:ff",
+ " inet 10.160.65.187/16 brd 10.160.255.255 scope
global eth0",
+ " valid_lft forever preferred_lft forever",
+ " inet6 2620:113:80c0:8080:10:160:68:237/64 scope
global dynamic",
+ " valid_lft 7339sec preferred_lft 7339sec",
+ " inet6 2620:113:80c0:8080:610e:9a73:879a:4a8f/64
scope global temporary dynamic",
+ " valid_lft 3567sec preferred_lft 1767sec",
+ " inet6 2620:113:80c0:8080:6077:847c:8f17:a04e/64
scope global temporary deprecated dynamic",
+ " valid_lft 3567sec preferred_lft 0sec",
+ " inet6 2620:113:80c0:8080:bd9d:5c4d:6668:3c80/64
scope global temporary deprecated dynamic",
+ " valid_lft 3567sec preferred_lft 0sec",
+ " inet6 2620:113:80c0:8080:44e9:89:f96d:d7ed/64 scope
global temporary deprecated dynamic",
+ " valid_lft 3567sec preferred_lft 0sec",
+ " inet6 2620:113:80c0:8080:1576:6de2:c048:6cd3/64
scope global temporary deprecated dynamic",
+ " valid_lft 3567sec preferred_lft 0sec",
+ " inet6 2620:113:80c0:8080:814d:6ba4:6846:779b/64
scope global temporary deprecated dynamic",
+ " valid_lft 3567sec preferred_lft 0sec",
+ " inet6 2620:113:80c0:8080:a00:27ff:fe77:e82c/64
scope global dynamic",
+ " valid_lft 3567sec preferred_lft 1767sec",
+ " inet6 0:0:0:0:0:0:101.45.75.219/64 scope global
dynamic",
+ " valid_lft 3567sec preferred_lft 1767sec",
+ " inet6 fe80::a00:27ff:fe77:e82c/64 scope link",
+ " valid_lft forever preferred_lft forever"
])
ip_list = @iscsilib.GetIpAddr()
- ip_list.should eq(["10.121.8.83",
- "2620:113:80c0:8000:19ca:2ad:d755:fd68",
- "2620:113:80c0:8000:a845:8232:ab79:6a7c"
+ expect(ip_list).to eq(["10.160.65.187",
+ "2620:113:80c0:8080:10:160:68:237",
+ "2620:113:80c0:8080:610e:9a73:879a:4a8f",
+ "2620:113:80c0:8080:a00:27ff:fe77:e82c",
+ "0:0:0:0:0:0:101.45.75.219"
])
end
end
@@ -45,24 +61,26 @@
it "also returns correct list of IP addresses" do
@iscsilib.stub(:GetNetConfig).
and_return([
- "enp3s0f0 Link encap:Ethernet HWaddr
00:21:5A:F6:69:80",
- " inet addr:10.121.8.83 Bcast:10.121.63.255
Mask:255.255.192.0",
- " inet addr: 10.122.8.83 Bcast:10.121.63.255
Mask:255.255.192.0",
- "inet addr:10.120.9.76\tBcast:10.121.63.255
Mask:255.255.192.0",
- "\tinet6 addr: 2620:113:80c0:8000:19ca:2ad:d755:fd68/64
Scope:Global",
- "inet6 addr: 2620:113:80c0:8000:a845:8232:ab79:6a7c/64
Scope:Global",
- " inet6
addr:2620:113:80c0:7000:a845:8232:ab79:6a7c/64 Scope:Global",
- " inet6 addr:
2620:113:80c0:7777:a845:8232:ab79:6a7c/64 Scope:Global",
- " Interrupt:16 Memory:fd000000-fd7fffff"
+ "1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue
state UNKNOWN group default",
+ " link/loopback 00:00:00:00:00:00 brd
00:00:00:00:00:00",
+ "inet 127.0.0.1/8 scope host lo",
+ " valid_lft forever preferred_lft forever",
+ "inet6 ::1/128 scope host",
+ " valid_lft forever preferred_lft forever",
+ "2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500
qdisc pfifo_fast state UP group default qlen 1000",
+ " link/ether 08:00:27:77:e8:2c brd ff:ff:ff:ff:ff:ff",
+ "inet 10.160.65.187/16 brd 10.160.255.255 scope global
eth0",
+ " valid_lft forever preferred_lft forever",
+ " inet6 2620:113:80c0:8080:10:160:68:237/64
scope global dynamic",
+ " valid_lft 7339sec preferred_lft 7339sec",
+ "inet6 2620:113:80c0:8080:610e:9a73:879a:4a8f/64 scope
global temporary dynamic",
+ "inet6 fe80::a00:27ff:fe77:e82c/64 scope link",
+ " valid_lft forever preferred_lft forever"
])
ip_list = @iscsilib.GetIpAddr()
- ip_list.should eq(["10.121.8.83",
- "10.122.8.83",
- "10.120.9.76",
- "2620:113:80c0:8000:19ca:2ad:d755:fd68",
- "2620:113:80c0:8000:a845:8232:ab79:6a7c",
- "2620:113:80c0:7000:a845:8232:ab79:6a7c",
- "2620:113:80c0:7777:a845:8232:ab79:6a7c"
+ expect(ip_list).to eq(["10.160.65.187",
+ "2620:113:80c0:8080:10:160:68:237",
+ "2620:113:80c0:8080:610e:9a73:879a:4a8f"
])
end
end
@@ -71,12 +89,13 @@
it "returns [\"\"]" do
@iscsilib.stub(:GetNetConfig).
and_return([
- "enp3s0f0 Link encap:Ethernet HWaddr
00:21:5A:F6:69:80",
- " inet6 addr: fe80::221:5aff:fef6:6980/64
Scope:Link",
- " Interrupt:16 Memory:fd000000-fd7fffff"
+ "2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500
qdisc pfifo_fast state UP group default qlen 1000",
+ " link/ether 08:00:27:77:e8:2c brd ff:ff:ff:ff:ff:ff",
+ " inet6 fe80::a00:27ff:fe77:e82c/64 scope link",
+ " valid_lft forever preferred_lft forever"
])
ip_list = @iscsilib.GetIpAddr()
- ip_list.should eq([""])
+ expect(ip_list).to eq([""])
end
end
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
