Tweaks to database setup
In the switch table, remove the switch passwords. They'll live in the
config file.
In the ports table, rename default_vlan_id to base_vlan_id.
Change-Id: I16100450e2965ad2fe7d0af628f6b9c443af0521
diff --git a/db/setup_db.py b/db/setup_db.py
index d4f05f1..82f5491 100644
--- a/db/setup_db.py
+++ b/db/setup_db.py
@@ -35,9 +35,13 @@
conn = connect(database="vland", user="vland", password="vland")
cur = conn.cursor()
-cur.execute("CREATE TABLE switch (switch_id SERIAL, name VARCHAR(64), admin_pw VARCHAR(64), cli_pw VARCHAR(64))")
-cur.execute("CREATE TABLE port (port_id SERIAL, name VARCHAR(64), switch_id INTEGER, is_locked BOOLEAN,"
- "is_trunk BOOLEAN, default_vlan_id INTEGER, current_vlan_id INTEGER)")
-cur.execute("CREATE TABLE vlan (vlan_id SERIAL, name VARCHAR(32), tag INTEGER, default_vlan BOOLEAN, creation_time DATE)")
+cur.execute("CREATE TABLE switch (switch_id SERIAL, name VARCHAR(64))")
+cur.execute("CREATE TABLE port (port_id SERIAL, name VARCHAR(64), "
+ "switch_id INTEGER, is_locked BOOLEAN,"
+ "is_trunk BOOLEAN, base_vlan_id INTEGER,"
+ "current_vlan_id INTEGER)")
+cur.execute("CREATE TABLE vlan (vlan_id SERIAL, name VARCHAR(32),"
+ "tag INTEGER, default_vlan BOOLEAN, creation_time DATE)")
-cur.execute("COMMIT;")
\ No newline at end of file
+cur.execute("COMMIT;")
+