--- trunk/network_topology/data.sql	2005/02/15 18:56:19	6
+++ trunk/network_topology/data.sql	2005/02/16 12:21:09	7
@@ -10,119 +10,145 @@
 SET search_path = public, pg_catalog;
 
 --
--- Data for TOC entry 6 (OID 5757707)
+-- Data for TOC entry 9 (OID 5762127)
 -- Name: meta_tables; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
 
 
 --
--- Data for TOC entry 7 (OID 5757714)
+-- Data for TOC entry 10 (OID 5762134)
 -- Name: meta_fields; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('trust', 'comment', 'widget', 'area');
-INSERT INTO meta_fields (meta_fields_table, meta_fields_field, meta_fields_attribute, meta_fields_value) VALUES ('vpn', 'comment', 'widget', 'area');
 
 
 --
--- Data for TOC entry 8 (OID 5757721)
+-- Data for TOC entry 11 (OID 5762141)
 -- Name: link; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
 INSERT INTO link (link_id, link_name) VALUES (1, 'own wireless');
 INSERT INTO link (link_id, link_name) VALUES (2, 'Telia');
+INSERT INTO link (link_id, link_name) VALUES (3, 'HT');
+INSERT INTO link (link_id, link_name) VALUES (4, 'Iskon');
 
 
 --
--- Data for TOC entry 9 (OID 5757735)
+-- Data for TOC entry 12 (OID 5762155)
+-- Name: country; Type: TABLE DATA; Schema: public; Owner: flow
+--
+
+INSERT INTO country (country_id, country_name) VALUES (1, 'Croatia');
+INSERT INTO country (country_id, country_name) VALUES (2, 'Poland');
+INSERT INTO country (country_id, country_name) VALUES (3, 'Czeck');
+INSERT INTO country (country_id, country_name) VALUES (4, 'Slovenia');
+
+
+--
+-- Data for TOC entry 13 (OID 5762168)
 -- Name: location; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
-INSERT INTO "location" (location_id, location_name) VALUES (1, 'Zagreb - PBF');
-INSERT INTO "location" (location_id, location_name) VALUES (2, 'Zagreb - Vukovarska');
-INSERT INTO "location" (location_id, location_name) VALUES (3, 'Krakow');
+INSERT INTO "location" (location_id, location_name, location_country_id, location_comment) VALUES (2, 'Zagreb - Vukovarska', 1, NULL);
+INSERT INTO "location" (location_id, location_name, location_country_id, location_comment) VALUES (1, 'Zagreb - PBF', 1, NULL);
+INSERT INTO "location" (location_id, location_name, location_country_id, location_comment) VALUES (4, 'Brno', 3, NULL);
+INSERT INTO "location" (location_id, location_name, location_country_id, location_comment) VALUES (3, 'Krakow', 2, NULL);
+INSERT INTO "location" (location_id, location_name, location_country_id, location_comment) VALUES (5, 'Ljubljana', 4, NULL);
 
 
 --
--- Data for TOC entry 10 (OID 5757749)
+-- Data for TOC entry 14 (OID 5762190)
 -- Name: vpn; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
 INSERT INTO vpn (vpn_id, vpn_from_location_id, vpn_to_location_id, vpn_link, vpn_local_gw, vpn_remote_gw, vpn_comment) VALUES (2, 1, 2, 1, '10.100.0.30', '10.111.0.2', NULL);
 INSERT INTO vpn (vpn_id, vpn_from_location_id, vpn_to_location_id, vpn_link, vpn_local_gw, vpn_remote_gw, vpn_comment) VALUES (5, 1, 3, 2, '192.168.27.3', '213.202.73.2', NULL);
