ACK. But please include the relevant parts of patch 2 and 3 and make
sure everything compiles before you commit.
On Mon, Nov 1, 2010 at 2:21 PM, Adam Stokes <astokes(a)fedoraproject.org> wrote:
- In order for package generation to pull in required schema classes
I consolidated so that it would generate 1 package file with the proper
includes. Otherwise they were overwriting themselves
---
src/schema-host.xml | 37 ----------------------
src/schema-net.xml | 45 ---------------------------
src/schema.xml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 84 insertions(+), 82 deletions(-)
delete mode 100644 src/schema-host.xml
delete mode 100644 src/schema-net.xml
create mode 100644 src/schema.xml
diff --git a/src/schema-host.xml b/src/schema-host.xml
deleted file mode 100644
index 4392be4..0000000
--- a/src/schema-host.xml
+++ /dev/null
@@ -1,37 +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="uint8"
access="RO" desc="The wordsize for the host."
unit="bit"/>
- <property name="processors" type="uint8"
access="RO" desc="The number of physical CPUs." />
- <property name="cores" type="uint8"
access="RO" desc="The total number of processor cores." />
- <property name="model" type="lstr"
access="RO" desc="The processor(s) model description." />
-
- <!-- statistics -->
- <statistic name="last_updated_seq" type="uint32"
desc="The heartbeat sequence number." />
- <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="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-net.xml b/src/schema-net.xml
deleted file mode 100644
index 01a2517..0000000
--- a/src/schema-net.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
https://cwiki.apache.org/qpid/qpid-management-framework.html -->
-<schema package="com.redhat.matahari.net">
- <class name="Network">
- <property name="hostname" type="sstr" access="RO"
desc="Hostname" index="y"/>
-
- <!-- APIs -
- <method name="identify" desc="Tell network device to
blink light"/>
- <method name="add_address" desc="Applies new IP address
to device">
- <arg name="address" dir="IO" type="uint32" />
- <arg name="netmask" dir="IO" type="uint32" />
- <arg name="intf" dir="IO" type="sstr" />
- </method>
- <method name="remove_address" desc="Remove IP
address"/>
- <method name="list_dns_servers" desc="List of DNS
servers">
- <arg name="iface" dir="IO" type="sstr" />
- </method-->
-
- <method name="list" desc="List IP addresses">
- <arg name="max" dir="O" type="uint32"
/>
- <arg name="iface_map" dir="O" type="map"
/> <!-- Use a list when 0.7 becomes available -->
- </method>
-
- <method name="destroy" desc="Remove network
interface">
- <arg name="iface" dir="I" type="sstr"
/>
- </method>
-
- <method name="start" desc="Start a network
interface">
- <arg name="iface" dir="I" type="sstr"
/>
- <arg name="status" dir="O" type="uint32"
/>
- </method>
- <method name="stop" desc="Stop a network
interface">
- <arg name="iface" dir="I" type="sstr"
/>
- <arg name="status" dir="O" type="uint32"
/>
- </method>
- <method name="status" desc="Check a network
interface">
- <arg name="iface" dir="I" type="sstr"
/>
- <arg name="status" dir="O" type="uint32"
/>
- </method>
- <method name="describe" desc="Obtain XML description of a
network interface status">
- <arg name="iface" dir="I" type="sstr"
/>
- <arg name="xml" dir="O" type="sstr"
/>
- </method>
- </class>
-
-</schema>
diff --git a/src/schema.xml b/src/schema.xml
new file mode 100644
index 0000000..5bddf9f
--- /dev/null
+++ b/src/schema.xml
@@ -0,0 +1,84 @@
+<schema package="com.redhat.matahari">
+
+<!-- HOST SCHEMA -->
+ <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="uint32"
access="RO" desc="Amount of primary memory for host (kb)"
unit="kb" />
+ <property name="swap" type="uint32"
access="RO" desc="Amount of swap 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="uint8"
access="RO" desc="The wordsize for the host."
unit="bit"/>
+ <property name="processors" type="uint8"
access="RO" desc="The number of physical CPUs." />
+ <property name="cores" type="uint8"
access="RO" desc="The total number of processor cores." />
+ <property name="model" type="lstr"
access="RO" desc="The processor(s) model description." />
+
+ <!-- statistics -->
+ <statistic name="last_updated_seq" type="uint32"
desc="The heartbeat sequence number." />
+ <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" />
+ <statistic name="memFree" type="uint32"
desc="Amount of available memory for host (kb)" />
+ <statistic name="swapFree" type="uint32"
desc="Amount of available swap for host (kb)" />
+ <statistic name="procTotal" type="uint32"
desc="Total processes" />
+ <statistic name="procRunning" type="uint32"
desc="Total running processes" />
+ <!-- APIs -->
+ <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" />
+
+ <!-- NETWORK SCHEMA -->
+ <class name="Network">
+ <property name="hostname" type="sstr" access="RO"
desc="Hostname" index="y"/>
+
+ <!-- APIs -
+ <method name="identify" desc="Tell network device to
blink light"/>
+ <method name="add_address" desc="Applies new IP address
to device">
+ <arg name="address" dir="IO" type="uint32" />
+ <arg name="netmask" dir="IO" type="uint32" />
+ <arg name="intf" dir="IO" type="sstr" />
+ </method>
+ <method name="remove_address" desc="Remove IP
address"/>
+ <method name="list_dns_servers" desc="List of DNS
servers">
+ <arg name="iface" dir="IO" type="sstr" />
+ </method-->
+
+ <method name="list" desc="List IP addresses">
+ <arg name="max" dir="O" type="uint32"
/>
+ <arg name="iface_map" dir="O" type="list"
/>
+ </method>
+
+ <method name="destroy" desc="Remove network
interface">
+ <arg name="iface" dir="I" type="sstr"
/>
+ </method>
+
+ <method name="start" desc="Start a network
interface">
+ <arg name="iface" dir="I" type="sstr"
/>
+ <arg name="status" dir="O" type="uint32"
/>
+ </method>
+ <method name="stop" desc="Stop a network
interface">
+ <arg name="iface" dir="I" type="sstr"
/>
+ <arg name="status" dir="O" type="uint32"
/>
+ </method>
+ <method name="status" desc="Check a network
interface">
+ <arg name="iface" dir="I" type="sstr"
/>
+ <arg name="status" dir="O" type="uint32"
/>
+ </method>
+ <method name="describe" desc="Obtain XML description of a
network interface status">
+ <arg name="iface" dir="I" type="sstr"
/>
+ <arg name="xml" dir="O" type="sstr"
/>
+ </method>
+ </class>
+</schema>
--
1.7.2.3
_______________________________________________
Matahari mailing list
Matahari(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/matahari