Attachment #6988 for bug #36289

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




		}
		on.once(dojo.body(), 'click', function(evt) {
			Tooltip.hide(node);
			//dojoEvent.stop(evt); // links in tooltip should be clickable
		});
	};


		},

		_setupJavaScriptLinks: function() {
			array.forEach(this._getTooltipLinkArray(), function(iitem) {
					['details', 'keyname'],
					['details', 'security_group_ids']
				], function(iitem) {
				var iwidget = this.getWidget(iitem[0], iitem[1]);
				iwidget.set('label', lang.replace(iwidget.label, this));
			}, this);
		},

		_getTooltipLinkArray: function() {
			if (this.cloud.type == 'OpenStack') {
				return [
					['details', 'keyname'],
					['details', 'security_group_ids']
				]
			} else if (this.cloud.type == 'EC2') {
				return [
					['details', 'keyname'],
					['details', 'security_group_ids'],
					['details', 'network_id']
				]
			}
		},

		showTooltip: function(evt, type) {
			var msg = '';
			if (type == 'keyname') {

			else if (type == 'security_group_ids') {
				msg = _('A security group acts as a virtual firewall that controls the traffic of the instance. To enable access, correct rules have to be configured (for example, a UCS instance needs at least TCP ports 22 (ssh) and 443 (https)). The security group configuration has to be done at the provider\'s administration interface.');
			}
			else if (type == 'network_id') {
				msg = _('Select a network in which the new virtual machine instance should be launched. The network configuration has to be done at the provider\'s administration interface. <a href="https://aws.amazon.com/documentation/vpc/" target="_blank">Use this link for more information about Amazon VPC</a> and <a href="https://console.aws.amazon.com/vpc/home?#s=vpcs" target="_blank">this link to configure VPC</a>.');
			}
			if (msg) {
				_showTooltip(evt.target, msg, evt);
			}

						'image_id',
						'size_id',
						'size_info_text',
						['network_id', 'subnet_id'],
						['keyname', 'security_group_ids']
					],
					widgets: [{

						required: true,
						size: 'Two'
					}, {
						name: 'network_id',
						type: ComboBox,
						label: _('Configure Network') +
						' (<a href="javascript:void(0);" onclick="require(\'dijit/registry\').byId(\'{id}\').showTooltip(event, \'network_id\');">' +
						_('more information') +
						'</a>)' +
						' [<a href="javascript:void(0);" onclick="require(\'dijit/registry\').byId(\'{id}\').getWidget(\'details\', \'network_id\').reloadDynamicValues();">' +
						_('Reload') +
						'</a>]',
						dynamicOptions: {conn_name: this.cloud.name},
						dynamicValues: types.getCloudListNetwork,
						staticValues: [ { id: 'default', label: _('Launch into default Network') } ],
						onChange: lang.hitch(this, function(newVal) {
							var widget = this.getWidget('details', 'subnet_id');
							widget.set('disabled', newVal == 'default');
						}),
					}, {
						name: 'subnet_id',
						type: ComboBox,
						label: _('Configure Subnet'),
						dynamicOptions: {conn_name: this.cloud.name},
						dynamicValues: types.getCloudListSubnet,
						depends: 'network_id'
					}, {
						name: 'security_group_ids',
						type: ComboBox,
						label: _('Configure Security Group') +

						'</a>)',
						dynamicOptions: {conn_name: this.cloud.name},
						dynamicValues: types.getCloudListSecgroup,
						depends: 'network_id',
						required: true
					}]
				};




				return data.result;
			});
		},
		getCloudListNetwork: function(options) {
			return tools.umcpCommand('uvmm/cloud/list/network', options).then(function(data) {
				return data.result;
			});
		},
		getCloudListSubnet: function(options) {
			return tools.umcpCommand('uvmm/cloud/list/subnet', options).then(function(data) {
				return data.result;
			});
		},
		getNodeType: function( uri ) {
			var colon = uri.indexOf( ':' );
			if ( colon == -1 ) {

(-)umc/js/uvmm/EC2.js (-1 / +2 lines)

Lines 71-77	Link Here

					name: 'region',

					name: 'region',

					type: ComboBox,

					type: ComboBox,

					staticValues: [

					staticValues: [

						{ id: 'EC2_EU_WEST', label: 'EU (Ireland)' },

						{ id: 'EC2_EU_WEST', label: 'EU West (Ireland)' },

						{ id: 'EC2_EU_CENTRAL', label: 'EU Central (Frankfurt)' },

						{ id: 'EC2_US_EAST', label: 'US East (N. Virginia)' },

						{ id: 'EC2_US_EAST', label: 'US East (N. Virginia)' },

						{ id: 'EC2_US_WEST', label: 'US West (N. California)' },

						{ id: 'EC2_US_WEST', label: 'US West (N. California)' },

						{ id: 'EC2_US_WEST_OREGON', label: 'US West (Oregon)' },

						{ id: 'EC2_US_WEST_OREGON', label: 'US West (Oregon)' },




msgstr ""
"Project-Id-Version: univention-virtual-machina-manager-daemon 1.0.103-1\n"
"Report-Msgid-Bugs-To: packages@univention.de\n"
"POT-Creation-Date: 2015-03-25 13:30+0100\n"
"PO-Revision-Date: 2013-07-24 19:03+0200\n"
"Last-Translator: Univention GmbH <packages@univention.de>\n"
"Language-Team: German <de@li.org>\n"

"docs.univention.de/handbuch-4.0.html#uvmm:chapter\" target=\"_blank\">im "
"Handbuch</a> zu finden."

#: umc/js/uvmm/InstanceWizard.js:103
msgid ""
"A key pair consists of a public and private key to log in using SSH. The "
"configuration of all keys takes place directly via the administration page "

"Der Name für die virtuelle Maschine wird benötigt und sollte nicht der "
"vorgeschlagenen Namenspräfix entsprechen"

#: umc/js/uvmm/InstanceWizard.js:106
msgid ""
"A security group acts as a virtual firewall that controls the traffic of the "
"instance. To enable access, correct rules have to be configured (for "

msgid "Authentication URL endpoint"
msgstr "URL des Authentifizierungs-Endpunktes"

#: umc/js/uvmm/DomainWizard.js:215 umc/js/uvmm/InstancePage.js:72
#: umc/js/uvmm/InstanceWizard.js:75 umc/js/uvmm/CreatePage.js:104
#: umc/js/uvmm/DomainPage.js:91 umc/js/uvmm/CloudConnectionWizard.js:62
msgid "Back to overview"
msgstr "Zurück zur Übersicht"


msgid "Caching"
msgstr "Caching"

#: umc/js/uvmm/DriveGrid.js:303 umc/js/uvmm/DriveGrid.js:332
#: umc/js/uvmm/SnapshotGrid.js:181 umc/js/uvmm/SnapshotGrid.js:207
#: umc/js/uvmm/SnapshotGrid.js:244 umc/js/uvmm/InterfaceGrid.js:134
#: umc/js/uvmm/DriveGrid.js:303 umc/js/uvmm/DriveGrid.js:332
#: umc/js/uvmm.js:476 umc/js/uvmm.js:595 umc/js/uvmm.js:656 umc/js/uvmm.js:935
#: umc/js/uvmm.js:1104
msgid "Cancel"

msgid "Change medium"
msgstr "Medium wechseln"

#: umc/js/uvmm/InstanceWizard.js:293
msgid "Choose an AMI"
msgstr "Wählen Sie ein AMI aus"

#: umc/js/uvmm/InstanceWizard.js:201
msgid "Choose an Image"
msgstr "Auswahl eines Images"

#: umc/js/uvmm/InstanceWizard.js:211 umc/js/uvmm/InstanceWizard.js:276
msgid "Choose an Instance Size"
msgstr "Wahl der Instanzgröße"


msgid "Cloud instance"
msgstr "Cloud-Instanz"

#: umc/js/uvmm/InstanceWizard.js:304
msgid "Configure Network"
msgstr "Netzwerk konfigurieren"

#: umc/js/uvmm/InstanceWizard.js:228 umc/js/uvmm/InstanceWizard.js:328
msgid "Configure Security Group"
msgstr "Konfigurieren einer Sicherheitsgruppe"

#: umc/js/uvmm/InstanceWizard.js:321
msgid "Configure Subnet"
msgstr "Subnetz konfigurieren"

#: umc/js/uvmm/DriveGrid.js:291
msgid "Configure cache behaviour of host."
msgstr "Cache-Verhalten des Hosts konfigurieren."

msgid "Create a new cloud connection service account."
msgstr "Erstellen einer neuen Cloud-Verbindung."

#: umc/js/uvmm/EC2.js:46 umc/js/uvmm/OpenStack.js:52
msgid "Create a new cloud connection."
msgstr "Erstellen einer neuen Cloud-Verbindung."


msgid "Create a new image"
msgstr "Erstellen einer neuen Image-Datei"

#: umc/js/uvmm/InstanceWizard.js:121 umc/js/uvmm/CreatePage.js:122
msgid "Create a new virtual machine instance."
msgstr "Erstellen einer neuen virtuellen Instanz."


msgid "Default (RealTek RTL-8139)"
msgstr "Voreinstellung (RealTek RTL-8139)"

#: umc/js/uvmm/DriveGrid.js:97 umc/js/uvmm/DriveGrid.js:328
#: umc/js/uvmm/SnapshotGrid.js:64 umc/js/uvmm/SnapshotGrid.js:240
#: umc/js/uvmm.js:283 umc/js/uvmm.js:587 umc/js/uvmm.js:648
#: umc/js/uvmm.js:1355
msgid "Delete"
msgstr "Löschen"


msgid "Delete an instance"
msgstr "Löschen einer Instanz"

#: umc/js/uvmm/DomainWizard.js:171 umc/js/uvmm/DomainPage.js:140
msgid "Description"
msgstr "Beschreibung"


msgid "Devices"
msgstr "Geräte"

#: umc/js/uvmm/DomainWizard.js:205 umc/js/uvmm/DomainPage.js:228
msgid "Direct access (VNC)"
msgstr "Direktzugriff (VNC)"


msgid "Drive type"
msgstr "Laufwerktyp"

#: umc/js/uvmm/InterfaceWizard.js:76 umc/js/uvmm/InterfaceGrid.js:75
msgid "Driver"
msgstr "Treiber"

#: umc/js/uvmm/DomainWizard.js:113 umc/js/uvmm/DomainPage.js:295
msgid "Drives"
msgstr "Laufwerke"


"Speicherbereich ausgewählt, wird die Liste der verfügbaren ISO-Images "
"aktualisiert."

#: umc/js/uvmm/DriveGrid.js:86 umc/js/uvmm/InterfaceGrid.js:91
#: umc/js/uvmm.js:271 umc/js/uvmm.js:1290 umc/js/uvmm.js:1377
msgid "Edit"
msgstr "Bearbeiten"

msgid "General"
msgstr "Allgemein"

#: umc/js/uvmm/InstancePage.js:64 umc/js/uvmm/DomainPage.js:110
msgid "General settings"
msgstr "Allgemeine Einstellungen"


msgid "Guest controlled"
msgstr "Gast-gesteuert"

#: umc/js/uvmm/InstanceWizard.js:158 umc/js/uvmm/types.js:54
#: umc/js/uvmm/types.js:204
msgid "Hard drive"
msgstr "Festplatte"


"gewechselt und zu dieser wieder zurückgesprungen werden. Das neue ISO-Image "
"sollte angezeigt werden."

#: umc/js/uvmm/DriveGrid.js:75 umc/js/uvmm/InstancePage.js:116
msgid "Image"
msgstr "Image"


msgid "Inherit MAC addresses"
msgstr "MAC-Adressen übernehmen"

#: umc/js/uvmm/InstanceWizard.js:185 umc/js/uvmm/InstanceWizard.js:260
msgid "Instance Name"
msgstr "Instanzname"


msgid "Latvian"
msgstr "Lettisch"

#: umc/js/uvmm/InstanceWizard.js:313
msgid "Launch into default Network"
msgstr "In Standard-Netzwerk starten"

#: umc/js/uvmm/types.js:157
msgid "Lithuanian"
msgstr "Litauisch"

msgid "Local time zone"
msgstr "Lokale Zeitzone"

#: umc/js/uvmm/InterfaceWizard.js:93 umc/js/uvmm/InterfaceGrid.js:81
msgid "MAC address"
msgstr "MAC-Adresse"


msgid "Machine"
msgstr "Maschine"

#: umc/js/uvmm/InstanceWizard.js:157 umc/js/uvmm/DomainPage.js:211
msgid "Memory"
msgstr "Speicher"


msgid "NAT"
msgstr "NAT"

#: umc/js/uvmm/DomainWizard.js:165 umc/js/uvmm/InstancePage.js:90
#: umc/js/uvmm/EC2.js:58 umc/js/uvmm/DomainPage.js:121
#: umc/js/uvmm/SnapshotGrid.js:56 umc/js/uvmm/OpenStack.js:74
#: umc/js/uvmm.js:1151 umc/js/uvmm.js:1169 umc/js/uvmm.js:1184
msgid "Name"
msgstr "Name"


msgid "Not removable"
msgstr "Nicht löschbar"

#: umc/js/uvmm/DomainWizard.js:199 umc/js/uvmm/InstanceWizard.js:155
#: umc/js/uvmm/DomainPage.js:187
msgid "Number of CPUs"
msgstr "Anzahl der CPUs"


msgid "Read/write caching, sync filtered out (unsafe)"
msgstr "Lese-/Schreib-Caching, herausgefiltertes sync (unsafe)"

#: umc/js/uvmm/InstanceWizard.js:309 umc/js/uvmm.js:290
msgid "Reload"
msgstr "Neu laden"


msgid "Russian"
msgstr "Russisch"

#: umc/js/uvmm/DriveGrid.js:296 umc/js/uvmm/DomainPage.js:96
msgid "Save"
msgstr "Speichern"


msgid "Security group"
msgstr "Sicherheitsgruppe"

#: umc/js/uvmm/InstanceWizard.js:191 umc/js/uvmm/InstanceWizard.js:266
msgid "Select a key pair"
msgstr "Auswahl eines Schlüsselpaares"

#: umc/js/uvmm/InstanceWizard.js:109
msgid ""
"Select a network in which the new virtual machine instance should be "
"launched. The network configuration has to be done at the provider's "
"administration interface. <a href=\"https://aws.amazon.com/documentation/vpc/"
"\" target=\"_blank\">Use this link for more information about Amazon VPC</a> "
"and <a href=\"https://console.aws.amazon.com/vpc/home?#s=vpcs\" target="
"\"_blank\">this link to configure VPC</a>."
msgstr ""
"Wählen Sie das Netzwerk aus, in welchem die neue virtuelle Instanz gestartet "
"werden soll. Die Netzwerkkonfiguration erfolgt direkt über die "
"Verwaltungsseite der Cloud. <a href=\"https://aws.amazon.com/de/"
"documentation/vpc/\" target=\"_blank\">Nutzen Sie diesen Link um weitere "
"Informationen über Amazon VPC zu erhalten</a> und <a href=\"https://console."
"aws.amazon.com/vpc/home?#s=vpcs\" target=\"_blank\">diesen Link um VPC zu "
"konfigurieren</a>."

#: umc/js/uvmm/CreatePage.js:116
msgid ""
"Select if you want to create a new machine using an established connection, "

"Select the cloud in which a new virtual machine instance is going to be "
"created. Alternatively, it is possible to register a new cloud connection."
msgstr ""
"Wählen Sie die Cloud aus, in der eine neue virtuelle Instanz erzeugt werden "
"soll. Alternativ ist es ebenfalls möglich, eine neue Cloud-Verbindung "
"einzutragen."


msgid "Service type"
msgstr "Servicetyp"

#: umc/js/uvmm/InstancePage.js:126 umc/js/uvmm/DomainPage.js:153
msgid "Settings"
msgstr "Einstellungen"


msgid "Snapshots settings"
msgstr "Einstellungen für Sicherungspunkte"

#: umc/js/uvmm/InterfaceWizard.js:83 umc/js/uvmm/InterfaceGrid.js:72
msgid "Source"
msgstr "Quelle"


msgid "The device cannot be modified by the guest."
msgstr "Das Gerät kann nicht vom Gast modifiziert werden."

#: umc/js/uvmm/InstancePage.js:152 umc/js/uvmm/DomainPage.js:382
#: umc/js/uvmm/DriveWizard.js:363
msgid "The entered data is not valid. Please correct your input."
msgstr ""

"Die Instanz {label} läuft noch nicht. Bitte warten und klicken Sie auf "
"\"Suchen\", um die Ansicht zu aktualisieren."

#: umc/js/uvmm/DomainWizard.js:194 umc/js/uvmm/DomainPage.js:210
msgid "The memory size is invalid (e.g. 3GB or 1024 MB), minimum 4 MB"
msgstr ""
"Die angegebenen Speicherkapazität is ungültig (bspw. 3GB oder 1024 MB), "

"univention.de/handbuch-4.0.html#uvmm:networkinterfaces\" target=\"_blank"
"\">im Handbuch</a> zu finden."

#: umc/js/uvmm/DriveGrid.js:69 umc/js/uvmm/InterfaceWizard.js:62
#: umc/js/uvmm/InterfaceGrid.js:59
msgid "Type"
msgstr "Typ"


msgid "automatic"
msgstr "Automatisch"

#: umc/js/uvmm/InstanceWizard.js:193 umc/js/uvmm/InstanceWizard.js:230
#: umc/js/uvmm/InstanceWizard.js:268 umc/js/uvmm/InstanceWizard.js:306
#: umc/js/uvmm/InstanceWizard.js:330
msgid "more information"
msgstr "mehr Informationen"


msgid "terminated"
msgstr "terminiert"

#: umc/js/uvmm/DriveGrid.js:71 umc/js/uvmm/InterfaceGrid.js:61
#: umc/js/uvmm/InterfaceGrid.js:77
msgid "unknown"
msgstr "Unbekannt"


#~ msgid "Boot device"
#~ msgstr "Bootmedium"

#~ msgid "Create new Network"
#~ msgstr "Erstellen einer neuen Image-Datei"

#~ msgid "Full virtualization (KVM)"
#~ msgstr "Voll-Virtualisierung (KVM)"


(-)umc/python/uvmm/de.po (-5 / +11 lines)

Lines 34-40	Link Here

msgstr ""

msgstr ""

"Project-Id-Version: univention-management-console-module-uvmm 2.0.40-1\n"

"Project-Id-Version: univention-management-console-module-uvmm 2.0.40-1\n"

"Report-Msgid-Bugs-To: packages@univention.de\n"

"Report-Msgid-Bugs-To: packages@univention.de\n"

"POT-Creation-Date: 2015-02-02 13:33+0100\n"

"POT-Creation-Date: 2015-03-25 09:15+0100\n"

"PO-Revision-Date: 2013-05-23 09:17+0100\n"

"PO-Revision-Date: 2013-05-23 09:17+0100\n"

"Last-Translator: Univention GmbH <packages@univention.de>\n"

"Last-Translator: Univention GmbH <packages@univention.de>\n"

"Language-Team: German <de@li.org>\n"

"Language-Team: German <de@li.org>\n"

Lines 93-99	Link Here

"Weitere Informationen können in den folgenden Protokolldateien gefunden "

"Weitere Informationen können in den folgenden Protokolldateien gefunden "

"werden:"

"werden:"

#: umc/python/uvmm/nodes.py:98 umc/python/uvmm/__init__.py:144

#: umc/python/uvmm/__init__.py:144 umc/python/uvmm/nodes.py:98

msgid "Physical servers"

msgid "Physical servers"

msgstr "Physikalische Server"

msgstr "Physikalische Server"

Lines 101-114	Link Here

101

msgid ""

101

msgid ""

102

"The connection to the univention-virtual-machine-manager-daemon service "

102

"The connection to the univention-virtual-machine-manager-daemon service "

103

"failed."

103

"failed."

104

msgstr "Die Verbindung zum univention-virtual-machine-manager-daemon-Dienst ist fehlgeschlagen."

104

msgstr ""

105

"Die Verbindung zum univention-virtual-machine-manager-daemon-Dienst ist "

106

"fehlgeschlagen."

105

107

106

#: umc/python/uvmm/uvmmd.py:66

108

#: umc/python/uvmm/uvmmd.py:66

107

#, python-format

109

#, python-format

108

msgid ""

110

msgid ""

109

"The connection to the univention-virtual-machine-manager-daemon service "

111

"The connection to the univention-virtual-machine-manager-daemon service "

110

"failed: %s"

112

"failed: %s"

111

msgstr "Die Verbindung zum univention-virtual-machine-manager-daemon-Dienst ist fehlgeschlagen: %s"

113

msgstr ""

114

"Die Verbindung zum univention-virtual-machine-manager-daemon-Dienst ist "

115

"fehlgeschlagen: %s"

112

116

113

#: umc/python/uvmm/uvmmd.py:85

117

#: umc/python/uvmm/uvmmd.py:85

114

msgid "The given UVMM command is not known"

118

msgid "The given UVMM command is not known"

Lines 118-124	Link Here

118

msgid ""

122

msgid ""

119

"This might be a temporary problem. Please wait some minutes for the "

123

"This might be a temporary problem. Please wait some minutes for the "

120

"connection to reestablish or restart the UVMM service."

124

"connection to reestablish or restart the UVMM service."

121

msgstr "Dies kann ein temporäres Problem sein. Bitte warten Sie einige Minuten damit die Verbindung wiederhergestellt wird oder starten Sie den UVMM-Dienst neu."

125

msgstr ""

126

"Dies kann ein temporäres Problem sein. Bitte warten Sie einige Minuten damit "

127

"die Verbindung wiederhergestellt wird oder starten Sie den UVMM-Dienst neu."

122

128

123

#: umc/python/uvmm/domains.py:420

129

#: umc/python/uvmm/domains.py:420

124

#, python-format

130

#, python-format




		"""
		self.required_options(request, 'conn_name')
		conn_name = request.options.get('conn_name')
		network_id = request.options.get('network_id')

		def _finished(thread, result, request):
			"""

				secgroup_list = [
						{'id': item.id, 'label': item.name}
						for conn_name, images in data.items()
						for item in images if network_id in ('default', item.network_id)
						]

				self.finished(request.id, secgroup_list)

				conn_name=conn_name
				)

	def cloud_list_network(self, request):
		"""
		Returns a list of networks for the given cloud conn_name.
		"""
		self.required_options(request, 'conn_name')
		conn_name = request.options.get('conn_name')

		def _finished(thread, result, request):
			"""
			Process asynchronous UVMM L_CLOUD_NETWORK_LIST answer.
			"""
			if self._check_thread_error(thread, result, request):
				return

			success, data = result
			if success:
				network_list = [
						{
							'id': item.id,
							'label': '%s %s' % (item.name, item.cidr or "")
						}
						for conn_name, images in data.items()
						for item in images
						]

				self.finished(request.id, network_list)
			else:
				self.finished(
						request.id,
						None,
						message=str(data),
						status=MODULE_ERR_COMMAND_FAILED
						)

		self.uvmm.send(
				'L_CLOUD_NETWORK_LIST',
				Callback(_finished, request),
				conn_name=conn_name
				)

	def cloud_list_subnet(self, request):
		"""
		Returns a list of subnet for the given cloud conn_name.
		"""
		self.required_options(request, 'conn_name')
		conn_name = request.options.get('conn_name')
		network_id = request.options.get('network_id')

		def _finished(thread, result, request):
			"""
			Process asynchronous UVMM L_CLOUD_SUBNET_LIST answer.
			"""
			if self._check_thread_error(thread, result, request):
				return

			success, data = result
			if success:
				subnet_list = [
						{
							'id': item.id,
							'label': '%s %s' % (item.name, item.cidr or "")
						}
						for conn_name, images in data.items()
						for item in images if network_id == item.network_id
						]

				self.finished(request.id, subnet_list)
			else:
				self.finished(
						request.id,
						None,
						message=str(data),
						status=MODULE_ERR_COMMAND_FAILED
						)

		self.uvmm.send(
				'L_CLOUD_SUBNET_LIST',
				Callback(_finished, request),
				conn_name=conn_name
				)

	@sanitize(domainPattern=SearchSanitizer(default='*'))
	def instance_query(self, request):
		"""

(-)umc/uvmm.xml (+2 lines)

Lines 46-51	Link Here

		<command name="uvmm/cloud/list/size" function="cloud_list_size"/>

		<command name="uvmm/cloud/list/size" function="cloud_list_size"/>

		<command name="uvmm/cloud/list/image" function="cloud_list_image"/>

		<command name="uvmm/cloud/list/image" function="cloud_list_image"/>

		<command name="uvmm/cloud/list/secgroup" function="cloud_list_secgroup"/>

		<command name="uvmm/cloud/list/secgroup" function="cloud_list_secgroup"/>

		<command name="uvmm/cloud/list/network" function="cloud_list_network"/>

		<command name="uvmm/cloud/list/subnet" function="cloud_list_subnet"/>

		<command name="uvmm/instance/query" function="instance_query"/>

		<command name="uvmm/instance/query" function="instance_query"/>

		<command name="uvmm/instance/state" function="instance_state"/>

		<command name="uvmm/instance/state" function="instance_state"/>

		<command name="uvmm/instance/remove" function="instance_remove"/>

		<command name="uvmm/instance/remove" function="instance_remove"/>

(-)src/univention/uvmm/cloudnode.py (+9 lines)

Lines 205-210	Link Here

205

206

		return networks

206

		return networks

207

208

	def list_conn_subnets(self, conn_name="*"):

209

		connection_list = self._get_connections(conn_name)

210

211

		subnets = {}

212

		for connection in connection_list:

213

			subnets[connection.publicdata.name] = connection.list_subnets()

214

215

		return subnets

216

208

	def instance_state(self, conn_name, instance_id, state):

217

	def instance_state(self, conn_name, instance_id, state):

209

		self._check_if_connection_exists(conn_name)

218

		self._check_if_connection_exists(conn_name)

210

		self[conn_name].instance_state(instance_id, state)

219

		self[conn_name].instance_state(instance_id, state)

(-)src/univention/uvmm/openstackcloud.py (+3 lines)

Lines 266-271	Link Here

266

267

		return networks

267

		return networks

268

269

	def list_subnets(self):

270

		return []

271

269

	def _boot_instance(self, instance):

272

	def _boot_instance(self, instance):

270

		self._exec_libcloud(lambda: self.driver.ex_hard_reboot_node(instance))

273

		self._exec_libcloud(lambda: self.driver.ex_hard_reboot_node(instance))

271

274




from node import PersistentCached
from helpers import N_ as _
from cloudconnection import CloudConnection, CloudConnectionError
from protocol import Cloud_Data_Instance, Cloud_Data_Location, Cloud_Data_Secgroup, Cloud_Data_Size, Cloud_Data_Network, Cloud_Data_Subnet
import univention.config_registry as ucr

configRegistry = ucr.ConfigRegistry()

		"location": "location",
		"keyname": "ex_keyname",
		"userdata": "ex_userdata",
		"security_group_ids": {'group_name': "ex_security_groups", 'group_id': 'ex_security_group_ids'},
		"metadata": "ex_metadata",
		"min_instance_count": "ex_mincount",
		"max_instance_count": "ex_maxcount",

		"blockdevicemappings": "ex_blockdevicemappings",
		"iamprofile": "ex_iamprofile",
		"ebs_optimized": "ex_ebs_optimized",
		"subnet_id": "ex_subnet"
	}





PROVIDER_MAPPING = {
		"EC2_US_EAST": "us-east-1",
		"EC2_EU_WEST": "eu-west-1",
		"EC2_US_WEST": "us-west-1",
		"EC2_US_WEST_OREGON": "us-west-2",
		"EC2_AP_SOUTHEAST": "ap-southeast-1",
		"EC2_AP_NORTHEAST": "ap-northeast-1",
		"EC2_SA_EAST": "sa-east-1",
		"EC2_AP_SOUTHEAST2": "ap-southeast-2",
		"EC2_EU_CENTRAL": "eu-central-1",
		}



		if 'secure' not in params:
			params['secure'] = True

		os = get_driver(Provider.EC2)
		params['region'] = PROVIDER_MAPPING[cloud["region"]]

		p = params.copy()
		p["secret"] = "******"

		self._keypairs = self._exec_libcloud(lambda: self.driver.list_key_pairs())
		self._security_groups = self._exec_libcloud(lambda: self.driver.ex_get_security_groups())  # ex_get_ for ec2!
		self._networks = self._exec_libcloud(lambda: self.driver.ex_list_networks())
		self._subnets = self._exec_libcloud(lambda: self.driver.ex_list_subnets())
		self._last_expensive_update = time.time()

	def list_instances(self, pattern="*"):

			s.out_rules = secgroup.egress_rules
			s.extra = secgroup.extra
			s.tenant_id = secgroup.extra["owner_id"]
			s.driver = self.driver.name  # missing in libcloud EC2SecurityGroup
			s.network_id = secgroup.extra["vpc_id"]

			secgroups.append(s)


			s = Cloud_Data_Network()
			s.id = network.id
			s.name = network.name
			s.driver = self.driver.name  # missing in libcloud EC2Network
			s.extra = network.extra
			s.cidr = network.cidr_block



		return networks

	def list_subnets(self):
		subnets = []
		for subnet in self._subnets:
			s = Cloud_Data_Subnet()
			s.id = subnet.id
			s.name = subnet.name
			s.driver = self.driver.name  # missing in libcloud EC2NetworkSubnet
			s.cidr = subnet.extra['cidr_block']
			s.network_id = subnet.extra["vpc_id"]
			s.extra = subnet.extra

			subnets.append(s)

		return subnets

	def to_cloud_data_image(self, image):
		cloud_data_image = super(EC2CloudConnection, self).to_cloud_data_image(image)
		cloud_data_image.name = "%s (%s)" % (image.name, image.id)

			if not secgroups:
				raise EC2CloudConnectionError("No security group with id %s found." % args["security_group_ids"])

			if "subnet_id" in args and args["subnet_id"] != '':  # vpc
				kwargs[EC2_CREATE_ATTRIBUTES["security_group_ids"]["group_id"]] = [s.id for s in secgroups]
			else:  # default
				kwargs[EC2_CREATE_ATTRIBUTES["security_group_ids"]["group_name"]] = [s.name for s in secgroups]

		if "min_instance_count" in args:
			if not (isinstance(args["min_instance_count"], int)):

				raise EC2CloudConnectionError("<ebs_optimized> attribute must be a bool")
			kwargs[EC2_CREATE_ATTRIBUTES["ebs_optimized"]] = args["ebs_optimized"]

		if "subnet_id" in args and args["subnet_id"] != '':
			if not (isinstance(args["subnet_id"], str) or isinstance(args["userdata"], unicode)):
				raise EC2CloudConnectionError("<subnet_id> attribute must be a string")
			subnet = [s for s in self._subnets if s.id == args["subnet_id"]]
			if not subnet:
				raise EC2CloudConnectionError("No subnet with id %s found." % args["subnet_id"])
			kwargs[EC2_CREATE_ATTRIBUTES["subnet_id"]] = subnet[0]

		# libcloud call
		try:




			raise CommandError('L_CLOUD_NETWORK_LIST', e)

	@staticmethod
	def L_CLOUD_SUBNET_LIST(server, request):
		"""List available cloud subnets of cloud connections"""
		logger.debug('L_CLOUD_SUBNET_LIST')
		if not isinstance(request.conn_name, basestring):
			raise CommandError('L_CLOUD_SUBNET_LIST', _('conn_name != string: %(conn_name)s'), conn_name=request.conn_name)
		try:
			res = protocol.Response_DUMP()
			res.data = cloudnode.cloudconnections.list_conn_subnets(request.conn_name)
			return res
		except cloudnode.CloudConnectionError, e:
			raise CommandError('L_CLOUD_SUBNET_LIST', e)

	@staticmethod
	def L_CLOUD_INSTANCE_STATE(server, request):
		"""Change instance state"""
		logger.debug('L_CLOUD_INSTANCE_STATE')

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

Lines 340-345	Link Here

340

		self.command = 'L_CLOUD_NETWORK_LIST'

340

		self.command = 'L_CLOUD_NETWORK_LIST'

341

		self.conn_name = None

341

		self.conn_name = None

342

343

class Request_L_CLOUD_SUBNET_LIST(Request):

344

	"""List available cloud subnets of cloud connections"""

345

	def _default(self):

346

		self.command = 'L_CLOUD_SUBNET_LIST'

347

		self.conn_name = None

348

343

class Request_L_CLOUD_INSTANCE_STATE(Request):

349

class Request_L_CLOUD_INSTANCE_STATE(Request):

344

	"""Change instance state"""

350

	"""Change instance state"""

345

	def _default(self):

351

	def _default(self):

Lines 542-547	Link Here

542

		self.in_rules = {}

548

		self.in_rules = {}

543

		self.out_rules = {}

549

		self.out_rules = {}

544

		self.extra = {}

550

		self.extra = {}

551

		self.network_id = None

545

552

546

553

547

class Cloud_Data_Secgroup_Rule(object):

554

class Cloud_Data_Secgroup_Rule(object):

Lines 569-574	Link Here

569

		self.extra = {}

576

		self.extra = {}

570

577

571

578

579

class Cloud_Data_Subnet(object):

580

	"""Container for libcloud subnet statistics"""

581

	def __init__(self):

582

		self.name = None

583

		self.id = None

584

		self.driver = None

585

		self.cidr = None

586

		self.network_id = None

587

		self.extra = {}

588

589

572

class Data_Snapshot(object):

590

class Data_Snapshot(object):

573

	"""Container for snapshot data."""

591

	"""Container for snapshot data."""

574

	def __init__(self):

592

	def __init__(self):

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

Lines 98-103	Link Here

		self._images = []

		self._images = []

		self._sizes = []

		self._sizes = []

100

		self._networks = []

100

		self._networks = []

101

		self._subnets = []

101

102

	def _create_connection(self, cloud, testconnection=True):

103

	def _create_connection(self, cloud, testconnection=True):

103

		pass

104

		pass

(-)src/univention-virtual-machine-manager (+9 lines)

Lines 719-724	Link Here

719

"""

719

"""

720

		return protocol.Request_L_CLOUD_NETWORK_LIST(conn_name=name)

720

		return protocol.Request_L_CLOUD_NETWORK_LIST(conn_name=name)

721

722

	def cloud_subnet_list(self, name="*"):

723

"""

724

		%prog cloud_subnet_list <name>

725

726

		List available cloud subnets

727

		name is the cloud connection name. If empty, list information from all connections

728

"""

729

		return protocol.Request_L_CLOUD_SUBNET_LIST(conn_name=name)

730

722

	def cloud_instance_state(self, name, instance_id, state):

731

	def cloud_instance_state(self, name, instance_id, state):

723

"""

732

"""

724

		%prog cloud_instance_state <name> <instance_id> <state>

733

		%prog cloud_instance_state <name> <instance_id> <state>

Return to bug 36289