← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/db/sqlalchemy/models.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/db/sqlalchemy/models.py
146
146
        schema.UniqueConstraint('uuid', name='uniq_nodes0uuid'),
147
147
        schema.UniqueConstraint('instance_uuid',
148
148
                                name='uniq_nodes0instance_uuid'),
 
149
        schema.UniqueConstraint('name', name='uniq_nodes0name'),
149
150
        table_args())
150
151
    id = Column(Integer, primary_key=True)
151
152
    uuid = Column(String(36))
153
154
    #             filter on it more efficiently, even though it is
154
155
    #             user-settable, and would otherwise be in node.properties.
155
156
    instance_uuid = Column(String(36), nullable=True)
 
157
    name = Column(String(63), nullable=True)
156
158
    chassis_id = Column(Integer, ForeignKey('chassis.id'), nullable=True)
157
159
    power_state = Column(String(15), nullable=True)
158
160
    target_power_state = Column(String(15), nullable=True)
165
167
    driver = Column(String(15))
166
168
    driver_info = Column(JSONEncodedDict)
167
169
    driver_internal_info = Column(JSONEncodedDict)
 
170
    clean_step = Column(JSONEncodedDict)
168
171
 
169
172
    # NOTE(deva): this is the host name of the conductor which has
170
173
    #             acquired a TaskManager lock on the node.
183
186
    maintenance = Column(Boolean, default=False)
184
187
    maintenance_reason = Column(Text, nullable=True)
185
188
    console_enabled = Column(Boolean, default=False)
 
189
    inspection_finished_at = Column(DateTime, nullable=True)
 
190
    inspection_started_at = Column(DateTime, nullable=True)
186
191
    extra = Column(JSONEncodedDict)
187
192
 
188
193