Project

General

Profile

Revision 2ef80588

ID2ef805887283d67552f52dda63709b6c85d88c78
Parent b204adb9
Child 0d761a49

Added by Romain Chollet about 7 years ago

[#1570] Ajout du TCP dans les tests personnalisés, ajouts de tests pour éviter des warnings PHP, prise en charge du futur champ vigilo_template

Change-Id: I8652384cd1116ce54cdc66e48977c5174b1188be
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/2311
Reviewed-by: Francois POIROTTE <>
Tested-by: Francois POIROTTE <>

View differences:

Vigilo/VigiloTestSoftware.php
30 30 
	}
31 31 
	else
32 32 
	{
33 
            if (!array_key_exists($softwareName, $this->softwareBase))
34 
            {
35 
                return;
36 
            }
33 37 
            $functionArray=$this->softwareBase[$softwareName];
34 
	}
38 
        }
35 39 
        $this->testTable[]=call_user_func_array(array($this,$functionArray[0]), $functionArray[1]);
36 40 
    }
37 41 

  		




  ......




  40
  44
  
    
        $software_name = str_replace('vigilo-test-', '', $softwareName);


  		




  41
  45
  
    
        $explode_software_name = explode('-', $software_name, 2);


  		




  42
  46
  
    
        $args=array();


  		




  43
  
  
    
        switch($explode_software_name[0])


  		




  
  47
  
    
        switch(strtolower($explode_software_name[0]))


  		




  44
  48
  
    
        {


  		




  45
  
  
    
            case "process": $args[]=new VigiloArg('processname', $explode_software_name[1]); break;


  		




  46
  
  
    
            case "service": $args[]=new VigiloArg('svcname', $explode_software_name[1]); break;


  		




  
  49
  
    
            case "process":


  		




  
  50
  
    
                $args[]=new VigiloArg('processname', $explode_software_name[1]);


  		




  
  51
  
    
                $explode_software_name[0] = "Process";


  		




  
  52
  
    
                break;


  		




  
  53
  
    
            case "service":


  		




  
  54
  
    
                $args[]=new VigiloArg('svcname', $explode_software_name[1]);


  		




  
  55
  
    
                $explode_software_name[0] = "Service";


  		




  
  56
  
    
                break;


  		




  
  57
  
    
            case "tcp":


  		




  
  58
  
    
                $args[]=new VigiloArg('port', $explode_software_name[1]);


  		




  
  59
  
    
                $explode_software_name[0] = "TCP";


  		




  
  60
  
    
                break;


  		




  47
  61
  
    
            default: return;


  		




  48
  62
  
    
        }


  		




  49
  63
  
    

  		




  50
  
  
    
        return new VigiloTest(ucfirst($explode_software_name[0]), $args);


  		




  
  64
  
    
        return new VigiloTest($explode_software_name[0], $args);


  		




  51
  65
  
    
    }


  		




  52
  66
  
    

  		




  53
  67
  
    
    protected function addNTPTest()


  		












Also available in:  Unified diff