Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes ZEN-16870 ipnetworks were accidently setting the version as the de... #782

Merged
merged 1 commit into from Feb 26, 2015
Merged

fixes ZEN-16870 ipnetworks were accidently setting the version as the de... #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Products/ZenModel/IpNetwork.py
View file
Open in desktop
@@ -1,10 +1,10 @@
##############################################################################
#
#
# Copyright (C) Zenoss, Inc. 2008, all rights reserved.
#
#
# This content is made available according to terms specified in
# License.zenoss under the directory where your Zenoss product is installed.
#
#
##############################################################################


Expand Down Expand Up @@ -387,7 +387,7 @@ def addSubNetwork(self, ip, netmask=24):
"""
netobj = self.getSubNetwork(ip)
if not netobj:
net = IpNetwork(ipwrap(ip), netmask, self.version)
net = IpNetwork(ipwrap(ip), netmask=netmask, version=self.version)
self._setObject(ipwrap(ip), net)
return self.getSubNetwork(ip)

Expand Down
12 changes: 6 additions & 6 deletions Products/Zuul/catalog/global_catalog.py
View file
Open in desktop
@@ -1,10 +1,10 @@
##############################################################################
#
#
# Copyright (C) Zenoss, Inc. 2009, all rights reserved.
#
#
# This content is made available according to terms specified in
# License.zenoss under the directory where your Zenoss product is installed.
#
#
##############################################################################


Expand Down Expand Up @@ -37,7 +37,6 @@
from Products.ZenModel.Software import Software
from Products.ZenModel.OperatingSystem import OperatingSystem
from Products.Zuul.utils import getZProperties, allowedRolesAndUsers

from interfaces import IGloballyIndexed, IPathReporter, IIndexableWrapper

_MARKER = object()
Expand Down Expand Up @@ -375,10 +374,10 @@ def name(self):

class DeviceOrganizerWrapper(SearchableMixin,IndexableWrapper):
adapts(DeviceOrganizer)

def searchKeywords(self):
obj = self._context
return (obj.getOrganizerName(), obj.description)
return (obj.getOrganizerName(), str(obj.description))

def searchExcerpt(self):
return self._context.getOrganizerName()
Expand Down Expand Up @@ -411,6 +410,7 @@ def catalog_object(self, obj, uid=None, **kwargs):
uid = uid or "/".join(obj.getPhysicalPath())
if not uid in self._catalog.uids:
del kwargs['idxs']

ZCatalog.catalog_object(self, ob, uid, **kwargs)

def uncatalog_object(self, path):
Expand Down