summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-08-17 15:40:17 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-08-17 15:40:17 -0400
commit8ba3ea03aa58d5b0791b9fd3654dd034cbd3a8bc (patch)
tree21126db272109c47cb8a7ab53d1d5722409486f6
parent7e3f360eb256ba82629a44de60d36be643d5105d (diff)
downloadnova-8ba3ea03aa58d5b0791b9fd3654dd034cbd3a8bc.tar.gz
nova-8ba3ea03aa58d5b0791b9fd3654dd034cbd3a8bc.tar.xz
nova-8ba3ea03aa58d5b0791b9fd3654dd034cbd3a8bc.zip
Added accessip to models
pep8
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/037_add_instances_accessip.py1
-rw-r--r--nova/db/sqlalchemy/models.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/037_add_instances_accessip.py b/nova/db/sqlalchemy/migrate_repo/versions/037_add_instances_accessip.py
index 82de2a874..39f0dd6ce 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/037_add_instances_accessip.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/037_add_instances_accessip.py
@@ -33,7 +33,6 @@ instances = Table('instances', meta,
)
-
def upgrade(migrate_engine):
# Upgrade operations go here. Don't create your own engine;
# bind migrate_engine to your metadata
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index f2a4680b0..1249a6269 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -232,6 +232,11 @@ class Instance(BASE, NovaBase):
root_device_name = Column(String(255))
+ # User editable field meant to represent what ip should be used
+ # to connect to the instance
+ access_ip_v4 = Column(String(255))
+ access_ip_v6 = Column(String(255))
+
# TODO(vish): see Ewan's email about state improvements, probably
# should be in a driver base class or some such
# vmstate_state = running, halted, suspended, paused