Attachment #5509 for bug #30816





PATH_SYS_CLASS_NET = '/sys/class/net'

RE_IPV4 = re.compile(r'^interfaces/(([^/]+?)(_[0-9])?)/(address|netmask)$')
RE_IPV6_DEFAULT = re.compile(r'^interfaces/([^/]+)/ipv6/default/(prefix|address)$')
RE_SPACE = re.compile(r'\s+')
RE_SSL = re.compile(r'^ssl/.*')

		'''Reconfigures the system according to the values specified in the dict given as
		option named "values".'''

		# get new values
		orgValues = util.load_values()
		values = request.options.get('values', {})

		def _thread(request, obj):

				self._progressParser.reset()

				# write the profile file and run setup scripts
				util.pre_save(values)
				util.pre_save(values, orgValues)

				MODULE.info('saving profile values')
				util.write_profile(values)

				self._progressParser.reset()

				# write the profile file and run setup scripts
				util.pre_save(values)

				# on unjoined DC master the nameserver must be set to the external nameserver
				if newrole == 'domaincontroller_master' and not orgValues.get('joined'):





_ = Translation('univention-management-console-module-setup').translate

RE_INTERFACE = re.compile(r'^interfaces/(?!(?:primary|restart/auto|handler)$)([^/]+?)(_[0-9]+)?/')
RE_IPV6_ID = re.compile(r'^[a-zA-Z0-9]+\Z')
VALID_NAME_RE = re.compile(r'^(?![.]{1,2})[^/ \t\n\r\f]{1,15}\Z')

PHYSICAL_INTERFACES = [dev['name'] for dev in detect_interfaces()]


class Interfaces(dict):
	"""All network interfaces"""

	@property
	def primary(self):
		"""Returns the primary network interface if exists else None"""
		for device in self.values():
			if device.primary:
				return device

	@primary.setter
	def primary(self, primary=None):
		"""Removes the primary flag from all devices and sets it to the new device if exists"""
		for device in self.values():
			device.primary = False
		if primary in self:
			self[primary].primary = True

	def __init__(self, *args, **kwargs):
		"""Loads all network devices from UCR variables"""
		super(Interfaces, self).__init__(*args, **kwargs)

		ucr.load()

		# get all available interfaces
		interfaces = set(_.group(1) for _ in (RE_INTERFACE.match(key) for key in ucr) if _)
		for name in interfaces:
			device = Device(name, self)
			device.parse_ucr()

		ucr.load()

		# remove old devices
		to_remove = set(self.keys()) - set(interfaces.keys())
		for name in to_remove:
			device = _RemovedDevice(name, self)
			self[device.name] = device

		"""Returns a UCR representation of all interfaces"""
		ucr.load()

		ucrv = {}  # 'interfaces/primary' is handled in util.py
		for device in self.values():
			ucrv.update(device.to_ucr())


		self.ip4dynamic = False
		self.ip6dynamic = False

		# flag indicating that this interface is the primary network interface of the system
		self.primary = False

		# flag indicating that this interface should automatically start at system startup
		self.start = None


		pattern = re.compile(r'^interfaces/%s(?:_[0-9]+)?/' % re.escape(name))
		vals = dict((key, ucr[key]) for key in ucr if pattern.match(key))

		self.primary = ucr.get('interfaces/primary') == name

		self.start = ucr.is_true(value=vals.pop('interfaces/%s/start' % (name), None))

		self.type = vals.pop('interfaces/%s/type' % (name), None)

		for key, val in self._leftover:
			vals[key] = val

		if self.primary:
			vals['interfaces/primary'] = name

		if self.start is not None:
			vals['interfaces/%s/start' % (name)] = str(bool(self.start)).lower()


class _RemovedDevice(Device):
	"""Internal class representing that a device have to be removed from UCR"""
	def to_ucr(self):
		to_remove = {}
		for key in ucr.iterkeys():
			match = RE_INTERFACE.match(key)
			if match and self.name == match.group(1):
				to_remove[key] = None
		return to_remove

	def validate(self):
		return True

				try:
					self.bridge_fd = int(value)
				except ValueError:
					# invalid value
					pass
			else:
				options.append(option)

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/python/setup/util.py (-2 / +1 lines)

Lines 147-153 def _xkeymap(keymap):	Link Here

147

	return xkeymap

147

	return xkeymap

148

149

150

def pre_save(newValues, oldValues):

150

def pre_save(newValues):

151

	'''Modify the final dict before saving it to the profile file.'''

151

	'''Modify the final dict before saving it to the profile file.'''

152

153

	# use new system role (or as fallback the current system role)

153

	# use new system role (or as fallback the current system role)

154

Return to bug 30816