perfsonar development work

Author: dfn.calim
Date: 2011-11-30 08:37:20 +0000 (Wed, 30 Nov 2011)
New Revision: 750

Added:
   branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/libnmwg-perl_0.03-4_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-ma-hades_0.53-4_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-mp-bwctl_0.53-4_all.deb
   
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd_0.53-4_all.deb
Modified:
   branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh
   branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm
   branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
   
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
   branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/Build.deb.PL
   branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
   branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
Log:
add debian pakages 0.53-4

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/libnmwg-perl_0.03-4_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/libnmwg-perl_0.03-4_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-ma-hades_0.53-4_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-ma-hades_0.53-4_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-mp-bwctl_0.53-4_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd-mp-bwctl_0.53-4_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd_0.53-4_all.deb
===================================================================
(Binary files differ)


Property changes on: 
branches/perfsonar-oppd-all-0.53/build/debian/0.53-4/perfsonar-oppd_0.53-4_all.deb
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh  
2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/create-personar-oppd-dpkg.sh  
2011-11-30 08:37:20 UTC (rev 750)
@@ -50,6 +50,7 @@
        cd $srcpath
        perl Build.PL
        rm $pkg_name-$version.tar.gz
+       ./Build clean
        ./Build dist
        cd ../debian
        mv $srcpath/$pkg_name-$version.tar.gz .

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog 
2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/libnmwg-perl-debian/changelog 
2011-11-30 08:37:20 UTC (rev 750)
@@ -1,4 +1,4 @@
-libnmwg-perl (0.03-1) unstable; urgency=low
+libnmwg-perl (0.03-4) unstable; urgency=low
 
   * .djust to the new framework
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/changelog 
      2011-11-30 08:37:20 UTC (rev 750)
@@ -1,4 +1,4 @@
-perfsonar-oppd (0.53-1) unstable; urgency=low
+perfsonar-oppd (0.53-4) unstable; urgency=low
   * Creating package from new OPPD architecture
   * 
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/control 
2011-11-30 08:37:20 UTC (rev 750)
@@ -8,7 +8,7 @@
 
 Package: perfsonar-oppd
 Architecture: all
-Pre-Depends: ${perl:Depends} 
+Pre-Depends: 
${perl:Depends},libipc-run-perl,libconfig-general-perl,libhttp-daemon-ssl-perl,libsocket6-perl,libnmwg-perl
 (>= 0.03)
 Conflicts: oppd,perfsonar-oppd (<= 0.52)
 Replaces: oppd,perfsonar-oppd (<= 0.52)
 Description: open PERL perfSONAR daemon

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst  
      2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postinst  
      2011-11-30 08:37:20 UTC (rev 750)
@@ -23,7 +23,10 @@
     chown root:root /etc/init.d/oppd
     chmod 755 /etc/init.d/oppd
     chown -R perfsonar:perfsonar /usr/lib/perfsonar/services/oppd
-    ln -s /usr/lib/perfsonar/services/oppd/bin/oppd.pl /usr/bin/
+    if [ ! -e /usr/bin/oppd.pl ];
+    then
+        ln -s /usr/lib/perfsonar/services/oppd/bin/oppd.pl /usr/bin/
+    fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm  
2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/postrm  
2011-11-30 08:37:20 UTC (rev 750)
@@ -21,6 +21,7 @@
 case "$1" in
     remove|disappear)
     rm /usr/bin/oppd.pl
+    rm /var/log/oppd.log
     /usr/sbin/userdel perfsonar
     #/usr/sbin/groupdel perfsonar
     ;;

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst 
2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-debian/preinst 
2011-11-30 08:37:20 UTC (rev 750)
@@ -24,7 +24,8 @@
        [ -z "$SERVER_USER" ] && SERVER_USER=perfsonar
        [ -z "$SERVER_NAME" ] && SERVER_NAME="Open Perl perfSONAR Daemon"
        [ -z "$SERVER_GROUP" ] && SERVER_GROUP=perfsonar
