Merge remote-tracking branch 'origin/master' into software-smash

Conflicts:
	src/software/cli/software.py
	src/software/openlmi/__init__.py
	src/software/openlmi/software/LMI_HostedSoftwareIdentityResource.py
	src/software/openlmi/software/LMI_SoftwareFileCheck.py
	src/software/openlmi/software/LMI_SoftwareInstalledPackage.py
	src/software/openlmi/software/LMI_SoftwarePackage.py
	src/software/openlmi/software/__init__.py
	src/software/openlmi/software/cimom_entry.py
	src/software/openlmi/software/core/ComputerSystem.py
	src/software/openlmi/software/core/SoftwareFileCheck.py
	src/software/openlmi/software/core/SoftwareInstalledPackage.py
	src/software/openlmi/software/core/SoftwarePackage.py
	src/software/openlmi/software/core/SoftwarePackageChecks.py
	src/software/openlmi/software/core/__init__.py
	src/software/openlmi/software/util/__init__.py
	src/software/openlmi/software/yumdb/__init__.py
	src/software/openlmi/software/yumdb/errors.py
	src/software/openlmi/software/yumdb/jobs.py
	src/software/openlmi/software/yumdb/packagecheck.py
	src/software/openlmi/software/yumdb/packageinfo.py
	src/software/openlmi/software/yumdb/process.py
	src/software/test/base.py
	src/software/test/rpmcache.py
	src/software/test/run.py
	src/software/test/test_software_file_check.py
	src/software/test/test_software_installed_package.py
	src/software/test/test_software_package.py

7 files changed, 179 insertions, 14 deletions

diff --git a/mof/LMI_Account.mof b/mof/LMI_Account.mof
index 6619fb1..d79db35 100644
--- a/mof/LMI_Account.mof
+++ b/mof/LMI_Account.mof
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -46,7 +46,7 @@ class LMI_Account: CIM_Account
 };
 
 [ Description("LMI_AccountManagementService creates, manages, and if necessary "
-        "destroys Linux Accounts on behalf of other SecuritySerices."),
+        "destroys Linux Accounts on behalf of other SecurityServices."),
   Provider("cmpi:cmpiLMI_Account")
 ]
 class LMI_AccountManagementService: CIM_SecurityService
diff --git a/mof/LMI_Fan.mof b/mof/LMI_Fan.mof
index 2bcd1fc..3c964cf 100644
--- a/mof/LMI_Fan.mof
+++ b/mof/LMI_Fan.mof
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/mof/LMI_Hardware.mof b/mof/LMI_Hardware.mof
index 87d5741..4848ef1 100644
--- a/mof/LMI_Hardware.mof
+++ b/mof/LMI_Hardware.mof
@@ -16,20 +16,115 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Authors: Tomas Smetana <tsmetana@redhat.com>
+ *          Peter Schiffer <pschiffe@redhat.com>
  */
 
