Ovirt engine 4.1.2.z

Makefile

@@ -64,6 +64,7 @@ PKG_DOC_DIR=$(DOC_DIR)/$(ENGINE_NAME)
 PKG_HTML_DIR=$(PKG_DOC_DIR)
 PKG_EAR_DIR=$(DATA_DIR)/engine.ear
 PKG_JBOSS_MODULES=$(DATA_DIR)/modules
+PKG_LOGUTILS=$(DATA_DIR)/logutils
 PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME)
 PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME)
 PKG_STATE_DIR=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME)
@@ -372,6 +373,11 @@ install_artifacts:
 		unzip -q -o -d "$(DESTDIR)$(PKG_HTML_DIR)/$${comp}" "$${f}"; \
 	done
 
+	# logutils.jar is need only for tools and it's loaded from boot
+	# classpath -> we need to handle it differently than other jars
+	install -dm 0755 "$(DESTDIR)$(PKG_LOGUTILS)"
+	find "$(MAVEN_OUTPUT_DIR)" -name 'logutils-*.jar' -not -name 'logutils-*-tests.jar' -type f -exec install -m 644 {} "$(DESTDIR)$(PKG_LOGUTILS)/logutils.jar" \;
+
 	# extract embedded artifacts as doc
 	# no need to relay on source tree for these
 	install -d -m 755 "$(DESTDIR)$(PKG_DOC_DIR)"
@@ -382,6 +388,7 @@ install_artifacts:
 install_poms:
 	install -dm 755 "$(DESTDIR)$(MAVENPOM_DIR)"
 	install -m 644 backend/manager/extensions-tool/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-extensions-tool.pom"
+	install -m 644 backend/manager/logutils/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-logutils.pom"
 	install -m 644 backend/manager/modules/aaa/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-aaa.pom"
 	install -m 644 backend/manager/modules/bll/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-bll.pom"
 	install -m 644 backend/manager/modules/branding/pom.xml "$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-branding.pom"
