Merge branch 'support/6.x' into feature/deprecate_use_of_long

.gitignore

@@ -8,7 +8,6 @@ Products/ZenUI3/node_modules
 dist
 build
 Zenoss.egg-info
-install-zenoss.mk
 lib/python2.7/site-packages/Zenoss-nspkg.pth
 lib/python2.7/site-packages/Zenoss.egg-link
 

Products/DataCollector/ApplyDataMap/datamaputils.py

@@ -10,7 +10,6 @@
 import logging
 import sys
 
-from six import string_types
 from zope.event import notify
 
 from Products.DataCollector.plugins.DataMaps import MultiArgs
@@ -155,7 +154,7 @@ def _get_attr_value(obj, attr):
 
 
 def _sanitize_value(value, obj):
-    if isinstance(value, string_types):
+    if isinstance(value, basestring):
         try:
             return _decode_value(value, obj)
         except UnicodeDecodeError:

Products/DataCollector/ApplyDataMap/incrementalupdate.py

@@ -279,7 +279,7 @@ def _add(self):
                 for objId, obj in self.relationship.objectItemsAll()
                 if objId == self._target_id
             ),
-            _NOTSET
+            _NOTSET,
         )
         if self._target is _NOTSET:
             changed = True

Products/DataCollector/ApplyDataMap/tests/test_add_directive.py

@@ -13,12 +13,11 @@
 
 from ..applydatamap import ApplyDataMap, ObjectMap
 
-PATH = {'src': 'Products.DataCollector.ApplyDataMap.applydatamap'}
+PATH = {"src": "Products.DataCollector.ApplyDataMap.applydatamap"}
 
 
 class TestImplicitAdd(BaseTestCase):
-    """Test ApplyDataMap directives.
-    """
+    """Test ApplyDataMap directives."""
 
     def afterSetUp(t):
         super(TestImplicitAdd, t).afterSetUp()
@@ -52,7 +51,6 @@ def test_implicit_update_twice_with_same_data(t):
 
 
 class TestExplicitAdd(BaseTestCase):
-
     def afterSetUp(t):
         super(TestExplicitAdd, t).afterSetUp()
         t.om1 = ObjectMap(
@@ -125,8 +123,7 @@ def test_explicit_add_false_with_existing_device_with_changes(t):
 
 
 class TestAddSequence(BaseTestCase):
-    """Test ApplyDataMap directives.
-    """
+    """Test ApplyDataMap directives."""
 
     def afterSetUp(t):
         super(TestAddSequence, t).afterSetUp()

Products/DataCollector/ApplyDataMap/tests/test_datamaputils.py

@@ -8,6 +8,7 @@
 ##############################################################################
 
 from base64 import b64encode
+
 from mock import Mock, sentinel, patch
 
 from Products.DataCollector.plugins.DataMaps import ObjectMap

Products/DataCollector/ApplyDataMap/tests/test_incrementalupdate.py

@@ -60,7 +60,11 @@ def setup_mock_environment(t):
     t.relationship = Mock(
         name="relationship",
         spec_set=[
-            t.target.id, "_getOb", "hasobject", "_setObject", "objectItemsAll"
+            t.target.id,
+            "_getOb",
+            "hasobject",
+            "_setObject",
+            "objectItemsAll",
         ],
     )
     setattr(t.relationship, t.target.id, t.target)

Products/DataCollector/ApplyDataMap/tests/utils.py

@@ -13,7 +13,6 @@
 
 
 class BaseTestCase(TestCase):
-
     def setUp(t):
         logging.disable(logging.CRITICAL)
 

Products/DataCollector/Plugins.py

@@ -287,9 +287,7 @@ def getPluginLoaders(self, packs):
                 if modname not in self.loadedZenpacks:
                     self.loadedZenpacks.append(modname)
                     modPathPrefix = ".".join(
-                        (modname,)
-                        + self.packPath
-                        + (self.lastModName,)
+                        (modname,) + self.packPath + (self.lastModName,)
                     )
                     factory = PackLoaderFactory(OsWalker(), modPathPrefix)
                     package = pack.path(*self.packPath + (self.lastModName,))

Products/DataCollector/SnmpClient.py

@@ -50,7 +50,7 @@ def __init__(
         datacollector=None,
         plugins=[],
     ):
-        BaseClient.__init__(self, device, datacollector)
+        super(SnmpClient, self).__init__(device, datacollector)
         global defaultTries, defaultTimeout
         self.hostname = hostname
         self.device = device
@@ -266,7 +266,8 @@ def clientFinished(self, result):
 
             if isinstance(result.value, error.TimeoutError):
                 log.error(
-                    "Device %s timed out: are " "your SNMP settings correct?",
+                    "Device %s timed out: are "
+                    "your SNMP settings correct?",
                     self.hostname,
                 )
                 summary = "SNMP agent down - no response received"
@@ -286,13 +287,14 @@ def clientFinished(self, result):
             self._sendStatusEvent(summary, eventKey="agent_down")
         else:
             self._sendStatusEvent(
-                "SNMP agent up", eventKey="agent_down", severity=Event.Clear
+                "SNMP agent up",
+                eventKey="agent_down",
+                severity=Event.Clear,
             )
         try:
             self.proxy.close()
         except AttributeError:
-            log.info("Caught AttributeError closing SNMP connection.")
-        """tell the datacollector that we are all done"""
+            log.info("caught AttributeError closing SNMP connection.")
         if self.datacollector:
             self.datacollector.clientFinished(self)
         else:

Products/DataCollector/plugins/CollectorPlugin.py

@@ -128,13 +128,13 @@ def copyDataToProxy(self, device, proxy):
 
     def asdate(self, val):
         """Convert a byte string to the date string 'YYYY/MM/DD HH:MM:SS'"""
-        datear = (1968, 1, 8, 10, 15, 00)
+        datear = (1968, 1, 8, 10, 15, 0)
         try:
             datear = struct.unpack("!h5B", val[0:7])
         except Exception:
             pass
         if datear[0] == 0:
-            datear = (1968, 1, 8, 10, 15, 00)
+            datear = (1968, 1, 8, 10, 15, 0)
         return "%d/%02d/%02d %02d:%02d:%02d" % datear[:6]
 
 

Products/DataCollector/zendisc.py

@@ -138,7 +138,13 @@ def discoverIps(self, nets):
                 )
                 continue
             self.log.info("Discover network '%s'", net.getNetworkName())
-            results = yield self.pingMany(net.fullIpList())
+
+            full_ip_list = net.fullIpList()
+            if self.options.removeInterfaceIps:
+                full_ip_list = yield self.config().callRemote(
+                    "removeInterfaces", net)
+
+            results = yield self.pingMany(full_ip_list)
             goodips, badips = _partitionPingResults(results)
             self.log.debug(
                 "Found %d good IPs and %d bad IPs", len(goodips), len(badips)
@@ -872,6 +878,15 @@ def buildOptions(self):
             default=False,
             help="Prefer SNMP name to DNS name when modeling via SNMP.",
         )
+        self.parser.add_option(
+            "--remove-interface-ips",
+            dest="removeInterfaceIps",
+            action="store_true",
+            default=False,
+            help="Skip discovery on IPs already assigned to interfaces "
+            "(device components).",
+        )
+
         # --job: a development-only option that jobs will use to communicate
         # their existence to zendisc. Not for users, so help is suppressed.
         self.parser.add_option("--job", dest="job", help=SUPPRESS_HELP)