looks good
On Mon, Jul 26, 2010 at 3:55 PM, Darryl L. Pierce <dpierce(a)redhat.com> wrote:
Signed-off-by: Darryl L. Pierce <dpierce(a)redhat.com>
---
src/Makefile.am | 9 ++++++---
src/schema-host.xml | 38 ++++++++++++++++++++++++++++++++++++++
src/schema.xml | 38 --------------------------------------
3 files changed, 44 insertions(+), 41 deletions(-)
create mode 100644 src/schema-host.xml
delete mode 100644 src/schema.xml
diff --git a/src/Makefile.am b/src/Makefile.am
index daddf9d..304214c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,8 +27,11 @@ matahari_SOURCES = \
qmf/hostagent.cpp \
qmf/hostagent.h
-$(generated_file_list): schema.xml
- qmf-gen -o ./qmf ./schema.xml
+SCHEMAS = \
+ schema-host.xml
+
+$(generated_file_list): $(SCHEMAS)
+ qmf-gen -o ./qmf $(SCHEMAS)
BUILT_SOURCES = $(generated_file_list)
CLEANFILES = $(generated_file_list)
@@ -37,4 +40,4 @@ matahari_CPPFLAGS = -fno-strict-aliasing
matahari_LDADD = -lpcre -lqmf -lqpidclient -lqpidcommon -ludev -lvirt
matahari_LDADD += ../lib/libmatahari.a
-dist_pkgdata_DATA = schema.xml
+dist_pkgdata_DATA = schema-host.xml
diff --git a/src/schema-host.xml b/src/schema-host.xml
new file mode 100644
index 0000000..7a223f9
--- /dev/null
+++ b/src/schema-host.xml
@@ -0,0 +1,38 @@
+<schema package="com.redhat.matahari.host">
+
+ <class name="Host">
+ <!-- properties -->
+ <property name="uuid" type="sstr"
access="RO" desc="Host UUID" index="y" />
+ <property name="hostname" type="sstr"
access="RO" desc="Hostname" />
+ <property name="is_virtual" type="bool"
access="RO" desc="Is this machine virtual?" />
+ <property name="operating_system" type="sstr"
access="RO" desc="The installed operating system." />
+ <property name="memory" type="int64"
access="RO" desc="Amount of primary memory for host (kb)"
unit="kb" />
+ <property name="arch" type="sstr"
access="RO" desc="Architecture of host" />
+ <property name="hypervisor" type="sstr"
access="RO" desc="Hypervisor used by host" />
+ <property name="platform" type="sstr"
access="RO" desc="The wordsize for the host." />
+ <property name="cpu_model" type="lstr"
access="RO" desc="The process model description." />
+ <property name="cpu_count" type="uint8"
access="RO" desc="The number of physical CPUs." />
+ <property name="cpu_cores" type="uint8"
access="RO" desc="The total number of processor cores." />
+
+ <!-- statistics -->
+ <statistic name="last_updated" type="absTime"
desc="The last time a heartbeat occurred." />
+ <statistic name="load_average_1" type="double"
desc="The one minute load average." />
+ <statistic name="load_average_5" type="double"
desc="The five minute load average." />
+ <statistic name="load_average_15" type="double"
desc="The fiften minute load average" />
+
+ <!-- APIs -->
+ <method name="list_network_interfaces" desc="Returns the list of
all network interfaces." />
+ <method name="identify" desc="Tells the host to beep
its pc speaker." />
+ <method name="shutdown" desc="Shutdown node"
/>
+ <method name="reboot" desc="Reboot node"
/>
+
+ </class>
+
+ <eventArguments>
+ <arg name="timestamp" type="absTime" />
+ <arg name="sequence" type="uint32" />
+ </eventArguments>
+
+ <event name="heartbeat" args="timestamp,sequence" />
+
+</schema>
diff --git a/src/schema.xml b/src/schema.xml
deleted file mode 100644
index 7a223f9..0000000
--- a/src/schema.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<schema package="com.redhat.matahari.host">
-
- <class name="Host">
- <!-- properties -->
- <property name="uuid" type="sstr"
access="RO" desc="Host UUID" index="y" />
- <property name="hostname" type="sstr"
access="RO" desc="Hostname" />
- <property name="is_virtual" type="bool"
access="RO" desc="Is this machine virtual?" />
- <property name="operating_system" type="sstr"
access="RO" desc="The installed operating system." />
- <property name="memory" type="int64"
access="RO" desc="Amount of primary memory for host (kb)"
unit="kb" />
- <property name="arch" type="sstr"
access="RO" desc="Architecture of host" />
- <property name="hypervisor" type="sstr"
access="RO" desc="Hypervisor used by host" />
- <property name="platform" type="sstr"
access="RO" desc="The wordsize for the host." />
- <property name="cpu_model" type="lstr"
access="RO" desc="The process model description." />
- <property name="cpu_count" type="uint8"
access="RO" desc="The number of physical CPUs." />
- <property name="cpu_cores" type="uint8"
access="RO" desc="The total number of processor cores." />
-
- <!-- statistics -->
- <statistic name="last_updated" type="absTime"
desc="The last time a heartbeat occurred." />
- <statistic name="load_average_1" type="double"
desc="The one minute load average." />
- <statistic name="load_average_5" type="double"
desc="The five minute load average." />
- <statistic name="load_average_15" type="double"
desc="The fiften minute load average" />
-
- <!-- APIs -->
- <method name="list_network_interfaces" desc="Returns the list of
all network interfaces." />
- <method name="identify" desc="Tells the host to beep
its pc speaker." />
- <method name="shutdown" desc="Shutdown node"
/>
- <method name="reboot" desc="Reboot node"
/>
-
- </class>
-
- <eventArguments>
- <arg name="timestamp" type="absTime" />
- <arg name="sequence" type="uint32" />
- </eventArguments>
-
- <event name="heartbeat" args="timestamp,sequence" />
-
-</schema>
--
1.7.1.1
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari