← Back to branch summary

~morita-kazutaka/nova/snapshot-volume

« back to all changes in this revision

Viewing changes to nova/virt/xenapi/vmops.py

  • Committer: MORITA Kazutaka
  • Date: 2011-05-19 12:29:27 UTC
  • mfrom: (1003.1.84 nova)
  • Revision ID: morita.kazutaka@gmail.com-20110519122927-g3m6v3on04lniucl
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/xenapi/vmops.py
28
28
import tempfile
29
29
import uuid
30
30
 
 
31
from nova import context
31
32
from nova import db
32
 
from nova import context
 
33
from nova import exception
 
34
from nova import flags
 
35
from nova import ipv6
33
36
from nova import log as logging
34
 
from nova import exception
35
37
from nova import utils
36
 
from nova import flags
37
38
 
38
39
from nova.auth.manager import AuthManager
39
40
from nova.compute import power_state
808
809
 
809
810
            def ip6_dict():
810
811
                return {
811
 
                    "ip": utils.to_global_ipv6(network['cidr_v6'],
812
 
                                               instance['mac_address']),
 
812
                    "ip": ipv6.to_global(network['cidr_v6'],
 
813
                                         instance['mac_address'],
 
814
                                         instance['project_id']),
813
815
                    "netmask": network['netmask_v6'],
814
816
                    "enabled": "1"}
815
817