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

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/python/setup/netconf/__init__.py (-4 / +4 lines)
 Lines 73-91   class ChangeSet(object): Link Here 
73 

          73
          

        

        

          74
          
	@property

          74
          
	@property

        

        

          75
          
	def old_ipv4s(self):

          75
          
	def old_ipv4s(self):

        

          
            

              76
              
		return set(iface.ipv4_address() for _name, iface in self.old_interfaces.ipv4_interfaces)


              76
              
		return [iface.ipv4_address() for _name, iface in self.old_interfaces.ipv4_interfaces]

            

        

          77
          

          77
          

        

        

          78
          
	@property

          78
          
	@property

        

        

          79
          
	def new_ipv4s(self):

          79
          
	def new_ipv4s(self):

        

          
            

              80
              
		return set(iface.ipv4_address() for _name, iface in self.new_interfaces.ipv4_interfaces)


              80
              
		return [iface.ipv4_address() for _name, iface in self.new_interfaces.ipv4_interfaces]

            

        

          81
          

          81
          

        

        

          82
          
	@property

          82
          
	@property

        

        

          83
          
	def old_ipv6s(self):

          83
          
	def old_ipv6s(self):

        

          
            

              84
              
		return set(iface.ipv6_address(name) for iface, name in self.old_interfaces.ipv6_interfaces)


              84
              
		return [iface.ipv6_address(name) for iface, name in self.old_interfaces.ipv6_interfaces]

            

        

          85
          

          85
          

        

        

          86
          
	@property

          86
          
	@property

        

        

          87
          
	def new_ipv6s(self):

          87
          
	def new_ipv6s(self):

        

          
            

              88
              
		return set(iface.ipv6_address(name) for iface, name in self.new_interfaces.ipv6_interfaces)


              88
              
		return [iface.ipv6_address(name) for iface, name in self.new_interfaces.ipv6_interfaces]

            

        

          89
          

          89
          

        

        

          90
          

          90
          

        

        

          91
          
class SkipPhase(Exception):

          91
          
class SkipPhase(Exception):

        



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




  

    

    

       Lines 48-54
      class AddressChange(Phase): 
    
  Link Here 
    

  

        

          48
          
		new_ipv4s = set((_.ip for _ in self.changeset.new_ipv4s))

          48
          
		new_ipv4s = set((_.ip for _ in self.changeset.new_ipv4s))

        

        

          49
          
		old_ipv6s = set((_.ip for _ in self.changeset.old_ipv6s))

          49
          
		old_ipv6s = set((_.ip for _ in self.changeset.old_ipv6s))

        

        

          50
          
		new_ipv6s = set((_.ip for _ in self.changeset.new_ipv6s))

          50
          
		new_ipv6s = set((_.ip for _ in self.changeset.new_ipv6s))

        

          
            

              51
              
		if (old_ipv4s == new_ipv4s and old_ipv6s == new_ipv6s):


              51
              
		if old_ipv4s == new_ipv4s and old_ipv6s == new_ipv6s:

            

        

          52
          
			raise SkipPhase("No address change")

          52
          
			raise SkipPhase("No address change")

        

        

          53
          

          53
          

        

        

          54
          

          54
          

        



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




  

    

    

       Lines 15-21
      class PhaseLdapDns(AddressMap, Ldap, Executable): 
    
  Link Here 
    

  

        

          15
          
		self._create_reverse_dns_ipv6()

          15
          
		self._create_reverse_dns_ipv6()

        

        

          16
          

          16
          

        

        

          17
          
	def _create_reverse_dns_ipv4(self):

          17
          
	def _create_reverse_dns_ipv4(self):

        

          
            

              18
              
		for ipv4 in self.changeset.new_ipv4s - self.changeset.old_ipv4s:


              18
              
		for ipv4 in set(self.changeset.new_ipv4s) - set(self.changeset.old_ipv4s):

            

        

          19
          
			self.call([

          19
          
			self.call([

        

        

          20
          
				self.executable,

          20
          
				self.executable,

        

        

          21
          
				"--binddn", self.binddn,

          21
          
				"--binddn", self.binddn,

        

  

    

    

       Lines 36-42
      class PhaseLdapDns(AddressMap, Ldap, Executable): 
    
  Link Here 
    

  

        

          36
          
			])

          36
          
			])

        

        

          37
          

          37
          

        

        

          38
          
	def _create_reverse_dns_ipv6(self):

          38
          
	def _create_reverse_dns_ipv6(self):

        

          
            

              39
              
		for ipv6 in self.changeset.new_ipv6s - self.changeset.old_ipv6s:


              39
              
		for ipv6 in set(self.changeset.new_ipv6s) - set(self.changeset.old_ipv6s):

            

        

          40
          
			self.call([

          40
          
			self.call([

        

        

          41
          
				self.executable,

          41
          
				self.executable,

        

        

          42
          
				"--binddn", self.binddn,

          42
          
				"--binddn", self.binddn,

        



(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/umc/python/setup/netconf/modules/LdapSelf.py
      (-2 / +3 lines)




  

    

    

       Lines 90-96
      class PhaseLdapSelf(AddressMap, LdapChange, Executable): 
    
  Link Here 
    

  

        

          90
          
			computer.modify()

          90
          
			computer.modify()

        

        

          91
          

          91
          

        

        

          92
          
	def _update_ips(self, computer):

          92
          
	def _update_ips(self, computer):

        

          
            

              93
              
		computer.info["ip"] = [str(addr.ip) for addr in self.changeset.new_ipv4s | self.changeset.new_ipv6s]


              93
              
		all_addr = [str(addr.ip) for addr in (self.changeset.new_ipv4s + self.changeset.new_ipv6s)]

            

            

              
              

              94
              
		computer.info["ip"] = list(set(all_addr))

            

        

          94
          

          95
          

        

        

          95
          
	def _update_reverse_zones(self, computer):

          96
          
	def _update_reverse_zones(self, computer):

        

        

          96
          
		reverse_module = modules.get("dns/reverse_zone")

          97
          
		reverse_module = modules.get("dns/reverse_zone")

        

  

    

    

       Lines 102-108
      class PhaseLdapSelf(AddressMap, LdapChange, Executable): 
    
  Link Here 
    

  

        

          102
          
		computer.info["dnsEntryZoneReverse"] = [

          103
          
		computer.info["dnsEntryZoneReverse"] = [

        

        

          103
          
			[zone.dn, str(addr.ip)]

          104
          
			[zone.dn, str(addr.ip)]

        

        

          104
          
			for zone in reverse_zones

          105
          
			for zone in reverse_zones

        

          
            

              105
              
			for addr in self.changeset.new_ipv4s | self.changeset.new_ipv6s


              106
              
			for addr in (self.changeset.new_ipv4s + self.changeset.new_ipv6s)

            

        

          106
          
			if addr.ip in convert_udm_subnet_to_network(zone.info["subnet"])

          107
          
			if addr.ip in convert_udm_subnet_to_network(zone.info["subnet"])

        

        

          107
          
		]

          108
          
		]

        

        

          108
          

          109
          

        






  

  Return to bug 33258