Attachment #7421 for bug #40463

View | Details | Raw Unified | Return to bug 40463
Collapse All | Expand All

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/10_pull_appbox_mini (-2 lines)

Lines 8-15	Link Here

from dockertest import *

from dockertest import *

if __name__ == '__main__':

if __name__ == '__main__':

	docker_login()

	docker_login()

	docker_pull('ucs-appbox-amd64:4.1-0')

	docker_pull('ucs-appbox-amd64:4.1-0')






if __name__ == '__main__':
	
	with Appcenter() as appcenter:
		appcenter.add_ucs_version_to_appcenter('4.0')


		app.ucs_version = '4.0'
		app.add_to_local_appcenter()

		
		# Since we are installing on a 4.1, a 4.1 ini entry is needed
		app = App(name=app_name, version='1', build_package=False)
		app.set_ini_parameter(DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.0-3',

		app.add_to_local_appcenter()

		try:

			appcenter.update()

			app.install()


			lo = get_ldap_connection()
			print lo.searchDn(filter='(&(cn=%s-*)(objectClass=univentionMemberServer))' % app_name, unique=True, required=True)

		finally:
			app.uninstall()
			app.remove()


(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/51_app_install (-2 lines)

Lines 9-15 from dockertest import *	Link Here

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		app_name = get_app_name()

		app_name = get_app_name()

		app_version = get_app_version()

		app_version = get_app_version()

Lines 31-34 if __name__ == '__main__':	Link Here

		finally:

		finally:

			app.uninstall()

			app.uninstall()

			app.remove()

			app.remove()




import time

if __name__ == '__main__':
	
	with Appcenter() as appcenter:
		app_name = get_app_name()
		app_version = get_app_version()

				print 'LDAP connection failed. Wait for ten seconds and try again.'
				time.sleep(60)
				lo = get_ldap_connection()
				
			print lo.searchDn(filter='(&(cn=%s-*)(objectClass=univentionDomainController)(univentionServerRole=slave)(!(aRecord=*)))' % app_name, unique=True, required=True)

		finally:
			app.uninstall()
			app.remove()


(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/53_missing_dockerimage (-3 lines)

Lines 10-16 from univention.testing.utils import fail	Link Here

from univention.testing.internal import package_installed

from univention.testing.internal import package_installed

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		app_name = get_app_name()

		app_name = get_app_name()

		app_version = get_app_version()

		app_version = get_app_version()

Lines 29-36 if __name__ == '__main__':	Link Here

			# The package must be installed locally

			# The package must be installed locally

			if not package_installed(app.package_name):

			if not package_installed(app.package_name):

				fail('The package %s is not installed locally.' % app.package_name)

				fail('The package %s is not installed locally.' % app.package_name)

		finally:

		finally:

			app.uninstall()

			app.uninstall()

			app.remove()

			app.remove()

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/54_app_preinst (-1 / +1 lines)

Lines 7-13	Link Here

from dockertest import *

from dockertest import *

def create_app(fail_in_preinst):

def create_app(fail_in_preinst):

		app_name = get_app_name()

		app_name = get_app_name()

		app_version = get_app_version()

		app_version = get_app_version()




from dockertest import *

if __name__ == '__main__':

	with Appcenter() as appcenter:
		app_name = get_app_name()
		app_version = get_app_version()


			app.install()
			app.verify()
			
			app.verify_basic_modproxy_settings()

		finally:
			app.uninstall()
			app.remove()

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop (-2 lines)

Lines 10-16 import subprocess	Link Here

import time

import time

if __name__ == '__main__':

if __name__ == '__main__':

	nscd_stopped = False

	nscd_stopped = False

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

Lines 40-46 if __name__ == '__main__':	Link Here

			print ncs_container_pid_new

			print ncs_container_pid_new

			if ncs_container_pid_old != ncs_container_pid_new:

			if ncs_container_pid_old != ncs_container_pid_new:

				fail('nscd pid in container have been changed. old: [%s], new: [%s]' % (ncs_container_pid_old, ncs_container_pid_new))

				fail('nscd pid in container have been changed. old: [%s], new: [%s]' % (ncs_container_pid_old, ncs_container_pid_new))

		finally:

		finally:

			if nscd_stopped:

			if nscd_stopped:

				subprocess.call('/etc/init.d/nscd start', shell=True)

				subprocess.call('/etc/init.d/nscd start', shell=True)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/57_app_without_package (-2 lines)

Lines 9-15 from dockertest import *	Link Here

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		app_name = get_app_name()

		app_name = get_app_name()

		app_version = get_app_version()

		app_version = get_app_version()

Lines 40-43 if __name__ == '__main__':	Link Here

		finally:

		finally:

			app.uninstall()

			app.uninstall()

			app.remove()

			app.remove()




import os
import subprocess


def fail_if_file_exists(f):
	if os.path.exists(f):
		fail('%s still exists' % f)

if __name__ == '__main__':

if __name__ == '__main__':
	with Appcenter() as appcenter:
		app_name = get_app_name()
		app_version = get_app_version()


			lo = get_ldap_connection()
			print lo.searchDn(filter='(&(cn=%s-*)(objectClass=univentionMemberServer)(!(aRecord=*))(!(macAddress=*)))' % app_name, unique=True, required=True)
			
		finally:
			app.uninstall()
			app.remove()

			fail('The LDAP object has not been removed: %s' % res)

		# Check for the backup container
		res = subprocess.call('docker images | grep appcenter-backup-%s' % app.app_name, shell=True)
		if res != 0:
			subprocess.call('docker images' % app.app_name, shell=True)
			fail('Backup container appcenter-backup-%s was not found' % app.app_name)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature (-2 / +2 lines)

Lines 35-41 class SyncedAppcenter(Appcenter):	Link Here

		d = os.path.dirname('/var/www/%s' % f)

		d = os.path.dirname('/var/www/%s' % f)

		if not os.path.exists(d):

		if not os.path.exists(d):

			os.makedirs(d)

			os.makedirs(d)

		call('wget -O /var/www/%s %s/%s' % (f, self.upstream_appcenter, f), shell=True)

		call('wget -O /var/www/%s %s/%s' % (f, self.upstream_appcenter, f), shell=True)

	def download_index_json(self):

	def download_index_json(self):

Lines 43-49 class SyncedAppcenter(Appcenter):	Link Here

	def download_index_json_gpg(self):

	def download_index_json_gpg(self):

		self.download('meta-inf/%s/index.json.gz.gpg' % self.vv)

		self.download('meta-inf/%s/index.json.gz.gpg' % self.vv)

	def remove_from_cache(self, f):

	def remove_from_cache(self, f):

		if os.path.exists(os.path.join('/var/cache/univention-appcenter/', f)):

		if os.path.exists(os.path.join('/var/cache/univention-appcenter/', f)):

			os.remove(os.path.join('/var/cache/univention-appcenter/', f))

			os.remove(os.path.join('/var/cache/univention-appcenter/', f))

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/61_app_updater_identify (-4 / +3 lines)

Lines 7-16	Link Here

from dockertest import *

from dockertest import *

class UCSTest_DockerApp_Identify(UCSTest_Docker_Exception): pass

class UCSTest_DockerApp_Identify(UCSTest_Docker_Exception):

	pass

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		app_name = get_app_name()

		app_name = get_app_name()

		app_version = get_app_version()

		app_version = get_app_version()

Lines 31-38 if __name__ == '__main__':	Link Here

			print 'Identify: %s' % identify

			print 'Identify: %s' % identify

			if identify.strip() != 'Docker App':

			if identify.strip() != 'Docker App':

				raise UCSTest_DockerApp_Identify()

				raise UCSTest_DockerApp_Identify()

		finally:

		finally:

			app.uninstall()

			app.uninstall()

			app.remove()

			app.remove()




	''' % {'version': ucs_version, 'app': app_directory}, shell=True)

if __name__ == '__main__':
	
	with Appcenter() as appcenter:

		ucr = ConfigRegistry()


		app_name = get_app_name()
		package_name = get_app_name()

		app = App(name=app_name, version='1', package_name=package_name)
		app.set_ini_parameter(DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.1-0')


		test_package_v1.build()
		copy_package_to_appcenter(ucr['version/version'], app.app_directory, test_package_v1.get_binary_name())


		try:

			appcenter.update()

			app.install()

			res = app.execute_command_in_container('/usr/share/univention-docker-container-mode/update_available')
			if res != 'release: 4.1-0\n':
				fail('update_available returned [%s] instead of [release: 4.1-0\n]' % res)

		finally:
			app.uninstall()
			app.remove()







if __name__ == '__main__':
	
	with Appcenter() as appcenter:
		appcenter.add_ucs_version_to_appcenter('4.0')


		app.add_to_local_appcenter()
		app_directory_suffix = app.app_directory_suffix

		
		# Since we are installing on a 4.1, a 4.1 ini entry is needed
		app = App(name=app_name, version='1', package_name=package_name, build_package=False)
		app.set_ini_parameter(DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.0-3',

		app.add_to_local_appcenter()

		try:

			appcenter.update()

			app.install()

				fail('UCR variable test1 differes')
			if test_secret != test_secret_new:
				fail('/etc/test.secret link has been changed')

		finally:
			app.uninstall()
			app.remove()







if __name__ == '__main__':
	
	with Appcenter() as appcenter:
		appcenter.add_ucs_version_to_appcenter('4.0')


		app.add_to_local_appcenter()
		app_directory_suffix = app.app_directory_suffix

		
		# Since we are installing on a 4.1, a 4.1 ini entry is needed
		app = App(name=app_name, version='1', package_name=package_name, build_package=False)
		app.set_ini_parameter(DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.0-3',

		app.add_to_local_appcenter()

		try:

			appcenter.update()

			app.install()

			print 'Container UUID: %s' % container_uuid_new
			if container_uuid != container_uuid_new:
				fail('The container UUID has been changed.')

		finally:
			app.uninstall()
			app.remove()






from dockertest import *

DOCKER_APP_COUNT = 20

if __name__ == '__main__':
	
	with Appcenter() as appcenter:
		apps = []

		try:
			for i in range(0, DOCKER_APP_COUNT):
				app = App(name=get_app_name(), version=get_app_version())
				app.set_ini_parameter(DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.1-0',
									WebInterface='/%s' % app.app_name,


				apps.append(app)


			appcenter.update()

			for i in range(0, DOCKER_APP_COUNT):
				apps[i].install()

			for i in range(0, DOCKER_APP_COUNT):
				apps[i].verify()
				apps[i].verify_basic_modproxy_settings()

		finally:
			for i in range(0, len(apps)):
				apps[i].uninstall()
				apps[i].remove()





import socket

if __name__ == '__main__':
	
	with Appcenter() as appcenter:

		app_name = get_app_name()
		app_version = get_app_version()
		app = App(name=app_name, version=app_version, build_package=False)

				univention-app register "%(app_name)s" --component
				app_packages="$(univention-app get "%(app_name)s" default_packages --values-only --shell)"
				univention-install -y $app_packages
				''' % {'app_name': app_name})
			app.add_to_local_appcenter()
			appcenter.update()
			app.install()


			# restart firewall and check again
			restart_firewall()

			# check ports are open
			for port in ports:
				is_port_open(port)




import socket

if __name__ == '__main__':
	
	with Appcenter() as appcenter:

		app_name = get_app_name()
		app_version = get_app_version()
		app = App(name=app_name, version=app_version, build_package=False)

				univention-app register "%(app_name)s" --component
				app_packages="$(univention-app get "%(app_name)s" default_packages --values-only --shell)"
				univention-install -y $app_packages
				''' % {'app_name': app_name})
			app.add_to_local_appcenter()
			appcenter.update()
			app.install()


			# restart firewall and check again
			restart_firewall()

			# check ports are open
			for port in ports:
				host_port, container_port = port.split(':')

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/77_app_ports_conflicts_exclusive (-2 lines)

Lines 14-22 import pytest	Link Here

import time

import time

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		version = get_app_version()

		version = get_app_version()

		image = 'docker.software-univention.de/ucs-appbox-amd64:4.1-0'

		image = 'docker.software-univention.de/ucs-appbox-amd64:4.1-0'

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/78_app_ports_conflicts_redirect (-2 lines)

Lines 14-22 import pytest	Link Here

import time

import time

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

		version = get_app_version()

		version = get_app_version()

		image = 'docker.software-univention.de/ucs-appbox-amd64:4.1-0'

		image = 'docker.software-univention.de/ucs-appbox-amd64:4.1-0'




def _open_port(port):
	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
	try:
		s.bind(('', port))
	except socket.error as msg:
		print 'Bind failed. Error Code : ' + str(msg[0]) + ' Message ' + msg[1]
		return None



if __name__ == '__main__':
	
	sockets = []
	for i in range(40000, 40100):
		sockets.append(_open_port(i))

	with Appcenter() as appcenter:
		app_name = get_app_name()
		app_version = get_app_version()

		app = App(name=app_name, version=app_version)

		try:
			app.set_ini_parameter(	DockerImage='docker.software-univention.de/ucs-appbox-amd64:4.1-0',
									WebInterface='/%s' % app.app_name,

								)
			app.create_basic_modproxy_settings()
			app.add_to_local_appcenter()

			appcenter.update()

			app.install()

			app.verify()

			app.verify_basic_modproxy_settings()




from dockertest import docker_login, pull_docker_image, docker_image_is_present
from dockertest import remove_docker_image, restart_docker


def deb_package_is_installed(pkgname):
	cache = apt.Cache()
	if cache[pkgname].is_installed:

	else:
		return False


def deb_install_package(pkgname):
	cmd = ['univention-install', '-y', pkgname]
	p = subprocess.Popen(cmd, close_fds=True)
	p.wait()


def deb_uninstall_package(pkgname):
	cmd = ['apt-get', 'purge', '-y', pkgname]
	p = subprocess.Popen(cmd, close_fds=True)

	p = subprocess.Popen(cmd, close_fds=True)
	p.wait()


class TestCase:
	def __init__(self):
		self.ucr = UCSTestConfigRegistry()


		self.imgname = 'docker.software-univention.de/ucs-appbox-amd64:4.1-0'

		required_pkgname = 'univention-squid'
		if not deb_package_is_installed(required_pkgname):
			deb_install_package(required_pkgname)
			self.remove_pkgname = required_pkgname



if __name__ == '__main__':
	
	with TestCase() as tc:
		tc.run()




	'password': 'readonly',
	}


class FileInfo(object):
	def __init__(self, app, name, url, filename):
		self.name = name

		self.sha256 = sha256sum(filename)
		self.archive_filename = '%s.%s' % (app.name, name)


class DockerImageInfo(object):
	def __init__(self, name, url, content):
		self.name = name
		self.url = url
		self.sha256 = sha256(content).hexdigest()


class App(object):
	def __init__(self, name, ucs_version, meta_inf_dir, components_dir, server):
		self.name = name

		index = {}
		for file_info in self.important_files():
			index[file_info.name] = {
				'url': file_info.url,
				}
			for hash_type in ('md5', 'sha256'):
				try:

					pass
		for docker_image_info in self.docker_images():
			index['ini'][docker_image_info.name] = {
				'url': docker_image_info.url,
				'sha256': docker_image_info.sha256,
				}
		return index


def check_ini_file(filename):
	name, ext = os.path.splitext(os.path.basename(filename))
	if ext == '.ini':
		return name


def md5sum(filename):
	m = md5()
	with open(filename, 'r') as f:
		m.update(f.read())
		return m.hexdigest()


def sha256sum(filename):
	m = sha256()
	with open(filename, 'r') as f:
		m.update(f.read())
		return m.hexdigest()


if __name__ == '__main__':
	parser = OptionParser()
	parser.add_option(
		"-u", "--ucs-version", dest="version", default="3.1",
		help="use UCS version VERSION (e.g. (and default) %default)", metavar="VERSION")
	parser.add_option(
		"-d", "--directory", dest="directory", default=".",
		help="root directory where meta-inf and univention-repository lie", metavar="DIR")
	parser.add_option(
		"-o", "--output", dest="output", default=None,
		help="write output to OUTPUTFILE. Defaults to stdout. If specified and not ending with .gz, .gz is added", metavar="OUTPUTFILE")
	parser.add_option(
		"-t", "--tar", dest="archive", default=None,
		help="additionally add all files to tar archive TARFILE (not compressed)", metavar="TARFILE")
	parser.add_option(
		"-a", "--ask", action="store_true", dest="ask", default=False,
		help="Diff between existing OUTPUTFILE and buffer. Overwrites if changes are confirmed (interactive! ... if any diff)")
	parser.add_option(
		"-s", "--server", dest="appcenter", default="https://appcenter.software-univention.de/",
		help="external Univention App Center Server (defaults to %default. Another possibility may be https://appcenter-test.software-univention.de/ or http://appcenter.knut.univention.de/)", metavar="APPCENTER")

	(options, args) = parser.parse_args()
	root = options.directory

			f.close()
	else:
		print out





import urllib2



class UCSTest_Docker_Exception(Exception):
	pass


class UCSTest_Docker_LoginFailed(Exception):
	pass


class UCSTest_Docker_PullFailed(Exception):
	pass


class AppcenterMetainfAlreadyExists(Exception):
	pass


class AppcenterRepositoryAlreadyExists(Exception):
	pass


class UCSTest_DockerApp_InstallationFailed(Exception):
	pass


class UCSTest_DockerApp_UpdateFailed(Exception):
	pass


class UCSTest_DockerApp_UpgradeFailed(Exception):
	pass


class UCSTest_DockerApp_VerifyFailed(Exception):
	pass


class UCSTest_DockerApp_RemoveFailed(Exception):
	pass


class UCSTest_DockerApp_ModProxyFailed(Exception):
	pass


def docker_login(server='docker.software-univention.de'):

	if ret != 0:
		raise UCSTest_Docker_PullFailed()


def docker_image_is_present(imgname):
	cmd = ['docker', 'inspect', imgname]
	with open('/dev/null', 'w') as devnull:

		p.wait()
		return p.returncode == 0


def remove_docker_image(imgname):
	cmd = ['docker', 'rmi', imgname]
	p = subprocess.Popen(cmd, close_fds=True)
	p.wait()
	return p.returncode == 0


def pull_docker_image(imgname):
	cmd = ['docker', 'pull', imgname]
	p = subprocess.Popen(cmd, close_fds=True)
	p.wait()
	return p.returncode == 0


def restart_docker():
	cmd = ['invoke-rc.d', 'docker', 'restart']
	p = subprocess.Popen(cmd, close_fds=True)
	p.wait()
	return p.returncode == 0


def get_app_name():
	""" returns a valid app name """
	return random_name()

		else:
			self.package_name = get_app_name()

		self.package_version = '%s.%s' % (version, get_app_version())

		self.ucr = ConfigRegistry()
		self.ucr.load()

			raise UCSTest_DockerApp_ModProxyFailed(Exception)




class Appcenter:
	def __init__(self, version=None):
		self.meta_inf_created = False

		self.add_ucs_version_to_appcenter(version)

	def add_ucs_version_to_appcenter(self, version):

		if not os.path.exists('/var/www/meta-inf'):
			os.makedirs('/var/www/meta-inf', 0755)
			self.meta_inf_created = True

			print 'Cleanup after exception: %s %s' % (exc_type, exc_value)
		self.cleanup()


def restore_data_script_4_1():
	return '''#!/usr/bin/python2.7
from optparse import OptionParser




'''
		self.create_debian_file_from_buffer('install', install)


if __name__ == '__main__':
	deb = DebianPackage('testdeb')
	share_file = '''# testdeb

	deb.install()
	deb.uninstall()
	deb.remove()

- 
--
branches/ucs-4.1/ucs-4.1-0/test/ucs-test/debian/control                 | 2 ++
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/10_pull_appbox_mini | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/40_app_install_4_0-3        | 2 --
branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/51_app_install | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave     | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/53_missing_dockerimage      | 2 --
branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/54_app_preinst | 2 --
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/55_app_modproxy     | 2 --
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop    | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/57_app_without_package      | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/58_app_uninstallation       | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature     | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/61_app_updater_identify     | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/62_app_update_available     | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/64_app_container_upgrade    | 2 --
.../tests/80_docker/65_app_container_upgrade_dockerallowedimage         | 2 --
branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/70_app_scaling | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/75_app_ports_exclusive      | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/76_app_ports_redirect       | 2 --
.../test/ucs-test/tests/80_docker/77_app_ports_conflicts_exclusive      | 2 --
.../test/ucs-test/tests/80_docker/78_app_ports_conflicts_redirect       | 2 --
.../ucs-4.1-0/test/ucs-test/tests/80_docker/79_app_ports_already_used   | 2 --
22 files changed, 2 insertions(+), 42 deletions(-)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/debian/control (+2 lines)

Lines 523-528 Architecture: all	Link Here

523

Depends: ucs-test-libs (= ${source:Version}),

523

Depends: ucs-test-libs (= ${source:Version}),

524

 ${misc:Depends},

524

 ${misc:Depends},

525

 python-pytest,

525

 python-pytest,

526

 docker.io,

527

 build-essential,

526

Recommends: ucs-test-framework

528

Recommends: ucs-test-framework

527

Provides: ucs-test-module

529

Provides: ucs-test-module

528

Description: Test scripts to test the Docker integration

530

Description: Test scripts to test the Docker integration

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/10_pull_appbox_mini (-2 lines)

Lines 2-9	Link Here

## desc: Pull appbox docker image

## desc: Pull appbox docker image

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/40_app_install_4_0-3 (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple UCS 4.0-3 docker app

## desc: Create and install a simple UCS 4.0-3 docker app

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/51_app_install (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app

## desc: Create and install a simple docker app

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple DC Slave docker app

## desc: Create and install a simple DC Slave docker app

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

## versions:

## versions:

##  4.1-0: skip

##  4.1-0: skip

## bugs:

## bugs:

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/53_missing_dockerimage (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app without the DockerImage parameter

## desc: Create and install a simple docker app without the DockerImage parameter

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import fail

from univention.testing.utils import fail

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/54_app_preinst (-2 lines)

Lines 2-9	Link Here

## desc: Check the preinst script

## desc: Check the preinst script

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/55_app_modproxy (-2 lines)

Lines 2-9	Link Here

## desc: Check Docker App mod_proxy configuration

## desc: Check Docker App mod_proxy configuration

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop (-2 lines)

Lines 2-9	Link Here

## desc: Check if a nscd stop also kills the container nscd processes

## desc: Check if a nscd stop also kills the container nscd processes

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

import subprocess

import subprocess

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/57_app_without_package (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app without a Debian package (plain container app)

## desc: Create and install a simple docker app without a Debian package (plain container app)

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/58_app_uninstallation (-2 lines)

Lines 2-9	Link Here

## desc: Test the Docker App uninstallation

## desc: Test the Docker App uninstallation

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import fail, get_ldap_connection

from univention.testing.utils import fail, get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature (-2 lines)

Lines 2-9	Link Here

## desc: Verify the signature implementation

## desc: Verify the signature implementation

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

import os

import os

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/61_app_updater_identify (-2 lines)

Lines 2-9	Link Here

## desc: Check updater/identify in a new Docker App

## desc: Check updater/identify in a new Docker App

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/62_app_update_available (-2 lines)

Lines 4-11	Link Here

## exposure: dangerous

## exposure: dangerous

## versions:

## versions:

##  4.1-0: skip

##  4.1-0: skip

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.debian_package import DebianPackage

from univention.testing.debian_package import DebianPackage

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/64_app_container_upgrade (-2 lines)

Lines 2-9	Link Here

## desc: Test the container upgrade without a re-join

## desc: Test the container upgrade without a re-join

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection, fail

from univention.testing.utils import get_ldap_connection, fail

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/65_app_container_upgrade_dockerallowedimage (-2 lines)

Lines 4-11	Link Here

## exposure: dangerous

## exposure: dangerous

## versions:

## versions:

##  4.1-0: skip

##  4.1-0: skip

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection,fail

from univention.testing.utils import get_ldap_connection,fail

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/70_app_scaling (-2 lines)

Lines 3-10	Link Here

## tags: [WIP,docker]

## tags: [WIP,docker]

## timeout: 7200

## timeout: 7200

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/75_app_ports_exclusive (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app and check ports exclusive

## desc: Create and install a simple docker app and check ports exclusive

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/76_app_ports_redirect (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app and check ports redirect

## desc: Create and install a simple docker app and check ports redirect

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/77_app_ports_conflicts_exclusive (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app and check ports exclusive constraints

## desc: Create and install a simple docker app and check ports exclusive constraints

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/78_app_ports_conflicts_redirect (-2 lines)

Lines 2-9	Link Here

## desc: Create and install a simple docker app and check ports redirection constraints

## desc: Create and install a simple docker app and check ports redirection constraints

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

## packages:

##   - docker.io

from dockertest import *

from dockertest import *

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection




## desc: Check the App installation if the next free port is already used
## tags: [docker]
## exposure: dangerous
## packages:
##   - docker.io

from dockertest import *
from univention.testing.utils import get_ldap_connection
- 
--
branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dockertest.py | 1 -
1 file changed, 1 deletion(-)




	def set_ini_parameter(self, **kwargs):
		for key, value in kwargs.iteritems():
			self.ini[key] = value
		pass

	def add_to_local_appcenter(self):
		self._dump_ini()
- 
--
.../test/ucs-test/tests/80_docker/categories.ini   |   8 +
.../test/ucs-test/tests/80_docker/dockertest.py    | 252 +--------------------
.../test/ucs-test/tests/80_docker/dummy.svg        |  40 ++++
.../tests/80_docker/restore_data_script_4_1.py     |  98 ++++++++
.../test/ucs-test/tests/80_docker/setup.sh         |  11 +
.../tests/80_docker/store_data_script_4_1.py       |  91 ++++++++
6 files changed, 257 insertions(+), 243 deletions(-)
create mode 100644 branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/categories.ini
create mode 100644 branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dummy.svg
create mode 100755 branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/restore_data_script_4_1.py
create mode 100644 branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/setup.sh
create mode 100755 branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/store_data_script_4_1.py

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/categories.ini (+8 lines)

Line 0	Link Here

[de]

Administration=Administration

Business=Business

Collaboration=Collaboration

Education=Schule

System services=Systemdienste

UCS components=UCS-Komponenten

Virtualization=Virtualisierung




		''' % {'version': self.ucs_version, 'app': self.app_directory}, shell=True)

	def create_basic_modproxy_settings(self):
		setup = open(os.path.join(os.path.dirname(__file__), 'setup.sh'), 'r').read()
		self.add_script(setup=setup % {'app_name': self.app_name})
eval "$(ucr shell)"
if [ "$version_version" = 4.0 ]; then
	ucr set repository/online/server="$(echo $repository_online_server | sed -e 's|.*//\(.*\)|\\1|')"
fi
univention-install --yes univention-apache
mkdir /var/www/%(app_name)s
echo "TEST-%(app_name)s" >>/var/www/%(app_name)s/index.txt
/usr/share/univention-docker-container-mode/setup "$@"
''' % {'app_name': self.app_name})

	def verify_basic_modproxy_settings(self):
		fqdn = '%s.%s' % (self.ucr['hostname'], self.ucr['domainname'])

		os.makedirs('/var/www/meta-inf/%s' % version)

		if not os.path.exists('/var/www/meta-inf/categories.ini'):
			text = open(os.path.join(os.path.dirname(__file__), 'categories.ini'), 'r').read()
			f = open('/var/www/meta-inf/categories.ini', 'w')
			f.write(test)
Administration=Administration
Business=Business
Collaboration=Collaboration
Education=Schule
System services=Systemdienste
UCS components=UCS-Komponenten
Virtualization=Virtualisierung''')
			f.close()
			f = open('/var/www/meta-inf/rating.ini', 'w')
			f.write('# rating stuff\n')



def restore_data_script_4_1():
	return open(os.path.join(os.path.dirname(__file__), 'restore_data_script_4_1.py'), 'r').read()

import os
import shutil
import string
import univention.config_registry
import traceback

BLACKLIST_UCR_VARIABLES = [
	'version/version',
	'version/erratalevel',
	'version/patchlevel',
	'version/releasename',
]


# Helper function to copy all meta data of a file or directory
def copy_permissions(src, dest):
	s_stat = os.stat(src)
	os.chown(dest, s_stat.st_uid, s_stat.st_gid)
	shutil.copymode(src, dest)
	shutil.copystat(src, dest)
	d_stat = os.stat(dest)


def restore_files(source_dir):
	if not os.path.exists(source_dir):
		return
	for (path, dirs, files) in os.walk(source_dir):
		for d in dirs:
			r_path = string.replace(path, source_dir, '/', 1)
			dest = os.path.join(r_path, d)
			if not os.path.exists(dest):
				os.makedirs(dest)
			src = os.path.join(path, d)
			copy_permissions(src, dest)
		for i in files:
			src = os.path.join(path, i)
			dest = string.replace(src, source_dir, '', 1)
			if os.path.islink(src):
				linkto = os.readlink(src)
				if os.path.exists(dest) or os.path.islink(dest):
					print 'rm %s' % dest
					os.remove(dest)
				print 'ln -sf %s %s' % (linkto, dest)
				os.symlink(linkto, dest)
			else:
				print 'cp %s %s' % (src, dest)
				shutil.copy(src, dest)
				copy_permissions(src, dest)


def restore_ucr_layer(ucr_file, options):
	if not os.path.exists(ucr_file):
		return
	f = open(ucr_file, "r")
	vv = []
	for v in f.readlines():
		v = v.strip()
		if not v or v.startswith('#'):
			continue
		key, value = v.split(':', 1)
		if key not in BLACKLIST_UCR_VARIABLES:
			vv.append('%s=%s' % (key, value))
	if vv:
		print vv
		univention.config_registry.handler_set(vv, opts=options)

if __name__ == '__main__':
	parser = OptionParser('%prog [options]')
	parser.add_option('--app', dest='app', help='App ID')
	parser.add_option('--app-version', dest='app_version', help='Version of App')
	parser.add_option('--error-file', dest='error_file', help='Name of Error File')
	opts, args = parser.parse_args()

	conf_dir = '/var/lib/univention-appcenter/apps/%s/conf/' % opts.app
	source_dir = '/var/lib/univention-appcenter/apps/%s/conf/files' % opts.app

	try:
		restore_files(source_dir)

		print '** Restore forced UCR layer:'
		restore_ucr_layer(os.path.join(conf_dir, 'base-forced.conf'), {'force': True})
		print '** Restore ldap UCR layer'
		restore_ucr_layer(os.path.join(conf_dir, 'base-ldap.conf'), {'ldap-policy': True})
		print '** Restore normal UCR layer:'
		restore_ucr_layer(os.path.join(conf_dir, 'base.conf'), {})
	except:
		traceback.print_exc()
		if opts.error_file:
			error_file = open(opts.error_file, 'a+')
			traceback.print_exc(file=error_file)
			error_file.close()
		raise
'''

def store_data_script_4_1():
	return open(os.path.join(os.path.dirname(__file__), 'store_data_script_4_1.py'), 'r').read()

import glob
import os
import shutil
import string
import traceback


# Helper function to copy all meta data of a file or directory
def copy_permissions(src, dest):
	s_stat = os.stat(src)
	os.chown(dest, s_stat.st_uid, s_stat.st_gid)
	shutil.copymode(src, dest)
	shutil.copystat(src, dest)
	d_stat = os.stat(dest)


# Helper function to copy the files and directory
def copy_to_persistent_storage(src, dest):
	l_src = string.split(src, '/')
	# Ignore first empty entry
	if l_src[0] == '':
		l_src = l_src[1:]
	for j in range(0, len(l_src)):
		s = os.path.join('/', string.join(l_src[0:j + 1], '/'))
		d = os.path.join(dest, string.join(l_src[0:j + 1], '/'))
		if os.path.isdir(s):
			if not os.path.exists(d):
				os.makedirs(d)
				copy_permissions(s, d)
		elif os.path.islink(s):
			linkto = os.readlink(s)
			if os.path.exists(d) or os.path.islink(d):
				print 'rm %s' % d
				os.remove(d)
			print 'ln -sf %s %s' % (linkto, d)
			os.symlink(linkto, d)
		else:
			print 'cp %s %s' % (s, d)
			shutil.copy(s, d)
			copy_permissions(s, d)


def copy_files(src, dest):
	for f in glob.glob(src):
		copy_to_persistent_storage(f, dest)


def copy_recursive(src, dest):
	if not os.path.exists(src):
		return
	copy_to_persistent_storage(src, dest)
	for root, dirs, files in os.walk(src):
		for f in files:
			fullpath = os.path.join(root, f)
			copy_to_persistent_storage(fullpath, dest)

if __name__ == '__main__':
	parser = OptionParser('%prog [options]')
	parser.add_option('--app', dest='app', help='App ID')
	parser.add_option('--app-version', dest='app_version', help='Version of App')
	parser.add_option('--error-file', dest='error_file', help='Name of Error File')
	opts, args = parser.parse_args()

	dest = '/var/lib/univention-appcenter/apps/%s/conf/' % opts.app

	# The files and directories below the files directory are restored
	# automatically after the new container has been started
	store = '/var/lib/univention-appcenter/apps/%s/conf/files' % opts.app

	try:
		for f in glob.glob('/etc/univention/base*conf'):
			print 'cp %s %s' % (f, dest)
			shutil.copy(f, dest)
		copy_files('/etc/*.secret', store)
		copy_recursive('/etc/univention/ssl', store)
		copy_recursive('/var/univention-join', store)
		copy_recursive('/var/lib/univention-ldap/', store)
		copy_recursive('/var/lib/univention-directory-listener/', store)
		copy_recursive('/etc/univention/connector', store)
	except:
		traceback.print_exc()
		if opts.error_file:
			error_file = open(opts.error_file, 'a+')
			traceback.print_exc(file=error_file)
			error_file.close()
		raise
'''

def get_dummy_svg():
	return open(os.path.join(os.path.dirname(__file__), 'dummy.svg'), 'r').read()
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   version="1.1"
   width="110"
   height="126.122"
   id="svg3555">
  <defs
     id="defs3557" />
  <metadata
     id="metadata3560">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     transform="translate(-319.28571,-275.01547)"
     id="layer1">
    <g
       transform="matrix(1,0,0,-1,331.53071,388.89247)"
       id="g530">
      <path
         d="m 0,0 0,101.633 85.51,0 0,-66.758 C 85.51,15.552 61.655,23.293 61.655,23.293 61.655,23.293 68.958,0 50.941,0 L 0,0 z m 97.755,33.818 0,80.059 -110,0 0,-126.122 63.372,0 c 20.867,0 46.628,27.266 46.628,46.063 M 40.87,21.383 C 33.322,18.73 27.1,21.772 28.349,29.02 c 1.248,7.25 8.41,22.771 9.432,25.705 1.021,2.936 -0.937,3.74 -3.036,2.546 -1.21,-0.698 -3.009,-2.098 -4.554,-3.458 -0.427,0.862 -1.03,1.848 -1.482,2.791 2.52,2.526 6.732,5.912 11.72,7.138 5.958,1.471 15.916,-0.88 11.636,-12.269 -3.056,-8.117 -5.218,-13.719 -6.58,-17.89 -1.361,-4.173 0.256,-5.048 2.639,-3.423 1.862,1.271 3.846,3 5.299,4.342 0.673,-1.093 0.888,-1.442 1.553,-2.698 C 52.452,29.217 45.85,23.163 40.87,21.383 m 15.638,50.213 c -3.423,-2.913 -8.498,-2.85 -11.336,0.143 -2.838,2.992 -2.365,7.779 1.058,10.694 3.423,2.913 8.498,2.85 11.336,-0.141 2.838,-2.993 2.364,-7.781 -1.058,-10.696"
         id="path532"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
    </g>
  </g>
</svg>'''

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dummy.svg (+40 lines)

Line 0	Link Here

<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg

   xmlns:dc="http://purl.org/dc/elements/1.1/"

   xmlns:cc="http://creativecommons.org/ns#"

   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

   xmlns:svg="http://www.w3.org/2000/svg"

   xmlns="http://www.w3.org/2000/svg"

   version="1.1"

   width="110"

   height="126.122"

   id="svg3555">

  <defs

     id="defs3557" />

  <metadata

     id="metadata3560">

    <rdf:RDF>

      <cc:Work

         rdf:about="">

        <dc:format>image/svg+xml</dc:format>

        <dc:type

           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

        <dc:title></dc:title>

      </cc:Work>

    </rdf:RDF>

  </metadata>

<g

     transform="translate(-319.28571,-275.01547)"

     id="layer1">

<g

       transform="matrix(1,0,0,-1,331.53071,388.89247)"

       id="g530">

      <path

         d="m 0,0 0,101.633 85.51,0 0,-66.758 C 85.51,15.552 61.655,23.293 61.655,23.293 61.655,23.293 68.958,0 50.941,0 L 0,0 z m 97.755,33.818 0,80.059 -110,0 0,-126.122 63.372,0 c 20.867,0 46.628,27.266 46.628,46.063 M 40.87,21.383 C 33.322,18.73 27.1,21.772 28.349,29.02 c 1.248,7.25 8.41,22.771 9.432,25.705 1.021,2.936 -0.937,3.74 -3.036,2.546 -1.21,-0.698 -3.009,-2.098 -4.554,-3.458 -0.427,0.862 -1.03,1.848 -1.482,2.791 2.52,2.526 6.732,5.912 11.72,7.138 5.958,1.471 15.916,-0.88 11.636,-12.269 -3.056,-8.117 -5.218,-13.719 -6.58,-17.89 -1.361,-4.173 0.256,-5.048 2.639,-3.423 1.862,1.271 3.846,3 5.299,4.342 0.673,-1.093 0.888,-1.442 1.553,-2.698 C 52.452,29.217 45.85,23.163 40.87,21.383 m 15.638,50.213 c -3.423,-2.913 -8.498,-2.85 -11.336,0.143 -2.838,2.992 -2.365,7.779 1.058,10.694 3.423,2.913 8.498,2.85 11.336,-0.141 2.838,-2.993 2.364,-7.781 -1.058,-10.696"

         id="path532"

         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />

    </g>

  </g>

</svg>




#!/usr/bin/python2.7
from optparse import OptionParser
import os
import shutil
import string
import univention.config_registry
import traceback

BLACKLIST_UCR_VARIABLES = [
	'version/version',
	'version/erratalevel',
	'version/patchlevel',
	'version/releasename',
]


# Helper function to copy all meta data of a file or directory
def copy_permissions(src, dest):
	s_stat = os.stat(src)
	os.chown(dest, s_stat.st_uid, s_stat.st_gid)
	shutil.copymode(src, dest)
	shutil.copystat(src, dest)


def restore_files(source_dir):
	if not os.path.exists(source_dir):
		return
	for (path, dirs, files) in os.walk(source_dir):
		for d in dirs:
			r_path = string.replace(path, source_dir, '/', 1)
			dest = os.path.join(r_path, d)
			if not os.path.exists(dest):
				os.makedirs(dest)
			src = os.path.join(path, d)
			copy_permissions(src, dest)
		for i in files:
			src = os.path.join(path, i)
			dest = string.replace(src, source_dir, '', 1)
			if os.path.islink(src):
				linkto = os.readlink(src)
				if os.path.exists(dest) or os.path.islink(dest):
					print 'rm %s' % dest
					os.remove(dest)
				print 'ln -sf %s %s' % (linkto, dest)
				os.symlink(linkto, dest)
			else:
				print 'cp %s %s' % (src, dest)
				shutil.copy(src, dest)
				copy_permissions(src, dest)


def restore_ucr_layer(ucr_file, options):
	if not os.path.exists(ucr_file):
		return
	f = open(ucr_file, "r")
	vv = []
	for v in f.readlines():
		v = v.strip()
		if not v or v.startswith('#'):
			continue
		key, value = v.split(':', 1)
		if key not in BLACKLIST_UCR_VARIABLES:
			vv.append('%s=%s' % (key, value))
	if vv:
		print vv
		univention.config_registry.handler_set(vv, opts=options)


def main():
	parser = OptionParser('%prog [options]')
	parser.add_option('--app', dest='app', help='App ID')
	parser.add_option('--app-version', dest='app_version', help='Version of App')
	parser.add_option('--error-file', dest='error_file', help='Name of Error File')
	opts, args = parser.parse_args()

	conf_dir = '/var/lib/univention-appcenter/apps/%s/conf/' % opts.app
	source_dir = '/var/lib/univention-appcenter/apps/%s/conf/files' % opts.app

	try:
		restore_files(source_dir)

		print '** Restore forced UCR layer:'
		restore_ucr_layer(os.path.join(conf_dir, 'base-forced.conf'), {'force': True})
		print '** Restore ldap UCR layer'
		restore_ucr_layer(os.path.join(conf_dir, 'base-ldap.conf'), {'ldap-policy': True})
		print '** Restore normal UCR layer:'
		restore_ucr_layer(os.path.join(conf_dir, 'base.conf'), {})
	except:
		traceback.print_exc()
		if opts.error_file:
			error_file = open(opts.error_file, 'a+')
			traceback.print_exc(file=error_file)
			error_file.close()
		raise


if __name__ == '__main__':
	main()

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/setup.sh (+11 lines)

Line 0	Link Here

#!/bin/bash

eval "$(ucr shell)"

set -x -e

if [ "$version_version" = 4.0 ]; then

	repo=${repository_online_server#*://}

	ucr set repository/online/server="${repo%%/*}"

fi

univention-install --yes univention-apache

mkdir "/var/www/%(app_name)s"

echo "TEST-%(app_name)s" >>"/var/www/%(app_name)s/index.txt"

/usr/share/univention-docker-container-mode/setup "$@"




#!/usr/bin/python2.7
from optparse import OptionParser
import glob
import os
import shutil
import traceback


# Helper function to copy all meta data of a file or directory
def copy_permissions(src, dest):
	s_stat = os.stat(src)
	os.chown(dest, s_stat.st_uid, s_stat.st_gid)
	shutil.copymode(src, dest)
	shutil.copystat(src, dest)


# Helper function to copy the files and directory
def copy_to_persistent_storage(src, dest):
	l_src = src.split('/')
	# Ignore first empty entry
	if l_src[0] == '':
		l_src = l_src[1:]
	for j in range(0, len(l_src)):
		s = os.path.join('/', '/'.join(l_src[0:j + 1]))
		d = os.path.join(dest, '/'.join(l_src[0:j + 1]))
		if os.path.isdir(s):
			if not os.path.exists(d):
				os.makedirs(d)
				copy_permissions(s, d)
		elif os.path.islink(s):
			linkto = os.readlink(s)
			if os.path.exists(d) or os.path.islink(d):
				print 'rm %s' % d
				os.remove(d)
			print 'ln -sf %s %s' % (linkto, d)
			os.symlink(linkto, d)
		else:
			print 'cp %s %s' % (s, d)
			shutil.copy(s, d)
			copy_permissions(s, d)


def copy_files(src, dest):
	for f in glob.glob(src):
		copy_to_persistent_storage(f, dest)


def copy_recursive(src, dest):
	if not os.path.exists(src):
		return
	copy_to_persistent_storage(src, dest)
	for root, dirs, files in os.walk(src):
		for f in files:
			fullpath = os.path.join(root, f)
			copy_to_persistent_storage(fullpath, dest)


def main():
	parser = OptionParser('%prog [options]')
	parser.add_option('--app', dest='app', help='App ID')
	parser.add_option('--app-version', dest='app_version', help='Version of App')
	parser.add_option('--error-file', dest='error_file', help='Name of Error File')
	opts, args = parser.parse_args()

	dest = '/var/lib/univention-appcenter/apps/%s/conf/' % opts.app

	# The files and directories below the files directory are restored
	# automatically after the new container has been started
	store = '/var/lib/univention-appcenter/apps/%s/conf/files' % opts.app

	try:
		for f in glob.glob('/etc/univention/base*conf'):
			print 'cp %s %s' % (f, dest)
			shutil.copy(f, dest)
		copy_files('/etc/*.secret', store)
		copy_recursive('/etc/univention/ssl', store)
		copy_recursive('/var/univention-join', store)
		copy_recursive('/var/lib/univention-ldap/', store)
		copy_recursive('/var/lib/univention-directory-listener/', store)
		copy_recursive('/etc/univention/connector', store)
	except:
		traceback.print_exc()
		if opts.error_file:
			error_file = open(opts.error_file, 'a+')
			traceback.print_exc(file=error_file)
			error_file.close()
		raise


if __name__ == '__main__':
	main()
.../test/ucs-test/univention/testing/debian_package.py   | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)




		deb_package = os.path.join(self._package_tempdir, deb_file)
		return deb_package

	def __create_file_from_buffer(self, path, file_buffer, mode=None):
		f = open(path, 'w')
		f.write(file_buffer)
		f.close()
		if mode:
			os.chmod(path, mode)

	def create_join_script_from_buffer(self, joinscript_name, joinscript_buffer):
		self.__join_file = os.path.join(self._package_path, joinscript_name)
		self.__create_file_from_buffer(self.__join_file, joinscript_buffer, 0755)
		os.chmod(self.__join_file, 0755)

	def create_unjoin_script_from_buffer(self, unjoinscript_name, unjoinscript_buffer):
		self.__unjoin_file = os.path.join(self._package_path, unjoinscript_name)
		self.__create_file_from_buffer(self.__unjoin_file, unjoinscript_buffer, 0755)
		os.chmod(self.__unjoin_file, 0755)

	def create_usr_share_file_from_buffer(self, share_filename, schema_buffer):
		share_file = os.path.join(self._package_path, 'usr/share/%s' % self._package_name, share_filename)

			os.makedirs(dirpath)
		self.__create_file_from_buffer(share_file, schema_buffer)

	def create_debian_file_from_buffer(self, debian_filename, debian_buffer, mode=None):
		deb_file = os.path.join(self._package_debian_path, debian_filename)
		self.__create_file_from_buffer(deb_file, debian_buffer, mode)

	def build(self):
		install = []

%:
	dh $@
'''
		self.create_debian_file_from_buffer('rules', rules, 0755)

	def _create_compat(self):
		compat = '''7
- 
--
.../ucs-4.1-0/test/ucs-test/tests/80_docker/10_pull_appbox_mini      | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/40_app_install_4_0-3     | 2 +-
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/51_app_install   | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave  | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/53_missing_dockerimage   | 2 +-
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/54_app_preinst   | 5 ++++-
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/55_app_modproxy  | 2 +-
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop | 3 ++-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/57_app_without_package   | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/58_app_uninstallation    | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature  | 3 ++-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/61_app_updater_identify  | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/62_app_update_available  | 5 ++++-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/64_app_container_upgrade | 2 +-
.../tests/80_docker/65_app_container_upgrade_dockerallowedimage      | 4 ++--
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/70_app_scaling   | 2 +-
.../ucs-4.1-0/test/ucs-test/tests/80_docker/75_app_ports_exclusive   | 3 +--
.../ucs-4.1-0/test/ucs-test/tests/80_docker/76_app_ports_redirect    | 3 +--
.../test/ucs-test/tests/80_docker/77_app_ports_conflicts_exclusive   | 4 +---
.../test/ucs-test/tests/80_docker/78_app_ports_conflicts_redirect    | 4 +---
.../test/ucs-test/tests/80_docker/79_app_ports_already_used          | 3 +--
21 files changed, 30 insertions(+), 29 deletions(-)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/10_pull_appbox_mini (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (docker_login, docker_pull)

if __name__ == '__main__':

if __name__ == '__main__':

	docker_login()

	docker_login()

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/40_app_install_4_0-3 (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, App, store_data_script_4_1)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/51_app_install (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

if __name__ == '__main__':

if __name__ == '__main__':

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave (-1 / +1 lines)

Lines 8-14	Link Here

##  - 39792

##  - 39792

##  - 39801

##  - 39801

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

import ldap

import ldap

import time

import time

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/53_missing_dockerimage (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import fail

from univention.testing.utils import fail

from univention.testing.internal import package_installed

from univention.testing.internal import package_installed

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/54_app_preinst (-1 / +4 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (

	Appcenter, get_app_name, get_app_version, App,

	UCSTest_DockerApp_VerifyFailed, UCSTest_DockerApp_InstallationFailed,

def create_app(fail_in_preinst):

def create_app(fail_in_preinst):

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/55_app_modproxy (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

if __name__ == '__main__':

if __name__ == '__main__':

	with Appcenter() as appcenter:

	with Appcenter() as appcenter:

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop (-1 / +2 lines)

Lines 3-11	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

import subprocess

import subprocess

import time

import time

from univention.testing.utils import fail

if __name__ == '__main__':

if __name__ == '__main__':

	nscd_stopped = False

	nscd_stopped = False

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/57_app_without_package (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import get_ldap_connection

if __name__ == '__main__':

if __name__ == '__main__':

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/58_app_uninstallation (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import fail, get_ldap_connection

from univention.testing.utils import fail, get_ldap_connection

import os

import os

import subprocess

import subprocess

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature (-1 / +2 lines)

Lines 4-10	Link Here

## exposure: dangerous

## exposure: dangerous

import os

import os

from dockertest import *

from dockertest import Appcenter

from univention.config_registry import handler_set

from subprocess import call

from subprocess import call

from univention.testing.utils import fail

from univention.testing.utils import fail

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/61_app_updater_identify (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App, UCSTest_Docker_Exception)

class UCSTest_DockerApp_Identify(UCSTest_Docker_Exception):

class UCSTest_DockerApp_Identify(UCSTest_Docker_Exception):

	pass

	pass

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/62_app_update_available (-1 / +4 lines)

Lines 5-14	Link Here

## versions:

## versions:

##  4.1-0: skip

##  4.1-0: skip

from dockertest import *

from dockertest import (Appcenter, get_app_name, App)

from univention.testing.debian_package import DebianPackage

from univention.testing.debian_package import DebianPackage

from univention.testing.utils import get_ldap_connection, fail

from univention.testing.utils import get_ldap_connection, fail

from univention.config_registry import ConfigRegistry

from univention.config_registry import ConfigRegistry

import os

import shutil

import subprocess

def copy_package_to_appcenter(ucs_version, app_directory, package_name):

def copy_package_to_appcenter(ucs_version, app_directory, package_name):

	target = os.path.join('/var/www/univention-repository/%s/maintained/component' % ucs_version, '%s/all' % app_directory)

	target = os.path.join('/var/www/univention-repository/%s/maintained/component' % ucs_version, '%s/all' % app_directory)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/64_app_container_upgrade (-1 / +1 lines)

Lines 3-9	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, App, store_data_script_4_1)

from univention.testing.utils import get_ldap_connection, fail

from univention.testing.utils import get_ldap_connection, fail

from univention.config_registry import ConfigRegistry

from univention.config_registry import ConfigRegistry

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/65_app_container_upgrade_dockerallowedimage (-2 / +2 lines)

Lines 5-12	Link Here

## versions:

## versions:

##  4.1-0: skip

##  4.1-0: skip

from dockertest import *

from dockertest import (Appcenter, get_app_name, App)

from univention.testing.utils import get_ldap_connection,fail

from univention.testing.utils import get_ldap_connection, fail

from univention.config_registry import ConfigRegistry

from univention.config_registry import ConfigRegistry

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/70_app_scaling (-1 / +1 lines)

Lines 4-10	Link Here

## timeout: 7200

## timeout: 7200

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

DOCKER_APP_COUNT = 20

DOCKER_APP_COUNT = 20

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/75_app_ports_exclusive (-2 / +1 lines)

Lines 3-10	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import is_port_open

from univention.testing.utils import is_port_open

from univention.testing.utils import restart_firewall

from univention.testing.utils import restart_firewall

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/76_app_ports_redirect (-2 / +1 lines)

Lines 3-10	Link Here

## tags: [docker]

## tags: [docker]

## exposure: dangerous

## exposure: dangerous

from dockertest import *

from dockertest import (Appcenter, get_app_name, get_app_version, App)

from univention.testing.utils import get_ldap_connection

from univention.testing.utils import is_port_open

from univention.testing.utils import is_port_open

from univention.testing.utils import restart_firewall

from univention.testing.utils import restart_firewall




## tags: [docker]
## exposure: dangerous

from dockertest import (Appcenter, get_app_version, App, UCSTest_DockerApp_InstallationFailed)
from univention.testing.utils import get_ldap_connection
from univention.testing.utils import is_port_open

import socket
import pytest
import time

if __name__ == '__main__':
	with Appcenter() as appcenter:




## tags: [docker]
## exposure: dangerous

from dockertest import (Appcenter, get_app_version, App, UCSTest_DockerApp_InstallationFailed)
from univention.testing.utils import get_ldap_connection
from univention.testing.utils import is_port_open

import socket
import pytest
import time

if __name__ == '__main__':
	with Appcenter() as appcenter:




## tags: [docker]
## exposure: dangerous

from dockertest import (Appcenter, get_app_name, get_app_version, App)
from univention.testing.utils import get_ldap_connection
import socket
import sys

def _open_port(port):
	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- 
--
.../ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave     | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave (-3 / +1 lines)

Lines 38-44 univention-install --yes --no-install-recommends univention-server-slave univent	Link Here

			try:

			try:

				lo = get_ldap_connection()

				lo = get_ldap_connection()

			except ldap.SERVER_DOWN():

			except ldap.SERVER_DOWN:

				print 'LDAP connection failed. Wait for ten seconds and try again.'

				print 'LDAP connection failed. Wait for ten seconds and try again.'

				time.sleep(60)

				time.sleep(60)

				lo = get_ldap_connection()

				lo = get_ldap_connection()

--

.../ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave     | 2 +-

.../ucs-4.1-0/test/ucs-test/tests/80_docker/52_app_install_dc_slave     | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

1 file changed, 1 insertion(+), 1 deletion(-)




			try:
				lo = get_ldap_connection()
			except ldap.SERVER_DOWN:
				print 'LDAP connection failed. Wait for 60 seconds and try again.'
				time.sleep(60)
				lo = get_ldap_connection()
			print lo.searchDn(filter='(&(cn=%s-*)(objectClass=univentionDomainController)(univentionServerRole=slave)(!(aRecord=*)))' % app_name, unique=True, required=True)
- 
--
.../test/ucs-test/tests/80_docker/56_app_nscd_stop |  4 +-
.../ucs-test/tests/80_docker/58_app_uninstallation |  2 +-
.../tests/80_docker/59_app_center_signature        | 16 +++---
.../tests/80_docker/62_app_update_available        |  9 ++--
.../test/ucs-test/tests/80_docker/dockertest.py    | 62 +++++++++++++++++-----
5 files changed, 63 insertions(+), 30 deletions(-)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/56_app_nscd_stop (-2 / +2 lines)

Lines 31-37 if __name__ == '__main__':	Link Here

			ncs_container_pid_old = app.execute_command_in_container('pidof nscd')

			ncs_container_pid_old = app.execute_command_in_container('pidof nscd')

			print ncs_container_pid_old

			print ncs_container_pid_old

			subprocess.call('/etc/init.d/nscd stop', shell=True)

			subprocess.call(('/etc/init.d/nscd', 'stop'))

			nscd_stopped = True

			nscd_stopped = True

			time.sleep(3)

			time.sleep(3)

			ncs_container_pid_new = app.execute_command_in_container('pidof nscd')

			ncs_container_pid_new = app.execute_command_in_container('pidof nscd')

Lines 40-45 if __name__ == '__main__':	Link Here

				fail('nscd pid in container have been changed. old: [%s], new: [%s]' % (ncs_container_pid_old, ncs_container_pid_new))

				fail('nscd pid in container have been changed. old: [%s], new: [%s]' % (ncs_container_pid_old, ncs_container_pid_new))

		finally:

		finally:

			if nscd_stopped:

			if nscd_stopped:

				subprocess.call('/etc/init.d/nscd start', shell=True)

				subprocess.call(('/etc/init.d/nscd', 'start'))

			app.uninstall()

			app.uninstall()

			app.remove()

			app.remove()

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/58_app_uninstallation (-1 / +1 lines)

Lines 79-83 echo "Test 123 Conf" >/var/lib/univention-appcenter/apps/%(app_name)s/conf/test1	Link Here

		# Check for the backup container

		# Check for the backup container

		res = subprocess.call('docker images | grep appcenter-backup-%s' % app.app_name, shell=True)

		res = subprocess.call('docker images | grep appcenter-backup-%s' % app.app_name, shell=True)

		if res != 0:

		if res != 0:

			subprocess.call('docker images' % app.app_name, shell=True)

			subprocess.call(('docker', 'images'))

			fail('Backup container appcenter-backup-%s was not found' % app.app_name)

			fail('Backup container appcenter-backup-%s was not found' % app.app_name)




		handler_set([
			'repository/app_center/server=%s' % (self.upstream_appcenter)
		])
		call(('univention-app', 'update'))
		handler_set([
			'repository/app_center/server=%s.%s' % (self.ucr['hostname'], self.ucr['domainname'])
		])

		if not os.path.exists(d):
			os.makedirs(d)

		call(('wget', '-O', '/var/www/%s' % f, '%s/%s' % (self.upstream_appcenter, f))

	def download_index_json(self):
		self.download('meta-inf/%s/index.json.gz' % self.vv)


	def test_index_without_gpg(self):
		self.download_index_json()
		res = call(('univention-app', 'update'))
		if res == 0:
			fail('_test_index_without_gpg failed')
		print '### _test_index_without_gpg passed'

	def test_index_with_gpg(self):
		self.download_index_json()
		self.download_index_json_gpg()
		res = call(('univention-app', 'update'))
		if res != 0:
			fail('_test_index_with_gpg failed')
		print '### _test_index_with_gpg passed'

		self.download_index_json_gpg()
		f = '/var/www/meta-inf/%s/index.json' % self.vv
		call('gunzip %(f)s.gz; echo "foo" >>%(f)s; gzip %(f)s' % {'f':f}, shell=True)
		res = call(('univention-app', 'update'))
		if res == 0:
			fail('_test_modify_index failed')
		print '### _test_modify_index passed'

		self.remove_from_cache('dudle-docker.ini')
		self.download('meta-inf/%s/dudle-docker/dudle-docker.ini' % self.vv)
		call('echo "## SIGNATURE TEST ###" >>/var/www/meta-inf/%s/dudle-docker/dudle-docker.ini' % self.vv, shell=True)
		res = call(('univention-app', 'update'))
		# dudle-docker must have been removed
		res = call(('univention-app', 'get', 'dudle-docker', 'name'))
		if res == 0:
			fail('_test_modify_ini failed')
		print '### _test_modify_ini passed'

		self.remove_from_cache('owncloud8-docker_20150917.inst')
		self.download('univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv)
		call('echo "## SIGNATURE TEST ###" >>/var/www/univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv, shell=True)
		res = call(('univention-app', 'update'))
		# Check only if the file was removed from th local cache
		if self.file_exists_in_cache('owncloud8-docker_20150917.inst'):
			fail('_test_modify_inst failed')




	target = os.path.join('/var/www/univention-repository/%s/maintained/component' % ucs_version, '%s/all' % app_directory)
	print 'cp %s %s' % (package_name, target)
	shutil.copy(package_name, target)
	cmd = '''
		cd /var/www/univention-repository/%(version)s/maintained/component;
		apt-ftparchive packages %(app)s/all >%(app)s/all/Packages;
		gzip -c %(app)s/all/Packages >%(app)s/all/Packages.gz
	''' % {'version': ucs_version, 'app': app_directory}
	print cmd
	subprocess.call(cmd, shell=True)
		apt-ftparchive packages %(app)s/all >%(app)s/all/Packages;
		gzip -c %(app)s/all/Packages >%(app)s/all/Packages.gz
	''' % {'version': ucs_version, 'app': app_directory}, shell=True)

if __name__ == '__main__':
	with Appcenter() as appcenter:

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dockertest.py (-15 / +49 lines)

Lines 85-91 class UCSTest_DockerApp_ModProxyFailed(Exception):	Link Here

def docker_login(server='docker.software-univention.de'):

def docker_login(server='docker.software-univention.de'):

	ret = subprocess.call(['docker', 'login', '-e', 'foo@bar', '-u', 'ucs', '-p', 'readonly', server])

	ret = subprocess.call((

		'docker',

		'login',

		'-e', 'foo@bar',

		'-u', 'ucs',

		'-p', 'readonly',

		server,

))

	if ret != 0:

	if ret != 0:

		raise UCSTest_Docker_LoginFailed()

		raise UCSTest_Docker_LoginFailed()

Lines 201-210 class App:	Link Here

201

	def install(self):

208

	def install(self):

202

		self._update()

209

		self._update()

203

		admin_user = self.ucr.get('tests/domainadmin/account').split(',')[0][len('uid='):]

210

		admin_user = self.ucr.get('tests/domainadmin/account').split(',')[0][len('uid='):]

204

		# ret = subprocess.call('univention-app install --noninteractive --do-not-revert --username=%s --pwdfile=%s %s' %

211

		cmd = (

205

		cmd = 'univention-app install --noninteractive --username=%s --pwdfile=%s %s' % (admin_user, self.ucr.get('tests/domainadmin/pwdfile'), self.app_name)

212

			'univention-app', 'install',

213

			'--noninteractive',

214

			'--username=%s' % admin_user,

215

			'--pwdfile=%s' % self.ucr.get('tests/domainadmin/pwdfile'),

216

			self.app_name,

217

206

		print cmd

218

		print cmd

207

		ret = subprocess.call(cmd, shell=True)

219

		ret = subprocess.call(cmd)

208

		if ret != 0:

220

		if ret != 0:

209

			raise UCSTest_DockerApp_InstallationFailed()

221

			raise UCSTest_DockerApp_InstallationFailed()

210

222

Lines 220-227 class App:	Link Here

220

232

221

	def upgrade(self):

233

	def upgrade(self):

222

		self._update()

234

		self._update()

223

		ret = subprocess.call('univention-app upgrade --noninteractive --username=%s --pwdfile=%s %s' %

235

		ret = subprocess.call((

224

					(self.admin_user, self.admin_pwdfile, self.app_name), shell=True)

236

			'univention-app', 'upgrade',

237

			'--noninteractive',

238

			'--username=%s' % self.admin_user,

239

			'--pwdfile=%s' % self.admin_pwdfile,

240

			self.app_name,

241

))

225

		if ret != 0:

242

		if ret != 0:

226

			raise UCSTest_DockerApp_UpgradeFailed()

243

			raise UCSTest_DockerApp_UpgradeFailed()

227

		self.ucr.load()

244

		self.ucr.load()

Lines 229-253 class App:	Link Here

229

		self.installed = True

246

		self.installed = True

230

247

231

	def verify(self, joined=True):

248

	def verify(self, joined=True):

232

		ret = subprocess.call('univention-app status %s' % (self.app_name), shell=True)

249

		ret = subprocess.call(('univention-app', 'status', self.app_name))

233

		if ret != 0:

250

		if ret != 0:

234

			raise UCSTest_DockerApp_VerifyFailed()

251

			raise UCSTest_DockerApp_VerifyFailed()

235

252

236

		if joined:

253

		if joined:

237

			ret = subprocess.call('docker exec %s univention-check-join-status' % self.container_id, stderr=subprocess.STDOUT, shell=True)

254

			ret = subprocess.call((

255

				'docker',

256

				'exec', self.container_id,

257

				'univention-check-join-status',

258

			), stderr=subprocess.STDOUT)

238

			if ret != 0:

259

			if ret != 0:

239

				raise UCSTest_DockerApp_VerifyFailed()

260

				raise UCSTest_DockerApp_VerifyFailed()

240

261

241

	def uninstall(self):

262

	def uninstall(self):

242

		if self.installed:

263

		if self.installed:

243

			ret = subprocess.call('univention-app remove --noninteractive --username=%s --pwdfile=%s %s' %

264

			ret = subprocess.call((

244

						(self.admin_user, self.admin_pwdfile, self.app_name), shell=True)

265

				'univention-app', 'remove',

266

				'--noninteractive',

267

				'--username=%s' % self.admin_user,

268

				'--pwdfile=%s' % self.admin_pwdfile,

269

				self.app_name,

270

))

245

			if ret != 0:

271

			if ret != 0:

246

				raise UCSTest_DockerApp_RemoveFailed()

272

				raise UCSTest_DockerApp_RemoveFailed()

247

273

248

	def execute_command_in_container(self, cmd):

274

	def execute_command_in_container(self, cmd):

249

		print 'Execute: %s' % cmd

275

		print 'Execute: %s' % cmd

250

		return subprocess.check_output('docker exec %s %s' % (self.container_id, cmd), stderr=subprocess.STDOUT, shell=True)

276

		return subprocess.check_output((

277

			'docker',

278

			'exec', self.container_id,

279

			'/bin/bash', '-c', cmd,

280

		), stderr=subprocess.STDOUT)

251

281

252

	def remove(self):

282

	def remove(self):

253

		if self.package:

283

		if self.package:

Lines 368-375 class Appcenter:	Link Here

368

			if not os.path.isdir(directory):

398

			if not os.path.isdir(directory):

369

				continue

399

				continue

370

			print 'create_appcenter_json.py for %s' % vv

400

			print 'create_appcenter_json.py for %s' % vv

371

			subprocess.call('create_appcenter_json.py -u %(version)s -d /var/www -o /var/www/meta-inf/%(version)s/index.json.gz -s http://%(fqdn)s' %

401

			var = {'version': vv, 'fqdn': '%s.%s' % (self.ucr['hostname'], self.ucr['domainname'])}, shell=True)

372

				 {'version': vv, 'fqdn': '%s.%s' % (self.ucr['hostname'], self.ucr['domainname'])}, shell=True)

402

			subprocess.call((

403

				'create_appcenter_json.py',

404

				'-u', vv,

405

				'-d', '/var/www',

406

				'-o', '/var/www/meta-inf/%(version)s/index.json.gz' % var,

407

				'-s', 'http://%(fqdn)s' % var,

408

))

373

409

374

	def cleanup(self):

410

	def cleanup(self):

375

		if self.meta_inf_created:

411

		if self.meta_inf_created:

376

377

--

378

.../ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature     | 2 ++

412

.../ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature     | 2 ++

379

1 file changed, 2 insertions(+)

413

1 file changed, 2 insertions(+)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/59_app_center_signature (-2 / +2 lines)

Lines 95-100 class SyncedAppcenter(Appcenter):	Link Here

		self.download('univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv)

		self.download('univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv)

		call('echo "## SIGNATURE TEST ###" >>/var/www/univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv, shell=True)

		call('echo "## SIGNATURE TEST ###" >>/var/www/univention-repository/%s/maintained/component/owncloud8-docker_20150917/inst' % self.vv, shell=True)

		res = call(('univention-app', 'update'))

		res = call(('univention-app', 'update'))

		if res == 0:

			print 'update failed: %d' % res

		# Check only if the file was removed from th local cache

100

		# Check only if the file was removed from th local cache

		if self.file_exists_in_cache('owncloud8-docker_20150917.inst'):

101

		if self.file_exists_in_cache('owncloud8-docker_20150917.inst'):

100

			fail('_test_modify_inst failed')

102

			fail('_test_modify_inst failed')

101

102

--

103

.../test/ucs-test/tests/80_docker/dockertest.py    | 68 +++++++++++++---------

103

.../test/ucs-test/tests/80_docker/dockertest.py    | 68 +++++++++++++---------

104

1 file changed, 42 insertions(+), 26 deletions(-)

104

1 file changed, 42 insertions(+), 26 deletions(-)

(-)a/branches/ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dockertest.py (-28 / +42 lines)

Lines 38-43 import shutil	Link Here

import subprocess

import subprocess

import urllib2

import urllib2

META_INF = '/var/www/meta-inf'

REPO_DIR = '/var/www/univention-repository'

class UCSTest_Docker_Exception(Exception):

class UCSTest_Docker_Exception(Exception):

Lines 284-293 class App:	Link Here

284

			self.package.remove()

286

			self.package.remove()

285

287

286

	def _dump_ini(self):

288

	def _dump_ini(self):

287

		if not os.path.exists('/var/www/meta-inf/%s' % self.ucs_version):

289

		path = os.path.join(META_INF, self.ucs_version)

288

			os.makedirs('/var/www/meta-inf/%s' % self.ucs_version)

290

		if not os.path.exists(path):

291

			os.makedirs(path)

289

292

290

		target = os.path.join('/var/www/meta-inf/%s' % self.ucs_version, '%s.ini' % self.app_directory)

293

		target = os.path.join(path, '%s.ini' % self.app_directory)

291

		f = open(target, 'w')

294

		f = open(target, 'w')

292

		print 'Write ini file: %s' % target

295

		print 'Write ini file: %s' % target

293

		f.write('[Application]\n')

296

		f.write('[Application]\n')

Lines 297-312 class App:	Link Here

297

			print '%s: %s' % (key, self.ini[key])

300

			print '%s: %s' % (key, self.ini[key])

298

		print

301

		print

299

		f.close()

302

		f.close()

300

		svg = os.path.join('/var/www/meta-inf/%s' % self.ucs_version, self.ini.get('Logo'))

303

		svg = os.path.join(path, self.ini.get('Logo'))

301

		f = open(svg, 'w')

304

		f = open(svg, 'w')

302

		f.write(get_dummy_svg())

305

		f.write(get_dummy_svg())

303

		f.close()

306

		f.close()

304

307

305

	def _dump_scripts(self):

308

	def _dump_scripts(self):

309

		comp_path = os.path.join(

310

			REPO_DIR,

311

			self.ucs_version,

312

			'maintained/component',

313

			self.app_directory,

314

315

		if not os.path.exists(comp_path):

316

			os.makedirs(comp_path)

317

306

		for script in self.scripts.keys():

318

		for script in self.scripts.keys():

307

			comp_path = os.path.join('/var/www/univention-repository/%s/maintained/component' % self.ucs_version, '%s' % self.app_directory)

308

			if not os.path.exists(comp_path):

309

				os.makedirs(comp_path)

310

			target = os.path.join(comp_path, script)

319

			target = os.path.join(comp_path, script)

311

320

312

			print 'Create %s' % target

321

			print 'Create %s' % target

Lines 317-323 class App:	Link Here

317

			f.close()

326

			f.close()

318

327

319

	def _copy_package(self):

328

	def _copy_package(self):

320

		target = os.path.join('/var/www/univention-repository/%s/maintained/component' % self.ucs_version, '%s/all' % self.app_directory)

329

		target = os.path.join(

330

			REPO_DIR,

331

			self.ucs_version,

332

			'maintained/component',

333

			self.app_directory,

334

			'all',

335

321

		os.makedirs(target)

336

		os.makedirs(target)

322

		shutil.copy(self.package.get_binary_name(), target)

337

		shutil.copy(self.package.get_binary_name(), target)

323

		subprocess.call('''

338

		subprocess.call('''

Lines 353-363 class Appcenter:	Link Here

353

		self.ucr = UCSTestConfigRegistry()

368

		self.ucr = UCSTestConfigRegistry()

354

		self.ucr.load()

369

		self.ucr.load()

355

370

356

		if os.path.exists('/var/www/meta-inf'):

371

		if os.path.exists(META_INF):

357

			print 'ERROR: /var/www/meta-inf already exists'

372

			print 'ERROR: %s already exists' % META_INF

358

			raise AppcenterMetainfAlreadyExists()

373

			raise AppcenterMetainfAlreadyExists()

359

		if os.path.exists('/var/www/univention-repository'):

374

		if os.path.exists(REPO_DIR):

360

			print 'ERROR: /var/www/univention-repository already exists'

375

			print 'ERROR: %s already exists' % REPO_DIR

361

			raise AppcenterRepositoryAlreadyExists()

376

			raise AppcenterRepositoryAlreadyExists()

362

377

363

		if not version:

378

		if not version:

Lines 366-388 class Appcenter:	Link Here

366

		self.add_ucs_version_to_appcenter(version)

381

		self.add_ucs_version_to_appcenter(version)

367

382

368

	def add_ucs_version_to_appcenter(self, version):

383

	def add_ucs_version_to_appcenter(self, version):

369

		if not os.path.exists('/var/www/meta-inf'):

384

		if not os.path.exists(META_INF):

370

			os.makedirs('/var/www/meta-inf', 0755)

385

			os.makedirs(META_INF, 0755)

371

			self.meta_inf_created = True

386

			self.meta_inf_created = True

372

387

373

		if not os.path.exists('/var/www/univention-repository'):

388

		if not os.path.exists(REPO_DIR):

374

			os.makedirs('/var/www/univention-repository', 0755)

389

			os.makedirs(REPO_DIR, 0755)

375

			self.univention_repository_created = True

390

			self.univention_repository_created = True

376

391

377

		os.makedirs('/var/www/univention-repository/%s/maintained/component' % version)

392

		os.makedirs(os.path.join(REPO_DIR, version, 'maintained/component'))

378

		os.makedirs('/var/www/meta-inf/%s' % version)

393

		os.makedirs(os.path.join(META_INF, version))

379

394

380

		if not os.path.exists('/var/www/meta-inf/categories.ini'):

395

		path = os.path.join(META_INF, 'categories.ini')

396

		if not os.path.exists(path):

381

			text = open(os.path.join(os.path.dirname(__file__), 'categories.ini'), 'r').read()

397

			text = open(os.path.join(os.path.dirname(__file__), 'categories.ini'), 'r').read()

382

			f = open('/var/www/meta-inf/categories.ini', 'w')

398

			f = open(path, 'w')

383

			f.write(test)

399

			f.write(test)

384

			f.close()

400

			f.close()

385

			f = open('/var/www/meta-inf/rating.ini', 'w')

401

			f = open(os.path.join(META_INF, 'rating.ini'), 'w')

386

			f.write('# rating stuff\n')

402

			f.write('# rating stuff\n')

387

			f.close()

403

			f.close()

388

404

Lines 393-400 class Appcenter:	Link Here

393

])

409

])

394

410

395

	def update(self):

411

	def update(self):

396

		for vv in os.listdir('/var/www/meta-inf/'):

412

		for vv in os.listdir(META_INF):

397

			directory = os.path.join('/var/www/meta-inf/', vv)

413

			directory = os.path.join(META_INF, vv)

398

			if not os.path.isdir(directory):

414

			if not os.path.isdir(directory):

399

				continue

415

				continue

400

			print 'create_appcenter_json.py for %s' % vv

416

			print 'create_appcenter_json.py for %s' % vv

Lines 403-417 class Appcenter:	Link Here

403

				'create_appcenter_json.py',

419

				'create_appcenter_json.py',

404

				'-u', vv,

420

				'-u', vv,

405

				'-d', '/var/www',

421

				'-d', '/var/www',

406

				'-o', '/var/www/meta-inf/%(version)s/index.json.gz' % var,

422

				'-o', os.path.join(META_INF, vv, 'index.json.gz'),

407

				'-s', 'http://%(fqdn)s' % var,

423

				'-s', 'http://%(fqdn)s' % var,

408

))

424

))

409

425

410

	def cleanup(self):

426

	def cleanup(self):

411

		if self.meta_inf_created:

427

		if self.meta_inf_created:

412

			shutil.rmtree('/var/www/meta-inf')

428

			shutil.rmtree(META_INF)

413

		if self.univention_repository_created:

429

		if self.univention_repository_created:

414

			shutil.rmtree('/var/www/univention-repository')

430

			shutil.rmtree(REPO_DIR)

415

		self.ucr.revert_to_original_registry()

431

		self.ucr.revert_to_original_registry()

416

432

417

	def __enter__(self):

433

	def __enter__(self):

418

419

--

420

.../test/ucs-test/tests/80_docker/dockertest.py    | 37 ++++++++++------------

434

.../test/ucs-test/tests/80_docker/dockertest.py    | 37 ++++++++++------------

421

.../ucs-test/univention/testing/debian_package.py  |  5 ++-

435

.../ucs-test/univention/testing/debian_package.py  |  5 ++-

422

2 files changed, 18 insertions(+), 24 deletions(-)

436

2 files changed, 18 insertions(+), 24 deletions(-)




			os.makedirs(path)

		target = os.path.join(path, '%s.ini' % self.app_directory)
		with open(target, 'w') as f:
			print 'Write ini file: %s' % target
			f.write('[Application]\n')
			print '[Application]'
			for key in self.ini.keys():
				f.write('%s: %s\n' % (key, self.ini[key]))
				print '%s: %s' % (key, self.ini[key])
			print
		f.close()
		svg = os.path.join(path, self.ini.get('Logo'))
		with open(svg, 'w') as f:
			f.write(get_dummy_svg())
		f.close()

	def _dump_scripts(self):
		comp_path = os.path.join(

			print 'Create %s' % target
			print self.scripts[script]

			with open(target, 'w') as f:
				f.write(self.scripts[script])
			f.close()

	def _copy_package(self):
		target = os.path.join(

		path = os.path.join(META_INF, 'categories.ini')
		if not os.path.exists(path):
			text = open(os.path.join(os.path.dirname(__file__), 'categories.ini'), 'r').read()
			with open(path, 'w') as f:
				f.write(text)
			with open(os.path.join(META_INF, 'rating.ini'), 'w') as f:
				f.write('# rating stuff\n')
			f.write('# rating stuff\n')
			f.close()

		handler_set([
			'update/secure_apt=no',




		return deb_package

	def __create_file_from_buffer(self, path, file_buffer, mode=None):
		with open(path, 'w') as f:
			f.write(file_buffer)
		f.close()
		if mode:
			os.chmod(path, mode)

- 
--
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dockertest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)




		if not os.path.exists(comp_path):
			os.makedirs(comp_path)

		for name, script in self.scripts.iteritems():
			target = os.path.join(comp_path, name)

			print 'Create %s' % target
			print script

			with open(target, 'w') as f:
				f.write(script)

	def _copy_package(self):
		target = os.path.join(
- 
--
.../ucs-4.1/ucs-4.1-0/test/ucs-test/tests/80_docker/dockertest.py  | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)




		self.add_script(setup=setup % {'app_name': self.app_name})

	def verify_basic_modproxy_settings(self):
		fqdn = '%(hostname)s.%(domainname)s' % self.ucr
		test_string = 'TEST-%s\n' % self.app_name

		response = urllib2.urlopen('http://%s/%s/index.txt' % (fqdn, self.app_name))

		handler_set([
			'update/secure_apt=no',
			'appcenter/index/verify=false',
			'repository/app_center/server=%(hostname)s.%(domainname)s' % self.ucr
		])

	def update(self):

			if not os.path.isdir(directory):
				continue
			print 'create_appcenter_json.py for %s' % vv
			var = {'version': vv, 'fqdn': '%s.%s' % (self.ucr['hostname'], self.ucr['domainname'])}, shell=True)
			subprocess.call((
				'create_appcenter_json.py',
				'-u', vv,
				'-d', '/var/www',
				'-o', os.path.join(META_INF, vv, 'index.json.gz'),
				'-s', 'http://%(hostname)s.%(domainname)s' % self.ucr,
			))

	def cleanup(self):
- 

Return to bug 40463