-     
+       [ -z "$SERVER_LOGFILE" ] && SERVER_LOGFILE=/var/log/oppd.log     
+
        # create group if not existing
        if ! getent group | grep -q "^$SERVER_GROUP:" ; then
           echo -n "Adding group $SERVER_GROUP.."
@@ -51,12 +52,19 @@
        #Check if directory exist
        if [ ! -d $SERVER_HOME ];
       then
-           echo -n "Creatin the oppd directory"
+           echo -n "Creating oppd directory"
           mkdir -p $SERVER_HOME   
            #chown -R $SERVER_USER:$SERVER_GROUP $SERVER_HOME
            #chmod u=rwx,g=rx,o=rx $SERVER_HOME
            echo "...done"
       fi
+      if [ ! -e $SERVER_LOGFILE ];
+      then
+           echo -n "Creating log file for oppd"
+           touch $SERVER_LOGFILE
+           chown $SERVER_GROUP:$SERVER_USER $SERVER_LOGFILE
+           echo "...done"
+    fi
       ;;
     configure)
     ;;

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
      2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-ma-hades-debian/changelog
      2011-11-30 08:37:20 UTC (rev 750)
@@ -1,4 +1,4 @@
-perfsonar-oppd-ma-hades (0.53-1) unstable; urgency=low
+perfsonar-oppd-ma-hades (0.53-4) unstable; urgency=low
 
   * Initial release
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
      2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-bwctl-debian/changelog
      2011-11-30 08:37:20 UTC (rev 750)
@@ -1,4 +1,4 @@
-perfsonar-oppd-mp-bwctl (0.53-1) unstable; urgency=low
+perfsonar-oppd-mp-bwctl (0.53-4) unstable; urgency=low
 
   * Initial release
 

Modified: 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
===================================================================
--- 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2011-11-25 10:30:38 UTC (rev 749)
+++ 
branches/perfsonar-oppd-all-0.53/build/debian/perfsonar-oppd-mp-owamp-debian/changelog
      2011-11-30 08:37:20 UTC (rev 750)
