Page MenuHomeClusterLabs Projects
Files F3154951

No OneTemporary
Actions

View Options

diff --git a/.gitignore b/.gitignore
index 8ae92388..31169718 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,57 @@
*.orig
*.rej
*.swp
Makefile.in
aclocal.m4
autoconf
autoheader
autom4te.cache
automake
autoscan.log
compile
configure
configure.scan
config.guess
config.log
config.sub
config.status
Makefile
depcomp
install-sh
libtoolize
ltmain.sh
libtool
make/stamp-h1
# ignore "libtoolized" m4 files, but keep our (enumerated) ones
/m4/*
!/m4/ac_python_module.m4
# make/release.mk related litter
/.tarball-version
/tag-*
make/clusterautoconfig.h*
missing
*.pc
.deps
.libs
*.o
*.la
*.lo
lib/*.py*
+lib/__pycache__
!lib/*.py.py
!lib/check_used_options.py
agents/*/fence_*
agents/*/.dirstamp
!agents/*/fence_*.py
!agents/*/fence_*.c
!agents/*/fence_*.h
!agents/kdump/fence_kdump_send.8
!agents/manual/fence_ack_manual.8
!agents/zvm/fence_zvm_man_page
.fence*.tmp
fence-agents*
.version
tests/devices.d/*
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ba480b3b..fa93150a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,27 +1,30 @@
MAINTAINERCLEANFILES = Makefile.in
TARGET = fencing.py fencing_snmp.py azure_fence.py
if BUILD_XENAPILIB
TARGET += XenAPI.py
endif
SRC = fencing.py.py fencing_snmp.py.py XenAPI.py.py azure_fence.py.py check_used_options.py
XSL = fence2man.xsl fence2rng.xsl fence2wiki.xsl
FASRNG = fence.rng.head fence.rng.tail metadata.rng
EXTRA_DIST = $(SRC) $(XSL) $(FASRNG)
fencelibdir = ${FENCEAGENTSLIBDIR}
fencelib_DATA = $(TARGET)
rngdir = ${CLUSTERDATA}/relaxng
rng_DATA = $(XSL) $(FASRNG)
include $(top_srcdir)/make/fencebuild.mk
+xml-check: all
+xml-upload: all
+
clean-man:
diff --git a/make/agentpycheck.mk b/make/agentpycheck.mk
index 7022883e..58122c65 100644
--- a/make/agentpycheck.mk
+++ b/make/agentpycheck.mk
@@ -1,43 +1,43 @@
DATADIR:=$(abs_top_srcdir)/tests/data/metadata
AWK_VAL='BEGIN {store=-1} /name=\".*_path\"/ {store=2} {if (store!=0) {print}; store--}'
TEST_TARGET=$(filter-out $(TEST_TARGET_SKIP),$(TARGET))
check: $(TEST_TARGET:%=%.xml-check) $(SYMTARGET:%=%.xml-check) $(TEST_TARGET:%=%.delay-check) $(TEST_TARGET:%=%.rng-check)
xml-check: $(TEST_TARGET:%=%.xml-check) $(SYMTARGET:%=%.xml-check)
xml-upload: $(TEST_TARGET:%=%.xml-upload) $(SYMTARGET:%=%.xml-upload)
-%.xml-check: %
+%.xml-check: %.8
$(eval INPUT=$(subst .xml-check,,$(@F)))
for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
TEMPFILE=$$(mktemp); \
PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $$TEMPFILE && \
diff $$TEMPFILE $(DATADIR)/$$x.xml || exit 1 && \
rm $$TEMPFILE; \
done
-%.xml-upload: %
+%.xml-upload: %.8
$(eval INPUT=$(subst .xml-upload,,$(@F)))
for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | $(AWK) $(AWK_VAL) > $(DATADIR)/$$x.xml; \
done
# If test will fail, rerun fence agents to show problems
%.delay-check: %
$(eval INPUT=$(subst .delay-check,,$(@F)))
for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
test `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
sh -c "printf 'delay=10\n $(FENCE_TEST_ARGS)' | $(PYTHON) $(@D)/$$x" 2>&1 |\
awk -F"[. ]" -vOFS= '/real/ {print $$2,$$3}'` -ge 1000 || ( \
PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib /usr/bin/time -p \
sh -c "printf 'delay=0\n $(FENCE_TEST_ARGS)' | $(PYTHON) $(@D)/$$x"; false ); \
done
%.rng-check: %
$(eval INPUT=$(subst .rng-check,,$(@F)))
for x in $(INPUT) `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$(INPUT) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@D)/$$x -o metadata | \
xsltproc ${abs_top_srcdir}/lib/fence2rng.xsl - | \
sed -e 's/ rha:description=/ description=/g' -e 's/ rha:name=/ name=/g' | \
xmllint --nsclean --noout -; \
done
diff --git a/make/fencebuild.mk b/make/fencebuild.mk
index 143082f0..819e03e6 100644
--- a/make/fencebuild.mk
+++ b/make/fencebuild.mk
@@ -1,85 +1,85 @@
define gen_agent_from_py
mkdir -p `dirname $@`
cat $(abs_srcdir)/$@.py | \
sed \
-e 's#@''PYTHON@#${PYTHON}#g' \
-e 's#@''RELEASE_VERSION@#${VERSION}#g' \
-e 's#@''FENCEAGENTSLIBDIR@#${FENCEAGENTSLIBDIR}#g' \
-e 's#@''LOGDIR@#${LOGDIR}#g' \
-e 's#@''SBINDIR@#${sbindir}#g' \
-e 's#@''LIBEXECDIR@#${libexecdir}#g' \
-e 's#@''IPMITOOL_PATH@#${IPMITOOL_PATH}#g' \
-e 's#@''OPENSTACK_PATH@#${OPENSTACK_PATH}#g' \
-e 's#@''AMTTOOL_PATH@#${AMTTOOL_PATH}#g' \
-e 's#@''GNUTLSCLI_PATH@#${GNUTLSCLI_PATH}#g' \
-e 's#@''COROSYNC_CMAPCTL_PATH@#${COROSYNC_CMAPCTL_PATH}#g' \
-e 's#@''SG_PERSIST_PATH@#${SG_PERSIST_PATH}#g' \
-e 's#@''SG_TURS_PATH@#${SG_TURS_PATH}#g' \
-e 's#@''VGS_PATH@#${VGS_PATH}#g' \
-e 's#@''SUDO_PATH@#${SUDO_PATH}#g' \
-e 's#@''SSH_PATH@#${SSH_PATH}#g' \
-e 's#@''TELNET_PATH@#${TELNET_PATH}#g' \
-e 's#@''MPATH_PATH@#${MPATH_PATH}#g' \
-e 's#@''SBD_PATH@#${SBD_PATH}#g' \
-e 's#@''STORE_PATH@#${CLUSTERVARRUN}#g' \
-e 's#@''SUDO_PATH@#${SUDO_PATH}#g' \
-e 's#@''SNMPWALK_PATH@#${SNMPWALK_PATH}#g' \
-e 's#@''SNMPSET_PATH@#${SNMPSET_PATH}#g' \
-e 's#@''SNMPGET_PATH@#${SNMPGET_PATH}#g' \
-e 's#@''NOVA_PATH@#${NOVA_PATH}#g' \
-e 's#@''POWERMAN_PATH@#${POWERMAN_PATH}#g' \
-e 's#@''PING_CMD@#${PING_CMD}#g' \
-e 's#@''PING6_CMD@#${PING6_CMD}#g' \
-e 's#@''PING4_CMD@#${PING4_CMD}#g' \
> $@
if [ 0 -eq `echo "$(@)" | grep fence_ > /dev/null 2>&1; echo $$?` ]; then \
PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(top_srcdir)/lib/check_used_options.py $@; \
else true ; fi
for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
cp -f $(@) $(@D)/$$x; \
$(MAKE) $(@D)/$$x.8; \
done
endef
# dependency, one on one
$(foreach t,$(TARGET),$(eval $(t) : $(t:=.py)))
# rule
$(TARGET):
$(call gen_agent_from_py)
clean: clean-man
rm -f $(CLEAN_TARGET:%.8=%) $(CLEAN_TARGET_ADDITIONAL) $(mpathdata_SCRIPTS) $(scsidata_SCRIPTS) */*.pyc *.pyc */*.wiki
if [ "$(abs_builddir)" = "$(abs_top_builddir)/lib" ]; then \
- rm -f $(TARGET); \
+ rm -rf $(TARGET) __pycache__; \
fi
clean-local: clean
install-exec-hook: $(TARGET)
if [ -n "$(man8dir)" ]; then \
echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
fi
for p in $(TARGET); do \
dir=`dirname $$p`; \
for x in `PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \
echo " $(INSTALL_SCRIPT) $$dir/$$x '$(DESTDIR)$(sbindir)'"; \
$(INSTALL_SCRIPT) $$dir/$$x "$(DESTDIR)$(sbindir)" || exit $$?; \
echo " $(INSTALL_DATA) '$$dir/$$x.8' '$(DESTDIR)$(man8dir)'"; \
$(INSTALL_DATA) "$$dir/$$x.8" "$(DESTDIR)$(man8dir)" || exit $$?; \
done; \
done
uninstall-hook: $(TARGET)
files=`for p in $(TARGET); do \
for x in \`PYTHONPATH=$(abs_top_srcdir)/lib:$(abs_top_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \
echo " rm -f '$(DESTDIR)$(sbindir)/$$x'"; \
rm -f "$(DESTDIR)$(sbindir)/$$x"; \
echo " rm -f '$(DESTDIR)$(man8dir)/$$x.8'"; \
rm -f "$(DESTDIR)$(man8dir)/$$x.8"; \
done; \
done`

File Metadata

Mime Type
text/x-diff
Expires
Wed, Feb 26, 6:05 PM (1 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1465616
Default Alt Text
(7 KB)

Event Timeline