Merge 7d076f2 into ec5a3a1

yahoo · Oct 8, 2019 · 831b38a · 831b38a
2 parents ec5a3a1 + 7d076f2
commit 831b38a
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 1 deletion.
diff --git a/yahoo_panoptes/framework/utilities/snmp/connection.py b/yahoo_panoptes/framework/utilities/snmp/connection.py
@@ -387,7 +387,7 @@ def _parse_x509_configuration(self):
                                                                                    'x509_secured_requests']))
         assert PanoptesValidators.valid_positive_integer(self._x509_secure_connection),\
             'x509 secure connection must be a positive integer'
-        assert self._x509_secure_connection < 2, 'x509 secure connection cannot be greater than 2'
+        assert self._x509_secure_connection < 3, 'x509 secure connection cannot be greater than 2'
 
         cert_location = self._plugin_x509_configuration.get('x509_cert_location',
                                                             self._default_x509_configuration['x509_cert_location'])

diff --git a/yahoo_panoptes/plugins/polling/a10AX/.gitignore b/yahoo_panoptes/plugins/polling/a10AX/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/a10thunder/.gitignore b/yahoo_panoptes/plugins/polling/a10thunder/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/arista/.gitignore b/yahoo_panoptes/plugins/polling/arista/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/asr/.gitignore b/yahoo_panoptes/plugins/polling/asr/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/brocade/.gitignore b/yahoo_panoptes/plugins/polling/brocade/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/heartbeat/.gitignore b/yahoo_panoptes/plugins/polling/heartbeat/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/interface_old/.gitignore b/yahoo_panoptes/plugins/polling/interface_old/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/juniper/.gitignore b/yahoo_panoptes/plugins/polling/juniper/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/yahoo_panoptes/plugins/polling/nat/.gitignore b/yahoo_panoptes/plugins/polling/nat/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore