Merge commit '9c97c20ff839de6e704994ba4ac695b1f1936ed9'

Author: thomassa

Makefile

@@ -33,7 +33,6 @@ PLUGINDIR=/usr/lib/xcp/plugins
 HOOKSDIR=/etc/xcp/hook-scripts
 INVENTORY=/etc/xcp/inventory
 XAPICONF=/etc/xcp/xapi.conf
-RRDDCONF=/etc/xcp/rrdd.conf
 LIBEXECDIR=/usr/lib/xcp/lib
 SCRIPTSDIR=/usr/lib/xcp/scripts
 SHAREDIR=/usr/share/xcp
@@ -54,7 +53,6 @@ PLUGINDIR=/etc/xapi.d/plugins
 HOOKSDIR=/etc/xapi.d
 INVENTORY=/etc/xensource-inventory
 XAPICONF=/etc/xapi.conf
-RRDDCONF=/etc/xcp-rrdd.conf
 LIBEXECDIR=/opt/xensource/libexec
 SCRIPTSDIR=/etc/xensource/scripts
 SHAREDIR=/opt/xensource
@@ -70,7 +68,7 @@ EXTRA_INSTALL_PATH=
 endif
 
 
-export ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF RRDDCONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR SBINDIR UDEVDIR OCAMLPATH EXTRA_INSTALL_PATH
+export ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR SBINDIR UDEVDIR OCAMLPATH EXTRA_INSTALL_PATH
 
 .PHONY: all
 all: version ocaml/fhs.ml
@@ -92,13 +90,9 @@ test:
 #	Pipe ugly bash output to /dev/null
 	@echo @ xapi unit test suite
 	@./ocaml/test/suite -verbose
-	@echo @ xenops-cli unit test
-	@./ocaml/xenops-cli/runtest.sh 2> /dev/null
 	@echo
 	@echo @ HA binpack test
 	@./ocaml/xapi/binpack
-	@echo @ squeezed test
-	@./ocaml/xenops/squeeze_test
 #	The following test no longer runs:
 #	./ocaml/database/database_test
 #	The following test no longer compiles:
@@ -182,7 +176,6 @@ ocaml/fhs.ml :
 	let hooksdir=\"$(HOOKSDIR)\"\n \
 	let libexecdir=\"$(LIBEXECDIR)\"\n \
 	let xapiconf=\"$(XAPICONF)\"\n \
-	let rrddconf=\"$(RRDDCONF)\"\n \
 	let scriptsdir=\"$(SCRIPTSDIR)\"\n \
 	let varpatchdir=\"$(VARPATCHDIR)\"\n \
 	let webdir=\"$(WEBDIR)\"\n \
@@ -196,26 +189,21 @@ ocaml/fhs.ml :
  clean:
 
 xapi.spec: xapi.spec.in
-noarch.spec: noarch.spec.in
-
-%.spec: %.spec.in
 	sed -e 's/@RPM_RELEASE@/$(shell git rev-list HEAD | wc -l)/g' < $< > $@
 	sed -i "s!@OPTDIR@!${OPTDIR}!g" $@
 
 .PHONY: srpm
-srpm: xapi.spec noarch.spec
+srpm: xapi.spec
 	mkdir -p $(RPM_SOURCESDIR) $(RPM_SPECSDIR) $(RPM_SRPMSDIR)
 	while ! [ -d .git ]; do cd ..; done; \
 	git archive --prefix=xapi-0.2/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-0.2.tar.bz2 # xen-api/Makefile
-	git archive --prefix=xapi-noarch-0.2/ --format=tar HEAD | bzip2 -z > $(RPM_SOURCESDIR)/xapi-noarch-0.2.tar.bz2 # xen-api/Makefile
 	cp $(JQUERY) $(JQUERY_TREEVIEW) $(RPM_SOURCESDIR)
 	make -C $(REPO) version
 	rm -f $(RPM_SOURCESDIR)/xapi-version.patch
 	(cd $(REPO); diff -u /dev/null ocaml/util/version.ml > $(RPM_SOURCESDIR)/xapi-version.patch) || true
-	cp -f xapi.spec noarch.spec $(RPM_SPECSDIR)/
-	chown root.root $(RPM_SPECSDIR)/xapi.spec $(RPM_SPECSDIR)/noarch.spec || true
+	cp -f xapi.spec $(RPM_SPECSDIR)/
+	chown root.root $(RPM_SPECSDIR)/xapi.spec || true
 	$(RPMBUILD) -bs --nodeps $(RPM_SPECSDIR)/xapi.spec
-	$(RPMBUILD) -bs --nodeps $(RPM_SPECSDIR)/noarch.spec
 
 
 .PHONY: build

OMakefile

@@ -26,7 +26,7 @@ OCAMLDEP_MODULES_ENABLED = false
 
 USE_OCAMLFIND = true
 
