From 20f735ac7884111b47bd8ba974ed3e8fd1242e89 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 1 Oct 2007 20:22:57 +0000
Subject: Get rid of resource class silliness in left-right protocol.

svn path=/docs/left-right-xml; revision=1067
---
 docs/left-right-xml  |  15 ++++++--------
 docs/sample-irdb.pdf | Bin 2340 -> 2143 bytes
 docs/sample-irdb.sql |  55 ++++++++++++---------------------------------------
 3 files changed, 19 insertions(+), 51 deletions(-)

(limited to 'docs')

diff --git a/docs/left-right-xml b/docs/left-right-xml
index 6496eda6..2c4c9738 100644
--- a/docs/left-right-xml
+++ b/docs/left-right-xml
@@ -705,15 +705,12 @@
     </msg>
     
     <msg version="1" xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/">
-        <list_resources type="reply" self_id="42" child_id="289" valid_until="2008-04-01T00:00:00Z">
-            <resource_class ipv4="10.0.0.44/32,10.3.0.44/32"
-                            ipv6="fe80:dead:beef::/48"
-                            as="666"/>
-            <resource_class subject_name="Wombats are us"
-                            ipv4="10.2.0.6/32"
-                            ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49"
-                            as="666"/>
-        </list_resources>
+        <list_resources type="reply" self_id="42" child_id="289"
+	                valid_until="2008-04-01T00:00:00Z"
+			subject_name="Wombats are us"
+			ipv4="10.0.0.44/32,10.3.0.44/32"
+			ipv6="fe80:deed:f00d::/48,fe80:dead:beef:2::-fe80:dead:beef:2::49"
+			as="666"/>
     </msg>
     
     <!-- === -->
diff --git a/docs/sample-irdb.pdf b/docs/sample-irdb.pdf
index 459729fb..883cb20a 100644
Binary files a/docs/sample-irdb.pdf and b/docs/sample-irdb.pdf differ
diff --git a/docs/sample-irdb.sql b/docs/sample-irdb.sql
index a039918a..abfba9e5 100644
--- a/docs/sample-irdb.sql
+++ b/docs/sample-irdb.sql
@@ -1,19 +1,24 @@
 -- $Id$
 
+DROP TABLE IF EXISTS registrant;
+
+CREATE TABLE registrant (
+       registrant_id        SERIAL NOT NULL,
+       IRBE_mapped_id       TEXT,
+       subject_name         TEXT,
+       valid_until          DATETIME NOT NULL,
+       PRIMARY KEY	    (registrant_id)
+);
+
 DROP TABLE IF EXISTS asn;
 
 CREATE TABLE asn (
        asn_id               SERIAL NOT NULL,
        start_as             BIGINT unsigned NOT NULL,
        end_as               BIGINT unsigned NOT NULL,
-       resource_class_id    BIGINT unsigned NOT NULL,
+       registrant_id        BIGINT unsigned NOT NULL,
        PRIMARY KEY	    (asn_id),
-       FOREIGN KEY	    (resource_class_id) REFERENCES resource_class ON DELETE SET NULL ON UPDATE SET NULL
-);
-
-CREATE UNIQUE INDEX XPKasn ON asn
-(
-       asn_id
+       FOREIGN KEY          (registrant_id) REFERENCES registrant ON DELETE SET NULL ON UPDATE SET NULL
 );
 
 DROP TABLE IF EXISTS net;
@@ -23,41 +28,7 @@ CREATE TABLE net (
        start_ip             VARCHAR(40) NOT NULL,
        end_ip               VARCHAR(40) NOT NULL,
        version              TINYINT unsigned NOT NULL,
-       resource_class_id    BIGINT unsigned NOT NULL,
-       PRIMARY KEY          (net_id),
-       FOREIGN KEY          (resource_class_id) REFERENCES resource_class ON DELETE SET NULL ON UPDATE SET NULL
-);
-
-CREATE UNIQUE INDEX XPKnet ON net
-(
-       net_id
-);
-
-DROP TABLE IF EXISTS registrant;
-
-CREATE TABLE registrant (
-       registrant_id        SERIAL NOT NULL,
-       IRBE_mapped_id       TEXT,
-       PRIMARY KEY	    (registrant_id)
-);
-
-CREATE UNIQUE INDEX XPKregistrant ON registrant
-(
-       registrant_id
-);
-
-DROP TABLE IF EXISTS resource_class;
-
-CREATE TABLE resource_class (
-       resource_class_id    SERIAL NOT NULL,
-       subject_name         TEXT,
-       valid_until          DATETIME NOT NULL,
        registrant_id        BIGINT unsigned NOT NULL,
-       PRIMARY KEY          (resource_class_id),
+       PRIMARY KEY          (net_id),
        FOREIGN KEY          (registrant_id) REFERENCES registrant ON DELETE SET NULL ON UPDATE SET NULL
 );
-
-CREATE UNIQUE INDEX XPKresource_class ON resource_class
-(
-       resource_class_id
-);
-- 
cgit v1.2.3