Revision 5e1c599f

b/lib/network.py
135 135
      assert self.gateway6 in self.network6
136 136

  
137 137
  def Contains(self, address):
138
    addr = ipaddr.IPAddress(address)
139
    if addr.version == constants.IP4_VERSION and self.network:
140
      return addr in self.network
141
    elif addr.version == constants.IP6_VERSION and self.network6:
142
      return addr in self.network6
138
    if address:
139
      addr = ipaddr.IPAddress(address)
140
      if addr.version == constants.IP4_VERSION and self.network:
141
        return addr in self.network
142
      elif addr.version == constants.IP6_VERSION and self.network6:
143
        return addr in self.network6
144

  
145
    return False
143 146

  
144 147
  def IsReserved(self, address):
145
    raise NotImplementedError
148
    return False
146 149

  
147 150
  def Reserve(self, address, external):
148
    raise NotImplementedError
151
    pass
149 152

  
150 153
  def Release(self, address, external):
151
    raise NotImplementedError
154
    pass
152 155

  
153 156
  def GenerateFree(self):
154
    raise NotImplementedError
157
    raise errors.OpPrereqError("Cannot generate IP in a Generic Network",
158
                               errors.ECODE_INVAL)
155 159

  
156 160
  def GetStats(self):
157 161
    return {}

Also available in: Unified diff