Attachment #6266 for bug #36272

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




		buildRendering: function() {
			this.pages.push({
				name: 'pre_finish',
				widgets: [{
					name: 'dn',
					type: TextBox,
					visible: false
				}]
			});
			this.inherited(arguments);
		},

		},

		_testConnection: function(values) {
			var dn = values.dn;
			delete values.dn;
			return this.standbyDuring(tools.umcpCommand('uvmm/cloud/add', {
				cloudtype: values.cloudtype,
				name: values.name,
				dn: dn,
				testconnection: true,
				parameter: values
			}).then(lang.hitch(this, function(response) {
				this.moduleStore.onChange();
				this.standby(false);
				this.onFinished(response, values);
			}), lang.hitch(this, function(errormsg) {
				this.standby(false);
				// show error message
				dialog.alert('Error: ' + errormsg);
				return 'general';
			})));
		},

		next: function(currentPage) {




			this.inherited(arguments);
			this.pages = [{
				name: 'credentials',
				headerText: _('Cloud connection'),
				helpText: _('Please enter the corresponding credentials for the cloud connection. <a href="https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSGettingStartedGuide/AWSCredentials.html" target=_blank>Use this link to get information about AWS credentials</a>'),
				layout: [
					'name',
					'region',
					'access_id',
					'password'
				],
				widgets: [{
					name: 'name',





			// add a context menu to edit/delete items
			var menu = new Menu({});
			menu.addChild(this._menuEdit = new MenuItem({
				label: _( 'Edit' ),
				iconClass: 'umcIconEdit',
				onClick: lang.hitch(this, function() {
					console.log(this._navContextItem.id);
					this._editCloudConnection(this._navContextItem);
				})
			}));
			menu.addChild(this._menuDelete = new MenuItem({
						}
					}
				})}));
	/*		menu.addChild(new MenuItem({
				label: _( 'Delete' ),
				iconClass: 'umcIconDelete',
				onClick: lang.hitch(this, function() {
					this.removeObjects(this._navContextItem.id);
				})
			}));
			menu.addChild(new MenuItem({
				label: _( 'Reload' ),
				iconClass: 'umcIconRefresh',

			}), true));
			this.own(aspect.before(menu, '_openMyself', lang.hitch(this, function() {
				this._navContextItem = this._navContextItemFocused;
				this._updateMenuAvailability();
			})));

			// when we right-click anywhere on the tree, make sure we open the menu

			this._domainPage.on('UpdateProgress', lang.hitch(this, 'updateProgress'));
		},

		_updateMenuAvailability: function() {
			var item = this._navContextItemFocused;
			var canEdit = item.type == 'cloud' && item.dn;
			var canDelete = canEdit;
			this._menuEdit.set('disabled', !canEdit);
			this._menuDelete.set('disabled', !canDelete);
		},

		postCreate: function() {
			this.inherited(arguments);


			this.selectChild(wizard);
		},

		_editCloudConnection: function(item) {
			var values = {cloudtype: item.cloudtype};
			this._addCloudConnection(values).then(lang.hitch(this, function(wizard) {
				tools.forIn(wizard._pages, function(pageName, page) {
					tools.forIn(item.params, function(key, value) {
						var widget = wizard.getWidget(pageName, key);
						if (widget) {
							widget.set('value', value);
						}
					});
				});
			}));
		},

		_addCloudConnection: function(values) {
			var wizard = null;


				tools.defer(wait, 1000);
			});

			return this.loadWizardPages(values.cloudtype).then(lang.hitch(this, function(Wizard) {
				wizard = new Wizard({
					autoValidate: true,
					onFinished: _finished,

				});
				this.addChild(wizard);
				this.selectChild(wizard);
				return wizard;
			}));
		},


(-)umc/python/uvmm/cloud.py (-9 / +22 lines)

Lines 36-43	Link Here

from univention.management.console.log import MODULE

from univention.management.console.log import MODULE

from univention.management.console.modules.decorators import sanitize

from univention.management.console.modules.decorators import sanitize

from univention.management.console.modules.sanitizers import SearchSanitizer, ChoicesSanitizer

from univention.management.console.modules.sanitizers import SearchSanitizer, ChoicesSanitizer

from univention.uvmm.uvmm_ldap import ldap_cloud_types, ldap_cloud_connection_add

from univention.uvmm.uvmm_ldap import ldap_cloud_types, ldap_cloud_connection_add, ldap_cloud_connection_edit

from subprocess import call

from notifier import Callback

from notifier import Callback

from urlparse import urldefrag

from urlparse import urldefrag

Lines 87-92	Link Here

						'cloudtype': d.cloudtype,

						'cloudtype': d.cloudtype,

						'available': d.available,

						'available': d.available,

						'last_error_message': d.last_error_message,

						'last_error_message': d.last_error_message,

						'params': d.params,

						'dn': d.dn,

						'dn': d.dn,

})

})

Lines 126-132	Link Here

126

127

			if success:

127

			if success:

128

				# add cloud to ldap

128

				# add cloud to ldap

129

				ldap_cloud_connection_add(cloudtype, name, parameter)

129

				if dn:

130

					ldap_cloud_connection_edit(cloudtype, dn, name, parameter)

131

				else:

132

					ldap_cloud_connection_add(cloudtype, name, parameter)

130

133

131

				self.finished(request.id, data)

134

				self.finished(request.id, data)

132

			else:

135

			else:

Lines 143-160	Link Here

143

		name = request.options.get('name')

146

		name = request.options.get('name')

144

		testconnection = request.options.get('testconnection')

147

		testconnection = request.options.get('testconnection')

145

		parameter = request.options.get('parameter')

148

		parameter = request.options.get('parameter')

149

		dn = request.options.get('dn')

146

150

147

		# add cloud to uvmm

151

		# add cloud to uvmm

148

		args = parameter

152

		args = parameter

149

		args['name'] = name

153

		args['name'] = name

150

		args['type'] = cloudtype

154

		args['type'] = cloudtype

151

155

152

		self.uvmm.send(

156

		if dn:

153

				'L_CLOUD_ADD',

157

			self.uvmm.send(

154

				Callback(_finished, request),

158

					'L_CLOUD_EDIT',

155

				args=args,

159

					Callback(_finished, request),

156

				testconnection=testconnection

160

					args=args,

157

161

					dn=dn,

162

					testconnection=testconnection

163

164

		else:

165

			self.uvmm.send(

166

					'L_CLOUD_ADD',

167

					Callback(_finished, request),

168

					args=args,

169

					testconnection=testconnection

170

158

171

159

172

160

	def cloud_list_keypair(self, request):

173

	def cloud_list_keypair(self, request):

(-)src/univention/uvmm/cloudconnection.py (+1 lines)

Lines 79-84	Link Here

		self.publicdata.last_update_try = -1

		self.publicdata.last_update_try = -1

		self.publicdata.available = False

		self.publicdata.available = False

		self.publicdata.last_error_message = ""

		self.publicdata.last_error_message = ""

		self.publicdata.params = cloud.copy()

		self._last_expensive_update = -1000000

		self._last_expensive_update = -1000000

		self._instances = []

		self._instances = []




	def remove_connection(self, cloudname):
		"""Remove connection; cloudname = ldap name attribute"""
		try:
			connection = self.get(cloudname)
			del self[cloudname]
		except KeyError:
			raise CloudConnectionError("No Connection to %s present" % cloudname)
		logger.info("Removed connection to %s" % cloudname)
		return connection

	def list_conn_instances(self, conn_name, pattern="*"):
		"""

(-)src/univention/uvmm/commands.py (+26 lines)

Lines 36-41	Link Here

"""

"""

import copy

import copy

import ldap

import protocol

import protocol

import node

import node

import cloudnode

import cloudnode

Lines 70-75	Link Here

			raise CommandError('L_CLOUD_ADD', e)

			raise CommandError('L_CLOUD_ADD', e)

	@staticmethod

	@staticmethod

	def L_CLOUD_EDIT(server, request):

		""" Edit cloud via libcloud """

		if not isinstance(request.dn, basestring):

			raise CommandError('L_CLOUD_EDIT', _('dn != dict: %(dn)s'), dn=request.dn)

		if not isinstance(request.args, dict):

			raise CommandError('L_CLOUD_EDIT', _('args != dict: %(args)s'), args=request.args)

		if not isinstance(request.testconnection, bool):

			raise CommandError('L_CLOUD_EDIT', _('testconnection is not a bool %(testconnection)s'), testconnection=request.testconnection)

		logger.debug('L_CLOUD_EDIT %s %s, testconnection: %s' % (request.dn, request.args, request.testconnection))

		old_name = ldap.explode_dn(request.dn, 1)[0]

		old_args = None

		try:

			old_connection = cloudnode.cloudconnections.remove_connection(old_name)

			cloudnode.cloudconnections.add_connection(request.args, request.testconnection)

		except cloudnode.CloudConnectionError, e:

			if old_args is not None:

				cloudnode.cloudconnections[old_name] = old_connection

				#old_connection.connect(cloud, False)

			raise CommandError('L_CLOUD_EDIT', e)

	@staticmethod

	def L_CLOUD_REMOVE(server, request):

	def L_CLOUD_REMOVE(server, request):

		""" Remove cloud via libcloud """

100

		""" Remove cloud via libcloud """

		if not isinstance(request.name, basestring):

101

		if not isinstance(request.name, basestring):

(-)src/univention/uvmm/protocol.py (+8 lines)

Lines 278-283	Link Here

278

		self.args = None

278

		self.args = None

279

		self.testconnection = True

279

		self.testconnection = True

280

281

class Request_L_CLOUD_EDIT(Request):

282

	"""Add libcloud cloud connection"""

283

	def _default(self):

284

		self.command = 'L_CLOUD_EDIT'

285

		self.dn = None

286

		self.args = None

287

		self.testconnection = True

288

281

class Request_L_CLOUD_REMOVE(Request):

289

class Request_L_CLOUD_REMOVE(Request):

282

	"""Remove libcloud cloud connection"""

290

	"""Remove libcloud cloud connection"""

283

	def _default(self):

291

	def _default(self):




	except LDAPError, e:
		raise LdapConnectionError(_('Could not open LDAP-Admin connection'))

def ldap_cloud_connection_edit(cloudtype, dn, name, parameter):
	""" Modify an existing cloud connection."""
	try:
		lo, position = univention.admin.uldap.getMachineConnection()
		parameter_lst = []
		for k,v in parameter.items():
			if (k and v):
				parameter_lst.append('%s=%s' % (k,v))
		attrs = {
			'objectClass': ['univentionVirtualMachineCloudConnection', 'univentionVirtualMachineHostOC', 'univentionObject'],
			'univentionObjectType': 'uvmm/cloudconnection',
			'cn': name,
			'univentionVirtualMachineCloudConnectionParameter': parameter_lst
		}
		modlist = [(k,None,v) for k,v in attrs.items()]
		lo.modify(dn, modlist)

	except LDAPError:
		raise LdapConnectionError(_('Could not open LDAP-Admin connection'))

def ldap_cloud_connection_add(cloudtype, name, parameter):
	""" Add a new cloud connection."""
	try:

Return to bug 36272