diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
| commit | b33e4af49fb53c7d901e575886feaf6b5c9e7e20 (patch) | |
| tree | 27e9a4150504ec4a4dfddb6e197a738f52c20aa7 /controller/schema.sql | |
| parent | 0c8051da153b445f756681f9fd7d46bc85d1517f (diff) | |
| parent | 5202fbdaf313096a7205e7bb9c14c11fc628b8f2 (diff) | |
| download | infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.tar.gz infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'controller/schema.sql')
| -rw-r--r-- | controller/schema.sql | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/controller/schema.sql b/controller/schema.sql index f6d6e7e7..dba93039 100644 --- a/controller/schema.sql +++ b/controller/schema.sql @@ -21,8 +21,7 @@ CREATE TABLE IpAssignmentPool ( networkId char(16) NOT NULL, ipNetwork blob(16) NOT NULL, ipNetmaskBits integer NOT NULL, - ipVersion integer NOT NULL DEFAULT(4), - active integer NOT NULL DEFAULT(1) + ipVersion integer NOT NULL DEFAULT(4) ); CREATE INDEX IpAssignmentPool_networkId ON IpAssignmentPool (networkId); @@ -71,9 +70,11 @@ CREATE TABLE Network ( CREATE TABLE Relay ( networkId char(16) NOT NULL, nodeId char(10) NOT NULL, - address varchar(64) NOT NULL + phyAddress varchar(64) NOT NULL ); +CREATE INDEX Relay_networkId ON Relay (networkId); + CREATE UNIQUE INDEX Relay_networkId_nodeId ON Relay (networkId, nodeId); CREATE TABLE Node ( @@ -86,6 +87,7 @@ CREATE TABLE Node ( CREATE TABLE Rule ( networkId char(16) NOT NULL, + ruleId integer NOT NULL, nodeId char(10), vlanId integer, vlanPcp integer, |