Merge pull request #1937 from djs55/CA-146104

CA-146104: re-add xenopsd bugtool plugin

Author: djs55

scripts/OMakefile

@@ -19,12 +19,15 @@ install:
 	mkdir -p $(DESTDIR)/var/lib/xcp
 	$(IPROG) base-path $(DESTDIR)/etc/xapi.d
 	$(IPROG) sm_diagnostics $(DESTDIR)$(LIBEXECDIR)
+	$(IPROG) xn_diagnostics $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) thread_diagnostics $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) list_plugins $(DESTDIR)$(LIBEXECDIR)
 	mkdir -p $(DESTDIR)$(ETCDIR)/bugtool/xapi
 	mkdir -p $(DESTDIR)$(ETCDIR)/bugtool/xenopsd
 	$(IDATA) bugtool-plugin/xapi.xml $(DESTDIR)$(ETCDIR)/bugtool
 	$(IDATA) bugtool-plugin/xapi/stuff.xml $(DESTDIR)$(ETCDIR)/bugtool/xapi
+	$(IDATA) bugtool-plugin/xenopsd.xml $(DESTDIR)$(ETCDIR)/bugtool
+	$(IDATA) bugtool-plugin/xenopsd/stuff.xml $(DESTDIR)$(ETCDIR)/bugtool/xenopsd
 	$(IPROG) fence $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) xha-lc $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) xapi-health-check $(DESTDIR)$(LIBEXECDIR)

scripts/xn_diagnostics

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-echo xn list:
-xn list
+echo xenops-cli list:
+xenops-cli list
 echo
-echo xn list verbose:
-xn list verbose
+echo xenops-cli list verbose:
+xenops-cli list --verbose --debug
 echo
-xn diagnostics
+xenops-cli diagnostics

xapi.spec.in

@@ -180,8 +180,11 @@ rm -rf $RPM_BUILD_ROOT
 @OPTDIR@/bin/xsh
 /etc/xensource/bugtool/xapi.xml
 /etc/xensource/bugtool/xapi/stuff.xml
+/etc/xensource/bugtool/xenopsd.xml
+/etc/xensource/bugtool/xenopsd/stuff.xml
 @OPTDIR@/libexec/list_plugins
 @OPTDIR@/libexec/sm_diagnostics
+@OPTDIR@/libexec/xn_diagnostics
 @OPTDIR@/libexec/thread_diagnostics
 @OPTDIR@/libexec/InterfaceReconfigure.py
 @OPTDIR@/libexec/InterfaceReconfigure.pyo