-OCAMLFLAGS = -g -dtypes -thread -warn-error +a-4-6-9-27-28-29
+OCAMLFLAGS = -g -dtypes -bin-annot -thread -warn-error +a-4-6-9-27-28-29
 
 # c compiling stuff
 OCAMLCFLAGS += -g
@@ -128,9 +128,7 @@ export
 # Ocaml #############################################################################
 OCAML_PHASE1= autogen_idl
 OCAML_PHASE2= \
-  $(if $(BYTE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cma) $(if $(NATIVE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cmxa) \
-  $(if $(BYTE_ENABLED), ocaml/rrdd/rrd_client.cma) $(if $(NATIVE_ENABLED), ocaml/rrdd/rrd_client.cmxa) \
-  ocaml/rrdd/xcp-rrdd ocaml/rrdd/rrdd_test
+  $(if $(BYTE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cma) $(if $(NATIVE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cmxa) 
 
 # JS ################################################################################
 JS_PHASE1=
@@ -154,18 +152,14 @@ JAVA_PHASE3_TARGETS = $(if $(COMPILE_JAVA), $(JAVA_PHASE3))
 OCAML_PHASE3_XEN = \
 	ocaml/xapi/xapi \
 	allxenops \
-	ocaml/xenops-cli/xn \
-	ocaml/xenops-cli/xenopstest \
 	ocaml/xenops/cancel_utils_test \
 	ocaml/xenguest/xenguest \
 	ocaml/xenguest/dumpcore \
 	ocaml/xapi/quicktestbin \
 	ocaml/xapi/sparse_dd \
 	ocaml/xapi/storage_impl_test \
 	ocaml/xapi/cancel_tests \
-	ocaml/license/v6d \
-	ocaml/network/xcp-networkd \
-	ocaml/network/networkd_db
+	ocaml/license/v6d
 
 #ocaml/xapi/monitor_fake_plugin
 
@@ -174,8 +168,6 @@ OCAML_PHASE3_NOXEN = \
 	ocaml/auth/testauth \
 	ocaml/auth/testauthx \
 	ocaml/xe-cli/xe \
-	ocaml/sm-cli/sm \
-	ocaml/sm-cli/smtest \
 	ocaml/xsh/xsh \
 	ocaml/xe-cli/rt/test_host \
 	ocaml/xe-cli/rt/gtclient \
@@ -226,4 +218,4 @@ phase2: $(OCAML_PHASE2_TARGETS) $(JS_PHASE2_TARGETS) $(JAVA_PHASE2_TARGETS)
 phase3: $(OCAML_PHASE3_TARGETS) $(JS_PHASE3_TARGETS) $(JAVA_PHASE3_TARGETS)
 
 .PHONY: test
-test: ocaml/xenops/xenopsd ocaml/xenops-cli/xenopstest ocaml/xenops-cli/runtest.sh ocaml/test/suite ocaml/database/database_test ocaml/xenops/squeeze_test
+test: ocaml/test/suite ocaml/database/database_test

docs/en/man/man1/xe-bond-param-get.ad

@@ -0,0 +1,61 @@
+XE(1)
+=======
+:doctype: manpage
+:man source:   xe bond-param-get
+:man version:  {1}
+:man manual:   xe bond-param-get manual
+
+NAME
+----
+xe-bond-param-get - Returns a parameter for a bond
+
+SYNOPSIS
+--------
+*xe bond-param-get* uuid=<BOND UUID> param-name=<PARAMETER> [ param-key=<PARAMETER KEY> ]
+
+DESCRIPTION
+-----------
+*xe bond-param-get* returns a parameter or a key value from a specific bond.
+
+REQUIRED PARAMETERS
+-------------------
+*uuid*::
+	UUID of bond - Use *xe bond-list* to obtain a list of bonds
+
+*param-name*::
+	The bond parameter to return - Use *xe bond-param-list* to obtain a list of bond parameters 
+
+OPTIONAL PARAMETERS
+-------------------
+*param-key*::
+	The bond key to return
+
+EXAMPLES
+--------
+To return the mode parameter value from a specific bond:
+
+- *xe bond-param-get* uuid=<BOND UUID> param-name="mode"
+
+To return the value from a key found in the properties parameter:
+
+- *xe bond-param-get* uuid=<BOND UUID> param-name="properties" param-key=<PARAMETER KEY>
+
+SEE ALSO
+--------
+*xe help bond-param-get*, *xe-bond-create*(1), *xe-bond-destroy*(1), *xe-bond-set-mode*(1), *xe-bond-param-list*(1) *xe-bond-param-get*(1), *xe-bond-param-set*(1), *xe-pif-list*(1)
+
+AUTHORS
+-------
+Manpage Author(s):
+
+- Matthew Spah <[email protected]>
+
+BUGS
+----
+For guidelines on submitting bug reports see http://wiki.xen.org/wiki/Reporting_Bugs_against_XCP. Submit bugs and general questions to [email protected].
+
+COPYRIGHT
+---------
+Copyright \(C)  2012 - Matthew Spah
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License."
+

docs/en/man/man1/xe-bond-param-list.ad

@@ -0,0 +1,49 @@
+XE(1)
+=======
+:doctype: manpage
+:man source:   xe bond-param-list
+:man version:  {1}
+:man manual:   xe bond-param-list manual
+
+NAME
+----
+xe-bond-param-list -  Displays all parameters for a bond
+
+SYNOPSIS
+--------
+*xe bond-param-list* uuid=<BOND UUID>
+
+DESCRIPTION
+-----------
+*xe bond-param-list* displays all parameters for a specific bond.
+
+REQUIRED PARAMETERS
+-------------------
+*uuid*::
+	Bond UUID - Use *xe bond-list* to obtain a list of bonds.
+
+EXAMPLES
+--------
+To display parameters for a bond:
+
+- *xe bond-param-list* uuid=<BOND UUID>
+
+SEE ALSO
+--------
+*xe help bond-param-list*, *xe-bond-create*(1), *xe-bond-destroy*(1), *xe-bond-set-mode*(1), *xe-bond-param-get*(1), *xe-bond-param-set*(1), *xe-pif-list*(1)
+
+AUTHORS
+-------
+Manpage Author(s):
+
+- Matthew Spah <[email protected]>
+
+BUGS
+----
+For guidelines on submitting bug reports see http://wiki.xen.org/wiki/Reporting_Bugs_against_XCP. Submit bugs and general questions to [email protected].
+
+COPYRIGHT
+---------
+Copyright \(C)  2012 - Matthew Spah
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License"
+

docs/en/man/man1/xe-host-param-get.ad

@@ -0,0 +1,57 @@
+XE(1)
+=======
+:doctype: manpage
+:man source:   xe host-param-get
+:man version:  {1}
+:man manual:   xe host-param-get manual
+
+NAME
+-----
+xe-host-param-get - Return a parameter for a host
+
+SYNOPSIS
+--------
+*xe host-param-get*  uuid=<HOST UUID> param-name=<PARAMETER> [ param-key=<PARAMETER KEY> ]
+
+DESCRIPTION
+-----------
+*xe host-param-get* returns the value(s) of a parameter or a map parameter key value for a specified host.
+
+REQUIRED PARAMETERS
+-------------------
+*uuid*:: 
+	Host UUID - Use *xe host-list* to obtain a list of host UUIDs.
+
+*param-name*:: 
+	The host parameter value to return - Use *xe host-param-list* to obtain a list of host parameters
+
+OPTIONAL PARAMETERS
+-------------------
+*param-key*:: 
+	The host key value to return
+ 
+EXAMPLES
+--------
+To return the UUID of the Suspend Image Storage Repository: 
+
+- *xe host-param-get* uuid=<HOST UUID> param-name="suspend-image-sr-uuid"
+
+
+SEE ALSO
+--------
+*xe help host-param-get*, *xe host-list*(1), *xe host-param-set*(1), *xe host-param-remove*(1). *xe host-param-clear*(1), *xe host-param-add*(1)
+
+AUTHORS
+-------
+Manpage Author(s):
+
+- Matthew Spah <[email protected]>
+
+BUGS
+----
+For guidelines on submitting bug reports see http://wiki.xen.org/wiki/Reporting_Bugs_against_XCP. Submit bugs and general questions to [email protected].
+
+COPYRIGHT
+---------
+Copyright \(C)  2013 - Matthew Spah
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".

docs/en/man/man1/xe-host-param-list.ad

@@ -0,0 +1,48 @@
+XE(1)
+=======
+:doctype: manpage
+:man source:   xe host-param-list
+:man version:  {1}
+:man manual:   xe host-param-list manual
+
+NAME
+----
+xe-host-param-list - Displays all parameters for a host 
+
+SYNOPSIS
+--------
+*xe host-param-list* uuid=<HOST UUID>
+
+DESCRIPTION
+-----------
+*xe host-param-list* displays all parameters for a specific host. 
+
+REQUIRED PARAMETERS
+-------------------
+*uuid*::
+	Host UUID - Use *xe host-list* to obtain a list of Host UUIDs.
+	
+EXAMPLES
+--------
+To display all parameters for a specific host:
+
+- *xe host-param-list* uuid=<HOST UUID>
+
+SEE ALSO
+--------
+*xe help host-param-list*, *xe-host-enable*(1), *xe-host-list*(1), *xe-host-param-get*(1), *xe-host-disable*(1), *xe-host-forget*(1), *xe-host-power-on*(1)
+
+AUTHORS
+-------
+Manpage Author(s):
+
+- Matthew Spah <[email protected]>
+
+BUGS
+----
+For guidelines on submitting bug reports see http://wiki.xen.org/wiki/Reporting_Bugs_against_XCP. Submit bugs and general questions to [email protected].
+
+COPYRIGHT
+---------
+Copyright \(C) 2013 - Matthew Spah
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".