+[ Provider("cmpi:cmpiLMI_Processor") ]
+class LMI_Processor: CIM_Processor
+{
+    [ Description("System architecture.") ]
+    string Architecture;
+
+    /* Added "Multi-Core" characteristic from dmidecode program. */
+    [ Override("Characteristics"),
+    ValueMap { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9..32567",
+        "32568", "32569..65535" },
+    Values { "Unknown", "DMTF Reserved", "64-bit Capable", "32-bit Capable",
+        "Enhanced Virtualization", "Hardware Thread", "NX-bit",
+        "Power/Performance Control", "Core Frequency Boosting",
+        "DMTF Reserved", "Multi-Core", "Vendor Reserved" } ]
+    uint16 Characteristics[];
+
+    /* Flag IDs and names are based on:
+       linux-3.8/arch/x86/include/asm/cpufeature.h */
+    [ Description ("Flags supported by Processor. "
+        "(Available only for x86 architecture.)"),
+    ValueMap {
+        /* 0*32 */
+        "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "11", "12", "13",
+        "14", "15", "16", "17", "18", "19", "21", "22", "23", "24", "25", "26",
+        "27", "28", "29", "30", "31",
+        /* 1*32 */
+        "43", "51", "52", "54", "57", "58", "59", "61", "62", "63",
+        /* 2*32 */
+        "64", "65", "67",
+        /* 3*32 */
+        "96", "97", "98", "99", "100", "101", "102", "103", "104", "105",
+        "106", "107", "108", "109", "110", "111", "112", "113", "114", "115",
+        "116", "118", "119", "120", "121", "122", "123", "124", "125",
+        /* 4*32 */
+        "128", "129", "130", "131", "132", "133", "134", "135", "136", "137",
+        "138", "140", "141", "142", "143", "145", "146", "147", "148", "149",
+        "150", "151", "152", "153", "154", "155", "156", "157", "158", "159",
+        /* 5*32 */
+        "162", "163", "166", "167", "168", "169", "170", "171", "172", "173",
+        /* 6*32 */
+        "192", "193", "194", "195", "196", "197", "198", "199", "200", "201",
+        "202", "203", "204", "205", "207", "208", "209", "211", "213", "214",
+        "215",
+        /* 7*32 */
+        "224", "225", "226", "227", "228", "229", "230", "231", "232",
+        /* 8*32 */
+        "256", "257", "258", "259", "260", "261", "262", "263", "264", "265",
+        "266", "267", "268", "269", "270",
+        /* 9*32 */
+        "288", "289", "291", "292", "293", "295", "296", "297", "298", "299",
+        "306", "307", "308" },
+    Values {
+        /* 0*32 */
+        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic",
+        "sep", "mtrr", "pge", "mca", "cmov", "pat", "pse36", "pn", "clflush",
+        "dts", "acpi", "mmx", "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64",
+        "pbe",
+        /* 1*32 */
+        "syscall", "mp", "nx", "mmxext", "fxsr_opt", "pdpe1gb", "rdtscp", "lm",
+        "3dnowext", "3dnow",
+        /* 2*32 */
+        "recovery", "longrun", "lrti",
+        /* 3*32 */
+        "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr", "k8", "k7", "p3", "p4",
+        "constant_tsc", "up", "fxsave_leak", "arch_perfmon", "pebs", "bts",
+        "syscall32", "sysenter32", "rep_good", "mfence_rdtsc", "lfence_rdtsc",
+        "11ap", "nopl", "xtopology", "tsc_reliable", "nonstop_tsc",
+        "clflush_monitor", "extd_apicid", "amd_dcm", "aperfmperf", "eagerfpu",
+        /* 4*32 */
+        "pni", "pclmulqdq", "dtes64", "monitor", "ds_cpl", "vmx", "smx", "est",
+        "tm2", "ssse3", "cid", "fma", "cx16", "xtpr", "pdcm", "pcid", "dca",
+        "sse4_1", "sse4_2", "x2apic", "movbe", "popcnt", "tsc_deadline_timer",
+        "aes", "xsave", "osxsave", "avx", "f16c", "rdrand", "hypervisor",
+        /* 5*32 */
+        "rng", "rng_en", "ace", "ace_en", "ace2","ace2_en", "phe", "phe_en",
+        "pmm", "pmm_en",
+        /* 6*32 */
+        "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy", "abm",
+        "sse4a", "misalignsse", "3dnowprefetch", "osvw", "ibs", "xop",
+        "skinit", "wdt", "lwp", "fma4", "tce", "nodeid_msr", "tbm", "topoext",
+        "perfctr_core",
+        /* 7*32 */
+        "ida", "arat", "cpb", "epb", "xsaveopt", "pln", "pts", "dtherm",
+        "hw_pstate",
+        /* 8*32 */
+        "tpr_shadow", "vnmi", "flexpriority", "ept", "vpid", "npt", "lbrv",
+        "svm_lock", "nrip_save", "tsc_scale", "vmcb_clean", "flushbyasid",
+        "decodeassists", "pausefilter", "pfthreshold",
+        /* 9*32 */
+        "fsgsbase", "tsc_adjust", "bmi1", "hle", "avx2", "smep", "bmi2",
+        "erms", "invpcid", "rtm", "rdseed", "adx", "smap" } ]
+    uint16 Flags[];
+};
+
 [ Provider("cmpi:cmpiLMI_PCIDevice") ]
 class LMI_PCIDevice: CIM_PCIDevice
 {
-	[ Description("Name of the subsystem") ]
-	string SubsystemName;
+    [ Description("Name of the subsystem") ]
+    string SubsystemName;
 
-	[ Description("Name of the subsystem vendor") ]
-	string SubsystemVendorName;
+    [ Description("Name of the subsystem vendor") ]
+    string SubsystemVendorName;
 
-	[ Description("Name of the device") ]
-	string PCIDeviceName;
+    [ Description("Name of the device") ]
+    string PCIDeviceName;
 
-	[ Description("Name of the vendor") ]
-	string VendorName;
+    [ Description("Name of the vendor") ]
+    string VendorName;
 };
diff --git a/mof/LMI_LogicalFile.mof b/mof/LMI_LogicalFile.mof
new file mode 100644
index 0000000..7ae2e82
--- /dev/null
+++ b/mof/LMI_LogicalFile.mof
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors: Jan Synacek <jsynacek@redhat.com>
+ */
+
+
+class LMI_UnixFile : CIM_UnixFile
+{
+};
+
+class LMI_DataFile : CIM_DataFile
+{
+};
+
+class LMI_UnixDeviceFile : CIM_UnixDeviceFile
+{
+};
+
+class LMI_UnixDirectory : CIM_UnixDirectory
+{
+};
+
+class LMI_FIFOPipeFile : CIM_FIFOPipeFile
+{
+};
+
+class LMI_SymbolicLink : CIM_SymbolicLink
+{
+};
+
+class LMI_UnixSocket : CIM_DataFile
+{
+};
+
+class LMI_FileIdentity : CIM_FileIdentity
+{
+};
+
+class LMI_DirectoryContainsFile : CIM_DirectoryContainsFile
+{
+};
+
+[ Association,
+  Provider("cmpi:cmpiLMI_LogicalFile") ]
+class LMI_RootDirectory: CIM_Component
+{
+  [ Override("GroupComponent"), Min(1), Max(1),
+    Description("The hosting System.") ]
+  CIM_ComputerSystem REF GroupComponent;
+
+  [ Override("PartComponent"), Min(1), Max(1),
+    Description("The root directory on the System") ]
+  LMI_UnixDirectory REF PartComponent;
+};
+/* vi: set et: */
diff --git a/mof/LMI_PowerManagement.mof b/mof/LMI_PowerManagement.mof
index 945355e..c285f79 100644
--- a/mof/LMI_PowerManagement.mof
+++ b/mof/LMI_PowerManagement.mof
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/mof/LMI_Service.mof b/mof/LMI_Service.mof
index d3cfbc5..d6c3715 100644
--- a/mof/LMI_Service.mof
+++ b/mof/LMI_Service.mof
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/mof/LMI_Software.mof b/mof/LMI_Software.mof
index 8a2ca10..f964ec4 100644
--- a/mof/LMI_Software.mof
+++ b/mof/LMI_Software.mof
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2012-2013 Red Hat, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public