@@ -1,4 +1,4 @@
-perfsonar-oppd-mp-owamp (0.53-1) unstable; urgency=low
+perfsonar-oppd-mp-owamp (0.53-4) unstable; urgency=low
 
   * Initial release
 

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/Build.deb.PL
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/Build.deb.PL       
2011-11-25 10:30:38 UTC (rev 749)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/Build.deb.PL       
2011-11-30 08:37:20 UTC (rev 750)
@@ -33,12 +33,12 @@
     etc_files => { 
         #'etc/oppd-egee.conf' => 'etc/oppd.conf',
        'etc/oppd-mdm.conf' => 'etc/oppd.conf',
-        'etc/Auth_request.xml' => 'etc/oppd/Auth_request.xml',
-        'etc/Auth_response.xml' => 'etc/oppd/Auth_response.xml',
-        'etc/LS_deregister.xml' => 'etc/oppd/LS_deregister.xml',
-        'etc/LS_register.xml' => 'etc/oppd/LS_register.xml',
-        'etc/LS_keepalive.xml' => 'etc/oppd/LS_keepalive.xml',
-        'etc/LS_KeyRequest.xml' => 'etc/oppd/LS_KeyRequest.xml',
+        'etc/Auth_request.xml' => 'etc/oppd.d/Auth_request.xml',
+        'etc/Auth_response.xml' => 'etc/oppd.d/Auth_response.xml',
+        'etc/LS_deregister.xml' => 'etc/oppd.d/LS_deregister.xml',
+        'etc/LS_register.xml' => 'etc/oppd.d/LS_register.xml',
+        'etc/LS_keepalive.xml' => 'etc/oppd.d/LS_keepalive.xml',
+        'etc/LS_KeyRequest.xml' => 'etc/oppd.d/LS_KeyRequest.xml',
     },
     init_files => {
         'etc/oppd.init.debian' => 'init/init.d/oppd',
@@ -55,7 +55,7 @@
 if ($install_base){
   $builder->install_path('etc' => "$install_base/etc");
 }
-#$builder->install_path('etc' => 'etc');
+#$builder->install_path('etc' => '/etc');
 $builder->install_path('init' => "/etc");
   #TODO ugly!!! (but it seems to be the only way, which makes at least
   # a little bit of sense :(

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-11-25 
10:30:38 UTC (rev 749)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR/MANIFEST   2011-11-30 
08:37:20 UTC (rev 750)
@@ -11,8 +11,8 @@
 etc/LS_register.xml
 etc/oppd-mdm.conf
 etc/oppd.conf.example
-etc/oppd.sysconfig.redhat
-etc/oppd.init.redhat
+etc/oppd.default.debian
+etc/oppd.init.debian
 lib/perfSONAR.pm
 lib/perfSONAR/Auth.pm
 lib/perfSONAR/Client/LS.pm

Modified: branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml
===================================================================
--- branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-11-25 10:30:38 UTC (rev 749)
+++ branches/perfsonar-oppd-all-0.53/build/perfSONAR-MA-Hades/META.yml  
2011-11-30 08:37:20 UTC (rev 750)
@@ -7,16 +7,18 @@
 license: apache
 resources:
   license: http://apache.org/licenses/LICENSE-2.0
+build_requires:
+  Test::More: 0
 requires:
   perfSONAR: 0.53
-build_requires:
-  Test::More: 0
+configure_requires:
+  Module::Build: 0.340201
 provides:
   perfSONAR::MA::Hades:
     file: lib/perfSONAR/MA/Hades.pm
   perfSONAR::MA::Status:
     file: lib/perfSONAR/MA/Status.pm
-generated_by: Module::Build version 0.2808
+generated_by: Module::Build version 0.340201
 meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4

Modified: branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2011-11-25 10:30:38 UTC (rev 749)
+++ branches/perfsonar-oppd-all-0.53/lib/NMWG/schema/2.0/owamp.rnc      
2011-11-30 08:37:20 UTC (rev 750)
@@ -99,14 +99,14 @@
 
 OwampDatum =
        element owamp:datum {
-               attribute sequenceNumber { xsd:int } &
-               attribute packetTTL { xsd:int } &
-               attribute send_time { xsd:int } &
-               attribute sender_sync { xsd:int } &
-               attribute sender_error { xsd:float } &
-               attribute receive_time { xsd:int } &
-               attribute receiver_sync { xsd:int } &
-               attribute receiver_error { xsd:float } &
+               attribute seqNum { xsd:int } &
+               attribute ttl { xsd:int } &
+               attribute sendTime { xsd:int } &
+               attribute sendSynchronized { xsd:int } &
+               attribute sendTimeError { xsd:float } &
+               attribute receiveTime { xsd:int } &
+               attribute receiveSynchronized { xsd:int } &
+               attribute receiveTimeError { xsd:float } &
 
                attribute sender { xsd:string } &
                attribute receiver { xsd:string } &

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2011-11-25 
10:30:38 UTC (rev 749)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/OWAMP.pm  2011-11-30 
08:37:20 UTC (rev 750)
@@ -178,14 +178,14 @@
                  #SEQNO STIME SSYNC SERR RTIME RSYNC RERR TTL\n
                 /(\d+)\s*(\d+)\s*(\d+)\s(.+)\s(\d+)\s(\d+)\s(.+)\s(\d+)/){
                 my %data_hash;
-                $data_hash{"sequenceNumber"} = $1;
-                $data_hash{"send_time"} = $2;
-                $data_hash{"sender_sync"} = $3;
-                $data_hash{"sender_error"} = $4;
-                $data_hash{"receive_time"} = $5;
-                $data_hash{"receiver_sync"} = $6;
-                $data_hash{"receiver_error"} = $7;
-                $data_hash{"packetTTL"} = $8;
+                $data_hash{"seqNum="} = $1;
+                $data_hash{"sendTime"} = $2;
+                $data_hash{"sendSynchronized"} = $3;
+                $data_hash{"sendTimeError"} = $4;
+                $data_hash{"receiveTime"} = $5;
+                $data_hash{"receiveSynchronized"} = $6;
+                $data_hash{"receiveTimeError"} = $7;
+                $data_hash{"ttl"} = $8;
                 push @datalines, \%data_hash;
             } #End foreach
        }#End if