← Back to branch summary

~ntt-pf-lab/nova/network-service

« back to all changes in this revision

Viewing changes to nova/network/flat_vlan/db/sqlalchemy/models.py

  • Committer: Hisaharu Ishii
  • Date: 2011-04-07 16:30:33 UTC
  • mfrom: (767.1.33 network-service)
  • Revision ID: ishii.hisaharu@lab.ntt.co.jp-20110407163033-5arsocq2a0hinp5u
Merged from lp:~midokura/nova/network-service

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/flat_vlan/db/sqlalchemy/models.py
223
223
            network_ref = self.network_get(id)
224
224
            network_ref.delete(session=self._session)
225
225
 
 
226
    def network_delete_safe(self, id):
 
227
        try:
 
228
            return self.network_delete(id)
 
229
        except IntegrityError:
 
230
            return None
226
231
 
227
232
class FixedIpDataAccess(DataAccess):
228
233
    """A Data Access Object to access fixed IPs.