summaryrefslogtreecommitdiffstats
path: root/spec/fixtures/virtual/proc_self_status
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-08-10 15:25:22 -0700
committerRein Henrichs <rein@puppetlabs.com>2010-08-18 14:44:45 -0700
commita85f2b0f5c43f3b2324d06310a1d673438840e89 (patch)
tree41eafa9cb6e31254b66c0fad5f42a79982269d18 /spec/fixtures/virtual/proc_self_status
parent6edf3199a212e6b33f9e09edbb3cb34710710326 (diff)
downloadfacter-a85f2b0f5c43f3b2324d06310a1d673438840e89.tar.gz
facter-a85f2b0f5c43f3b2324d06310a1d673438840e89.tar.xz
facter-a85f2b0f5c43f3b2324d06310a1d673438840e89.zip
[#2865] Fix reporting of virtual facts
Regexp tested the s_context or VxID field if /proc/self/status and returned false for 0 and true for any other number. 0 indicates a host, which is still virtual. Fix changes regexp to correctly report hosts as virtual. Tested against vserver 2.1 and 2.3.
Diffstat (limited to 'spec/fixtures/virtual/proc_self_status')
-rw-r--r--spec/fixtures/virtual/proc_self_status/vserver_2_1/guest37
-rw-r--r--spec/fixtures/virtual/proc_self_status/vserver_2_1/host36
-rw-r--r--spec/fixtures/virtual/proc_self_status/vserver_2_3/guest39
-rw-r--r--spec/fixtures/virtual/proc_self_status/vserver_2_3/host39
4 files changed, 151 insertions, 0 deletions
diff --git a/spec/fixtures/virtual/proc_self_status/vserver_2_1/guest b/spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
new file mode 100644
index 0000000..760cc24
--- /dev/null
+++ b/spec/fixtures/virtual/proc_self_status/vserver_2_1/guest
@@ -0,0 +1,37 @@
+Name: cat
+State: R (running)
+SleepAVG: 58%
+Tgid: 24671
+Pid: 24671
+PPid: 24670
+TracerPid: 0
+Uid: 0 0 0 0
+Gid: 0 0 0 0
+FDSize: 32
+Groups: 0
+VmPeak: 1580 kB
+VmSize: 1580 kB
+VmLck: 0 kB
+VmHWM: 372 kB
+VmRSS: 372 kB
+VmData: 152 kB
+VmStk: 88 kB
+VmExe: 16 kB
+VmLib: 1280 kB
+VmPTE: 12 kB
+Threads: 1
+SigQ: 0/4294967295
+SigPnd: 0000000000000000
+ShdPnd: 0000000000000000
+SigBlk: 0000000000000000
+SigIgn: 0000000000000000
+SigCgt: 0000000000000000
+CapInh: 0000000000000000
+CapPrm: 00000000344c04ff
+CapEff: 00000000344c04ff
+s_context: 40074
+ctxflags: 1602020010
+initpid: 0
+ipv4root: 4a00007f/ffffffff 4a24f6d5/00ffffff
+ipv4root_bcast: 00000000
+
diff --git a/spec/fixtures/virtual/proc_self_status/vserver_2_1/host b/spec/fixtures/virtual/proc_self_status/vserver_2_1/host
new file mode 100644
index 0000000..61a0845
--- /dev/null
+++ b/spec/fixtures/virtual/proc_self_status/vserver_2_1/host
@@ -0,0 +1,36 @@
+Name: cat
+State: R (running)
+SleepAVG: 88%
+Tgid: 24625
+Pid: 24625
+PPid: 24618
+TracerPid: 0
+Uid: 47000 47000 47000 47000
+Gid: 4733 4733 4733 4733
+FDSize: 32
+Groups: 0 4733
+VmPeak: 1768 kB
+VmSize: 1768 kB
+VmLck: 0 kB
+VmHWM: 396 kB
+VmRSS: 396 kB
+VmData: 160 kB
+VmStk: 88 kB
+VmExe: 28 kB
+VmLib: 1468 kB
+VmPTE: 12 kB
+Threads: 1
+SigQ: 0/4294967295
+SigPnd: 0000000000000000
+ShdPnd: 0000000000000000
+SigBlk: 0000000000000000
+SigIgn: 0000000000000000
+SigCgt: 0000000000000000
+CapInh: 0000000000000000
+CapPrm: 0000000000000000
+CapEff: 0000000000000000
+s_context: 0
+ctxflags: none
+initpid: none
+ipv4root: 0
+ipv4root_bcast: 0
diff --git a/spec/fixtures/virtual/proc_self_status/vserver_2_3/guest b/spec/fixtures/virtual/proc_self_status/vserver_2_3/guest
new file mode 100644
index 0000000..7567c38
--- /dev/null
+++ b/spec/fixtures/virtual/proc_self_status/vserver_2_3/guest
@@ -0,0 +1,39 @@
+Name: cat
+State: R (running)
+Tgid: 21149
+Pid: 21149
+PPid: 21142
+TracerPid: 0
+Uid: 0 0 0 0
+Gid: 0 0 0 0
+FDSize: 64
+Groups: 0
+VmPeak: 1564 kB
+VmSize: 1564 kB
+VmLck: 0 kB
+VmHWM: 384 kB
+VmRSS: 384 kB
+VmData: 160 kB
+VmStk: 84 kB
+VmExe: 16 kB
+VmLib: 1284 kB
+VmPTE: 20 kB
+Threads: 1
+SigQ: 0/71680
+SigPnd: 0000000000000000
+ShdPnd: 0000000000000000
+SigBlk: 0000000000000000
+SigIgn: 0000000000000000
+SigCgt: 0000000000000000
+CapInh: 0000000000000000
+CapPrm: fffffffffffffeff
+CapEff: fffffffffffffeff
+CapBnd: fffffffffffffeff
+Cpus_allowed: ff
+Cpus_allowed_list: 0-7
+Mems_allowed: 1
+Mems_allowed_list: 0
+VxID: 40128
+NxID: 40128
+voluntary_ctxt_switches: 1
+nonvoluntary_ctxt_switches: 0
diff --git a/spec/fixtures/virtual/proc_self_status/vserver_2_3/host b/spec/fixtures/virtual/proc_self_status/vserver_2_3/host
new file mode 100644
index 0000000..15b17e9
--- /dev/null
+++ b/spec/fixtures/virtual/proc_self_status/vserver_2_3/host
@@ -0,0 +1,39 @@
+Name: cat
+State: R (running)
+Tgid: 21074
+Pid: 21074
+PPid: 21020
+TracerPid: 0
+Uid: 47000 47000 47000 47000
+Gid: 4733 4733 4733 4733
+FDSize: 64
+Groups: 0 4733
+VmPeak: 3800 kB
+VmSize: 3800 kB
+VmLck: 0 kB
+VmHWM: 468 kB
+VmRSS: 468 kB
+VmData: 176 kB
+VmStk: 84 kB
+VmExe: 32 kB
+VmLib: 1432 kB
+VmPTE: 28 kB
+Threads: 1
+SigQ: 0/71680
+SigPnd: 0000000000000000
+ShdPnd: 0000000000000000
+SigBlk: 0000000000000000
+SigIgn: 0000000000000000
+SigCgt: 0000000000000000
+CapInh: 0000000000000000
+CapPrm: 0000000000000000
+CapEff: 0000000000000000
+CapBnd: fffffffffffffeff
+Cpus_allowed: ff
+Cpus_allowed_list: 0-7
+Mems_allowed: 1
+Mems_allowed_list: 0
+VxID: 0
+NxID: 0
+voluntary_ctxt_switches: 2
+nonvoluntary_ctxt_switches: 0