git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7c06401
)
fix import
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 13 Jun 2012 18:02:42 +0000
(14:02 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 13 Jun 2012 18:02:42 +0000
(14:02 -0400)
sfa/openstack/osaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/osaggregate.py
b/sfa/openstack/osaggregate.py
index
00ba6bc
..
19a91e8
100644
(file)
--- a/
sfa/openstack/osaggregate.py
+++ b/
sfa/openstack/osaggregate.py
@@
-17,8
+17,8
@@
from sfa.rspecs.elements.disk_image import DiskImage
from sfa.rspecs.elements.services import Services
from sfa.rspecs.elements.interface import Interface
from sfa.util.xrn import Xrn
from sfa.rspecs.elements.services import Services
from sfa.rspecs.elements.interface import Interface
from sfa.util.xrn import Xrn
-from sfa.
util
.plxrn import PlXrn
-from sfa.
util
.osxrn import OSXrn, hrn_to_os_slicename
+from sfa.
planetlab
.plxrn import PlXrn
+from sfa.
openstack
.osxrn import OSXrn, hrn_to_os_slicename
from sfa.rspecs.version_manager import VersionManager
from sfa.openstack.image import ImageManager
from sfa.openstack.security_group import SecurityGroup
from sfa.rspecs.version_manager import VersionManager
from sfa.openstack.image import ImageManager
from sfa.openstack.security_group import SecurityGroup