+INSERT INTO vpn (vpn_id, vpn_from_location_id, vpn_to_location_id, vpn_link, vpn_local_gw, vpn_remote_gw, vpn_comment) VALUES (6, 1, 5, 4, '195.29.208.1', '193.189.171.177', NULL);
+INSERT INTO vpn (vpn_id, vpn_from_location_id, vpn_to_location_id, vpn_link, vpn_local_gw, vpn_remote_gw, vpn_comment) VALUES (7, 1, 3, 4, '192.168.27.3', '213.202.73.2', NULL);
 
 
 --
--- Data for TOC entry 11 (OID 5757776)
+-- Data for TOC entry 15 (OID 5762217)
 -- Name: trust; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
 INSERT INTO trust (trust_id, trust_from_location_id, trust_to_location_id, trust_mutual, trust_comment) VALUES (1, 1, 3, false, 'pliva.com');
+INSERT INTO trust (trust_id, trust_from_location_id, trust_to_location_id, trust_mutual, trust_comment) VALUES (2, 1, 2, true, NULL);
 
 
 --
--- Data for TOC entry 12 (OID 5757798)
+-- Data for TOC entry 16 (OID 5762241)
+-- Name: dns_type; Type: TABLE DATA; Schema: public; Owner: flow
+--
+
+INSERT INTO dns_type (dns_type_id, dns_type_name) VALUES (1, 'primary');
+INSERT INTO dns_type (dns_type_id, dns_type_name) VALUES (2, 'secondary');
+INSERT INTO dns_type (dns_type_id, dns_type_name) VALUES (3, 'forwarder');
+
+
+--
+-- Data for TOC entry 17 (OID 5762257)
 -- Name: dns; Type: TABLE DATA; Schema: public; Owner: flow
 --
 
-INSERT INTO dns (dns_on_location_id, dns_type, dns_domain) VALUES (1, 'p', 'pliva.hr');
+INSERT INTO dns (dns_id, dns_on_location_id, dns_type, dns_domain) VALUES (1, 1, 1, 'pliva.hr');
+INSERT INTO dns (dns_id, dns_on_location_id, dns_type, dns_domain) VALUES (2, 1, 2, 'pliva.pl');
 
 
 --
--- TOC entry 2 (OID 5757719)
+-- TOC entry 2 (OID 5762139)
 -- Name: link_link_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
 --
 
-SELECT pg_catalog.setval('link_link_id_seq', 2, true);
+SELECT pg_catalog.setval('link_link_id_seq', 4, true);
 
 
 --
--- TOC entry 3 (OID 5757733)
+-- TOC entry 3 (OID 5762153)
+-- Name: country_country_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
+--
+
+SELECT pg_catalog.setval('country_country_id_seq', 4, true);
+
+
+--
+-- TOC entry 4 (OID 5762166)
 -- Name: location_location_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
 --
 
-SELECT pg_catalog.setval('location_location_id_seq', 3, true);
+SELECT pg_catalog.setval('location_location_id_seq', 5, true);
 
 
 --
--- TOC entry 4 (OID 5757747)
+-- TOC entry 5 (OID 5762188)
 -- Name: vpn_vpn_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
 --
 
-SELECT pg_catalog.setval('vpn_vpn_id_seq', 5, true);
+SELECT pg_catalog.setval('vpn_vpn_id_seq', 7, true);
 
 
 --
--- TOC entry 5 (OID 5757774)
+-- TOC entry 6 (OID 5762215)
 -- Name: trust_trust_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
 --
 
-SELECT pg_catalog.setval('trust_trust_id_seq', 1, true);
+SELECT pg_catalog.setval('trust_trust_id_seq', 2, true);
+
+
+--
+-- TOC entry 7 (OID 5762239)
+-- Name: dns_type_dns_type_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
+--
+
+SELECT pg_catalog.setval('dns_type_dns_type_id_seq', 1, false);
+
+
+--
+-- TOC entry 8 (OID 5762255)
+-- Name: dns_dns_id_seq; Type: SEQUENCE SET; Schema: public; Owner: flow
+--
+
+SELECT pg_catalog.setval('dns_dns_id_seq', 2, true);