Adding sfi tests in TestSuite.

Modified "true" value for exclusive item in slabaggregate to fit SFA new
Rspec.

diff --git a/sfa/senslab/config/jenkins-config.txt b/sfa/senslab/config/jenkins-config.txt
new file mode 100644 (file)
index 0000000..693bb8c
--- /dev/null
+++ b/sfa/senslab/config/jenkins-config.txt
@@ -0,0 +1,15 @@
+make clean
+make
+sudo python setup.py install
+git_local_repo="/root/.jenkins/jobs/SFA/workspace"
+vm="senslab2"
+sudo cp $git_local_repo/sfa/senslab/config/$vm/sfa_config.xml /etc/sfa/sfa_config.xml
+sudo cp $git_local_repo/sfa/senslab/config/$vm/default_config.xml /etc/sfa/default_config.xml
+
+sudo cp $git_local_repo/sfa/senslab/config/ldap_config.py  /etc/sfa/ldap_config.py 
+sudo service sfa restart
+#nosetests --with-xcoverage --with-xunit --cover-package=senslab --cover-erase --verbose
+#FAIL nosetests --with-xcoverage --with-xunit  --all-modules --traverse-namespace --cover-package=senslab --cover-erase --cover-inclusive --verbose 
+nosetests --with-xcoverage --with-xunit --traverse-namespace  --cover-package=senslab --cover-erase --verbose 
+
+pylint -f parseable /root/.jenkins/jobs/SFA/workspace/sfa/senslab/ | tee pylint.out

diff --git a/sfa/senslab/slabaggregate.py b/sfa/senslab/slabaggregate.py
index 41660f3..52c76bc 100644 (file)
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@ -208,7 +208,7 @@ class SlabAggregate:
                 rspec_node['boot_state'] = node['boot_state']
                 if node['hostname'] in reserved_nodes:
                     rspec_node['boot_state'] = "Reserved"
-                rspec_node['exclusive'] = 'True'
+                rspec_node['exclusive'] = 'true'
                 rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
     
                 # only doing this because protogeni rspec needs

diff --git a/sfa/senslab/tests/TestSuite.py b/sfa/senslab/tests/TestSuite.py
index 044accc..b91e234 100644 (file)
--- a/sfa/senslab/tests/TestSuite.py
+++ b/sfa/senslab/tests/TestSuite.py
@@ -251,7 +251,44 @@ def TestSlabDriver(job_id = '1'):
     persons = slabdriver.GetPersons()
     print "\r\n \r\n  GetPersons" ,persons
     #slabdriver.DeleteJobs(job_id,'senslab2.avakian_slice')
+  
+  
+def  TestSfi(arg = None):
+    import os
+    
+    listing = os.system("sfi.py list senslab2")
    
+    resources = os.system("sfi.py resources")
+
+    slab = os.system("sfi.py resources -r slab")
+
+    resourcesall = os.system("sfi.py resources -l all")
+
+    slaball = os.system("sfi.py resources -r slab -l all")
+    filename = "home/savakian/flab-sfa/avakian_adv.rspec"
+    rspecfile = open(filename,"w")
+    r = os.popen("sfi.py resources -l all") 
+    for i in r.readlines():
+        rspecfile.write(i)
+    rspecfile.close()
+    
+
+    slices_rec = os.system("sfi.py resources senslab2.avakian_slice")
+    show_slice = os.system("sfi.py show senslab2.avakian_slice")
+
+    show = os.system("sfi.py show senslab2.avakian")
+
+
+    show_node  = os.system("sfi.py show senslab2.node7.devlille.senslab.info")
+
+
+    slices = os.system("sfi.py slices")
+
+    status_slice = os.system("sfi.py status senslab2.avakian_slice")
+
+    create = os.system("sfi.py create senslab2.avakian_slice /home/savakian/flab-sfa/avakian_adv.rspec")
+      
+      
 def RunAll():
     TestLdap()
     TestOAR()
@@ -261,6 +298,7 @@ supported_options = {
         'OAR' : TestOAR,
         'LDAP': TestLdap,
         'driver': TestSlabDriver,
+        'sfi':TestSfi,
         'all' : RunAll }
         
 def main():