refactor: Move some DNOS detection to PowerConnect #6150 (#6206)

includes/definitions/dnos.yaml

@@ -12,20 +12,3 @@ over:
 discovery:
     - sysObjectId:
         - .1.3.6.1.4.1.6027.1.
-        - .1.3.6.1.4.1.674.10895.3042
-        - .1.3.6.1.4.1.674.10895.3044
-        - .1.3.6.1.4.1.674.10895.3045
-        - .1.3.6.1.4.1.674.10895.3046
-        - .1.3.6.1.4.1.674.10895.3053
-        - .1.3.6.1.4.1.674.10895.3054
-        - .1.3.6.1.4.1.674.10895.3055
-        - .1.3.6.1.4.1.674.10895.3056
-        - .1.3.6.1.4.1.674.10895.3057
-        - .1.3.6.1.4.1.674.10895.3058
-        - .1.3.6.1.4.1.674.10895.3059
-        - .1.3.6.1.4.1.674.10895.3060
-        - .1.3.6.1.4.1.674.10895.3061
-        - .1.3.6.1.4.1.674.10895.3062
-        - .1.3.6.1.4.1.674.10895.3063
-        - .1.3.6.1.4.1.674.10895.3066
-        - .1.3.6.1.4.1.674.10895.3073

includes/definitions/powerconnect.yaml

@@ -10,6 +10,5 @@ over:
 mib_dir:
     - dell
 discovery:
-    - sysObjectId_regex:
-        - '/^.1.3.6.1.4.1.674.10895.30[0-3][0-9]/'
-        - '/^.1.3.6.1.4.1.674.10895.3041/'
+    - sysObjectId:
+        - .1.3.6.1.4.1.674.10895

tests/OSDiscoveryTest.php

@@ -576,19 +576,6 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     public function testDnos()
     {
         $this->checkOS('dnos');
-        $this->checkOS('dnos', 'dnos1');
-        $this->checkOS('dnos', 'dnos2');
-        $this->checkOS('dnos', 'dnos3');
-        $this->checkOS('dnos', 'dnos4');
-        $this->checkOS('dnos', 'dnos5');
-        $this->checkOS('dnos', 'dnos6');
-        $this->checkOS('dnos', 'dnos7');
-        $this->checkOS('dnos', 'dnos8');
-        $this->checkOS('dnos', 'dnos9');
-        $this->checkOS('dnos', 'dnos10');
-        $this->checkOS('dnos', 'dnos11');
-        $this->checkOS('dnos', 'dnos12');
-        $this->checkOS('dnos', 'dnos13');
     }
 
     public function testDrac()
@@ -1367,6 +1354,19 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('powerconnect', 'powerconnect-3019');
         $this->checkOS('powerconnect', 'powerconnect-3031');
         $this->checkOS('powerconnect', 'powerconnect-3041');
+        $this->checkOS('powerconnect', 'powerconnect1');
+        $this->checkOS('powerconnect', 'powerconnect2');
+        $this->checkOS('powerconnect', 'powerconnect3');
+        $this->checkOS('powerconnect', 'powerconnect4');
+        $this->checkOS('powerconnect', 'powerconnect5');
+        $this->checkOS('powerconnect', 'powerconnect6');
+        $this->checkOS('powerconnect', 'powerconnect7');
+        $this->checkOS('powerconnect', 'powerconnect8');
+        $this->checkOS('powerconnect', 'powerconnect9');
+        $this->checkOS('powerconnect', 'powerconnect10');
+        $this->checkOS('powerconnect', 'powerconnect11');
+        $this->checkOS('powerconnect', 'powerconnect12');
+        $this->checkOS('powerconnect', 'powerconnect13');
     }
 
     public function testPowervault()