@@ -414,14 +421,19 @@ install-packaging-files: \
 	$(MAKE) copy-recursive SOURCEDIR=packaging/sys-etc TARGETDIR="$(DESTDIR)$(SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/etc TARGETDIR="$(DESTDIR)$(PKG_SYSCONF_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/pki TARGETDIR="$(DESTDIR)$(PKG_PKI_DIR)" EXCLUDE_GEN="$(GENERATED)"
-	for d in bin branding conf files firewalld services setup icons; do \
+	for d in bin branding conf files firewalld services icons; do \
 		$(MAKE) copy-recursive SOURCEDIR="packaging/$${d}" TARGETDIR="$(DESTDIR)$(DATA_DIR)/$${d}" EXCLUDE_GEN="$(GENERATED)"; \
 	done
 	$(MAKE) copy-recursive SOURCEDIR=packaging/doc TARGETDIR="$(DESTDIR)$(PKG_DOC_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/man TARGETDIR="$(DESTDIR)$(MAN_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/pythonlib TARGETDIR="$(DESTDIR)$(PYTHON_DIR)" EXCLUDE_GEN="$(GENERATED)"
 	$(MAKE) copy-recursive SOURCEDIR=packaging/libexec TARGETDIR="$(DESTDIR)$(LIBEXEC_DIR)" EXCLUDE_GEN="$(GENERATED)"
 
+	# copy all of packaging/setup but exclude all tests.
+	$(MAKE) copy-recursive SOURCEDIR=packaging/setup TARGETDIR="$(DESTDIR)$(DATA_DIR)/setup" \
+		EXCLUDE_GEN="$(GENERATED)" \
+		EXCLUDE="$$(echo $$(find packaging/setup/tests))"
+
 ifneq ($(PYTHON3),)
 	$(MAKE) copy-recursive SOURCEDIR=packaging/pythonlib TARGETDIR="$(DESTDIR)$(PYTHON3_DIR)" EXCLUDE_GEN="$(GENERATED)"
 endif
@@ -450,6 +462,7 @@ install-layout: \
 	ln -sf "$(DATA_DIR)/setup/bin/ovirt-engine-upgrade-check" "$(DESTDIR)$(BIN_DIR)/engine-upgrade-check"
 	ln -sf "$(DATA_DIR)/bin/engine-config.sh" "$(DESTDIR)$(BIN_DIR)/engine-config"
 	ln -sf "$(DATA_DIR)/bin/engine-backup.sh" "$(DESTDIR)$(BIN_DIR)/engine-backup"
+	ln -sf "$(DATA_DIR)/bin/engine-vacuum.sh" "$(DESTDIR)$(BIN_DIR)/engine-vacuum"
 	ln -sf "$(DATA_DIR)/bin/ovirt-engine-extensions-tool.sh" "$(DESTDIR)$(BIN_DIR)/ovirt-engine-extensions-tool"
 
 	install -d -m 755 "$(DESTDIR)$(PKG_PKI_DIR)/certs"

automation/build-artifacts.sh

@@ -1,7 +1,6 @@
 #!/bin/bash -xe
 
-BUILD_UT=0
-SUFFIX=".git$(git rev-parse --short HEAD)"
+BUILD_UT=1
 
 if [ -d /root/.m2/repository/org/ovirt ]; then
     echo "Deleting ovirt folder from maven cache"
@@ -59,7 +58,6 @@ make dist
 rpmbuild \
     -D "_srcrpmdir $PWD/output" \
     -D "_topmdir $PWD/rpmbuild" \
-    -D "release_suffix ${SUFFIX}" \
     -D "ovirt_build_extra_flags $EXTRA_BUILD_FLAGS" \
     -ts ./*.gz
 
@@ -70,8 +68,6 @@ yum-builddep output/*src.rpm
 rpmbuild \
     -D "_rpmdir $PWD/output" \
     -D "_topmdir $PWD/rpmbuild" \
-    -D "release_suffix ${SUFFIX}" \
-    -D "ovirt_build_minimal 1" \
     -D "ovirt_build_extra_flags $EXTRA_BUILD_FLAGS" \
     --rebuild output/*.src.rpm
 

automation/check-patch.packages

@@ -4,6 +4,10 @@ make
 pyflakes
 python-pep8
 python-devel
+pytest
+python-psycopg2
+python2-mock
+otopi
 git
 maven
 java-1.8.0-openjdk-devel

automation/check-patch.packages.fc24

@@ -4,9 +4,13 @@ java-1.8.0-openjdk-devel
 make
 maven
 net-tools
+otopi
 postgresql-jdbc
 postgresql-server
 pyflakes
+python2-mock
+python-psycopg2
+python2-pytest
 python-devel
 python-isort
 python-pep8

automation/check-patch.packages.fc25

@@ -0,0 +1,17 @@
+autoconf
+git
+java-1.8.0-openjdk-devel
+make
+maven
+net-tools
+otopi
+postgresql-jdbc
+postgresql-server
+pyflakes
+python2-mock
+python2-psycopg2
+python2-pytest
+python-devel
+python-isort
+python-pep8
+yum-utils

automation/check-patch.sh

@@ -92,6 +92,9 @@ rm -f ./*tar.gz
 make clean \
     "EXTRA_BUILD_FLAGS=$EXTRA_BUILD_FLAGS"
 
+# execute packaging/setup tests
+automation/packaging-setup-tests.sh
+
 # perform quick validations
 make validations
 

automation/packaging-setup-tests.sh

@@ -0,0 +1,7 @@
+#!/bin/bash -xe
+
+trap popd 0
+pushd $(dirname "$(readlink -f "$0")")/..
+
+export PYTHONPATH="packaging/pythonlib:packaging/setup:${PYTHONPATH}"
+python -m pytest packaging/setup

backend/manager/dependencies/common/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core.manager</groupId>
     <artifactId>dependencies</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.2.3</version>
   </parent>
 
   <artifactId>common-dependencies</artifactId>

backend/manager/dependencies/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.2.3</version>
   </parent>
 
   <artifactId>dependencies</artifactId>

backend/manager/dependencies/tools/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.ovirt.engine.core.manager</groupId>
     <artifactId>dependencies</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.2.3</version>
   </parent>
 
   <artifactId>tools-dependencies</artifactId>
@@ -31,6 +31,12 @@
       <artifactId>slf4j-jdk14</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -53,6 +59,12 @@
                 <artifactId>slf4j-jdk14</artifactId>
                 <moduleName>org.slf4j</moduleName>
               </module>
+
+              <module>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl-over-slf4j</artifactId>
+                <moduleName>org.slf4j.jcl-over-slf4j</moduleName>
+              </module>
             </modules>
           </configuration>
         </plugin>

backend/manager/dependencies/tools/src/main/modules/org/apache/commons/logging/main/module.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     This module provided original commons-logging API provided by
+     jakarta-commons-logging over slf4j library. We need it to be able to use
+     apache-commons libraries, which require commons-logging, in command line
+     tools and notifier, which are executed outside running WildFly.
+  -->
+<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.logging">
+  <dependencies>
+    <module name="org.slf4j.jcl-over-slf4j" export="true"/>
+  </dependencies>
+</module>
+

backend/manager/dependencies/tools/src/main/modules/org/slf4j/jcl-over-slf4j/main/module.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     This module contains original jakarta-commons-logging over slf4j
+     library. We need it to be able to use apache-commons libraries, which
+     require commons-logging, in command line tools and notifier, which are
+     executed outside running WildFly (WildFly contains reimplementation of
+     commons-logging and slf4j which do not contain all features we need for
+     execution outside WildFly).
+  -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.slf4j.jcl-over-slf4j">
+    <resources>
+        <resource-root path="jcl-over-slf4j.jar"/>
+    </resources>
+
+    <dependencies>
+        <module name="org.slf4j"/>
+    </dependencies>
+</module>

backend/manager/extensions-tool/pom.xml

@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.ovirt.engine.core</groupId>
     <artifactId>manager</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.1.2.3</version>
   </parent>
 
   <artifactId>extensions-tool</artifactId>
@@ -24,6 +24,11 @@
       <artifactId>extensions-manager</artifactId>
       <version>${engine.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${engine.groupId}</groupId>
+      <artifactId>logutils</artifactId>
+      <version>${engine.version}</version>
+    </dependency>
     <dependency>
       <groupId>${engine.groupId}</groupId>
       <artifactId>uutils</artifactId>

backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java

@@ -38,6 +38,7 @@ public class ExtensionsToolExecutor {
     private static String AAA_JAAS_TICKET_CACHE_FILE = System.getProperty("org.ovirt.engine.exttool.core.ticketCacheFile");
     private static String AAA_JAAS_USE_KEYTAB = System.getProperty("org.ovirt.engine.exttool.core.useKeytab");
     private static String AAA_JAAS_KEYTAB_FILE = System.getProperty("org.ovirt.engine.exttool.core.keytabFile");
+    private static String AAA_JAAS_PRINCIPAL_NAME = System.getProperty("org.ovirt.engine.exttool.core.principalName");
     private static String JAAS_CONF = System.getProperty("java.security.auth.login.config");
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(ExtensionsToolExecutor.class);
@@ -161,6 +162,10 @@ private static Path createTemporaryJAASconfiguration() throws IOException {
                 keytabFile = String.format("keyTab=\"%s\"", AAA_JAAS_KEYTAB_FILE);
             }
 
+            String principalName = "";
+            if (StringUtils.isNotEmpty(AAA_JAAS_PRINCIPAL_NAME)) {
+                principalName = String.format("principal=\"%s\"", AAA_JAAS_PRINCIPAL_NAME);
+            }
             fw.write(
                 String.format(
                     "oVirtKerbAAA {%n" +
@@ -171,13 +176,15 @@ private static Path createTemporaryJAASconfiguration() throws IOException {
                         "%s%n" +  // ticket cache path
                         "useKeyTab=%s%n" +
                         "%s%n" +  // keytab path
+                        "%s%n" +  // principal name
                         "doNotPrompt=true%n" +
                         ";%n" +
                         "};%n",
                     AAA_JAAS_USE_TICKET_CACHE,
                     ticketCacheFile,
                     AAA_JAAS_USE_KEYTAB,
-                    keytabFile
+                    keytabFile,
+                    principalName
                 )
             );
         }

backend/manager/logutils/exclude-filters.xml

@@ -0,0 +1 @@
+<FindBugsFilter/>

backend/manager/logutils/pom.xml

@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.ovirt.engine.core</groupId>
+    <artifactId>manager</artifactId>
+    <version>4.1.2.3</version>
+  </parent>
+
+  <artifactId>logutils</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Utilities to extend java.logging framework</name>
+</project>

backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/log/JavaLoggingUtils.java → backend/manager/logutils/src/main/java/org/ovirt/engine/core/logutils/JavaLoggingUtils.java

@@ -1,10 +1,9 @@
-package org.ovirt.engine.core.utils.log;
+package org.ovirt.engine.core.logutils;
 
 import java.io.IOException;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
 
 /**
  * Contains methods for runtime java.util.logging setup
@@ -40,7 +39,7 @@ public static Level parseLevel(String levelName) {
     public static void addFileHandler(String fileName) {
         try {
             FileHandler fh = new FileHandler(fileName, true);
-            fh.setFormatter(new SimpleFormatter());
+            fh.setFormatter(new TimeZoneBasedFormatter());
             Logger.getLogger("").addHandler(fh);
         } catch (SecurityException | IOException ex) {
             throw new IllegalArgumentException(