diff --git a/code/daisy/daisy/db/sqlalchemy/migrate_repo/versions/017_add_interface_speed.py b/code/daisy/daisy/db/sqlalchemy/migrate_repo/versions/017_add_interface_speed.py new file mode 100755 index 00000000..e3cac5f5 --- /dev/null +++ b/code/daisy/daisy/db/sqlalchemy/migrate_repo/versions/017_add_interface_speed.py @@ -0,0 +1,24 @@ +from sqlalchemy import Column +from sqlalchemy import MetaData +from sqlalchemy import Table +from sqlalchemy import String + + +meta = MetaData() +state = Column('state',String(64)) +max_speed = Column('max_speed',String(64)) +current_speed =Column('current_speed',String(64)) + + +def upgrade(migrate_engine): + # Upgrade operations go here. Don't create your own engine; bind + # migrate_engine to your metadata + meta.bind = migrate_engine + host_interfaces = Table('host_interfaces', meta, autoload=True) + host_interfaces.create_column(state) + host_interfaces.create_column(max_speed) + host_interfaces.create_column(current_speed) + +def downgrade(migrate_engine): + # Operations to reverse the above upgrade go here. + pass diff --git a/code/daisy/daisy/db/sqlalchemy/models.py b/code/daisy/daisy/db/sqlalchemy/models.py index 16fa8ba9..b3eb26b6 100755 --- a/code/daisy/daisy/db/sqlalchemy/models.py +++ b/code/daisy/daisy/db/sqlalchemy/models.py @@ -253,6 +253,9 @@ class HostInterface(BASE, DaisyBase): slave2 = Column(String(32)) mode = Column(String(36)) is_deployment = Column(Boolean(), default=False) + state = Column(String(64)) + max_speed = Column(String(64)) + current_speed =Column(String(64)) class Network(BASE, DaisyBase): diff --git a/contrib/ironic/ironic_discoverd/process.py b/contrib/ironic/ironic_discoverd/process.py index ece6f7cc..0d4a494d 100755 --- a/contrib/ironic/ironic_discoverd/process.py +++ b/contrib/ironic/ironic_discoverd/process.py @@ -100,7 +100,10 @@ def format_node_info_for_daisy_client(node_info, ipmi_addr, 'current_speed': value['current_speed'], 'netmask': value['netmask'], 'type': value['type'], - 'slaves': slaves + 'slaves': slaves, + 'state': value['state'], + 'current_speed': value['current_speed'], + 'max_speed': value['max_speed'] } interface_list.append(interface)