perfsonar development work

Author: psnc.pikusa
Date: 2012-08-17 11:21:32 +0100 (Fri, 17 Aug 2012)
New Revision: 5960

Modified:
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/rrdma_db.sql
   trunk/perfsonar-java-rrd-ma-SQL_backend/conf/test_rrdma_db.sql
Log:
schema name changed to not provide the conflict with schema from 
perfsonar-java-sql-ma, that may be present on the same machine

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/rrdma_db.sql
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/rrdma_db.sql   2012-08-17 
08:57:10 UTC (rev 5959)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/rrdma_db.sql   2012-08-17 
10:21:32 UTC (rev 5960)
@@ -2,18 +2,18 @@
 # mysql -u root -p < rrdma_db.sql
 
 CREATE DATABASE IF NOT EXISTS
-    perfsonar_ma;
+    perfsonar_rrdma;
 
-USE perfsonar_ma
+USE perfsonar_rrdma
 
 
 #CREATE USER IF NOT EXISTS
-#    perfsonar_ma;
+#    perfsonar_rrdma;
 
 
 GRANT
     SELECT, INSERT, UPDATE, DELETE ON
-    perfsonar_ma.* TO 'perfsonar_ma'@'localhost'
+    perfsonar_rrdma.* TO 'perfsonar_rrdma'@'localhost'
     IDENTIFIED BY 'testpass';
 
 

Modified: trunk/perfsonar-java-rrd-ma-SQL_backend/conf/test_rrdma_db.sql
===================================================================
--- trunk/perfsonar-java-rrd-ma-SQL_backend/conf/test_rrdma_db.sql      
2012-08-17 08:57:10 UTC (rev 5959)
+++ trunk/perfsonar-java-rrd-ma-SQL_backend/conf/test_rrdma_db.sql      
2012-08-17 10:21:32 UTC (rev 5960)
@@ -1,7 +1,7 @@
 # running:
 # mysql -u root -p < test_rrdma_db.sql
 
-USE perfsonar_ma 
+USE perfsonar_rrdma 
 
 
 INSERT
@@ -22,7 +22,7 @@
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1',  'test-hostName1', 
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'in',
+       VALUES (NULL, 'subj1',  'test-hostName2', 
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'in',
 '1000000000','first', 
'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inoctets', 'Bps', '300', 'ABSOLUTE','100', '0', '10000000');
@@ -30,7 +30,7 @@
 
 INSERT
        INTO interfaces
-       VALUES (NULL, 'subj1',  'test-hostName1', 
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'out',
+       VALUES (NULL, 'subj1',  'test-hostName2', 
'10.1.2.2','ipv4','TenGigabitEthernet1/1', 'test1', 'out',
 '1000000000','', 'http://ggf.org/ns/nmwg/characteristic/utilization/2.0',
        
'/usr/lib/perfsonar/services/perfsonar-java-rrd-ma/WEB-INF/samples/rrd/test.rrd',
 'inoctets', 'Bps', '300', 'ABSOLUTE','100', '0', '10000000');