cumin-developers

cumin-developers@lists.fedorahosted.org

1341 discussions

r5777 - trunk/wooly/python/wooly
by tmckay＠fedoraproject.org 05 Jul '13

05 Jul '13

Author: tmckay Date: 2013-07-05 15:58:27 +0000 (Fri, 05 Jul 2013) New Revision: 5777 Modified: trunk/wooly/python/wooly/pages.py Log: Partial fix for BZ980366. If a widget appears more than once in an update url request, only render the widget a single time in the response. Modified: trunk/wooly/python/wooly/pages.py =================================================================== --- trunk/wooly/python/wooly/pages.py 2013-07-01 17:21:08 UTC (rev 5776) +++ trunk/wooly/python/wooly/pages.py 2013-07-05 15:58:27 UTC (rev 5777) @@ -290,8 +290,11 @@ sess = self.session.get(session) widgets = self.widgets.get(session) - + already_done = [] for widget in widgets: + if widget in already_done: + continue + already_done.append(widget) self.widget_tmpl.render(writer, sess, widget) # If a widget generated a redirect url, # there is no sense finishing the render

1 0

r5776 - in trunk/cumin: etc python/cumin
by tmckay＠fedoraproject.org 01 Jul '13

01 Jul '13

Author: tmckay Date: 2013-07-01 17:21:08 +0000 (Mon, 01 Jul 2013) New Revision: 5776 Modified: trunk/cumin/etc/cumin.conf trunk/cumin/python/cumin/config.py Log: Change defaults for aviary ports to match new aviary ports in the 30000 range Modified: trunk/cumin/etc/cumin.conf =================================================================== --- trunk/cumin/etc/cumin.conf 2013-06-24 20:18:39 UTC (rev 5775) +++ trunk/cumin/etc/cumin.conf 2013-07-01 17:21:08 UTC (rev 5776) @@ -27,24 +27,24 @@ # The value for this parameter is a comma separated list of URLs for Aviary # job servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-job-servers: http://localhost:9090 +# aviary-job-servers: http://localhost:39090 # The value for this parameter is a comma separated list of URLs for Aviary # query servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-query-servers: http://localhost:9091 +# aviary-query-servers: http://localhost:39091 # The value for this parameter is a comma separated list of URLs for Aviary # collector servers. If the Aviary locator is used, this value will be overriden. # Default is shown. -# aviary-collector-servers: http://localhost:9000 +# aviary-collector-servers: http://localhost:39000 # The locator allows Cumin to retrieve values for Aviary job servers and # Aviary query servers automatically. If the Aviary locator is enabled the # values for aviary-job-servers and aviary-query-servers will be overriden. # Default is empty string (aviary locator will not be used). Uncomment the # following line and edit as needed to enable. -# aviary-locator: http://localhost:9000 +# aviary-locator: http://localhost:39000 # Full path to private key file used for ssl communication with aviary servers. # This is necessary to communicate with any aviary server using the https scheme. @@ -202,12 +202,12 @@ ## How often in seconds to contact the wallaroo agent ## to check for new activations -## aviary-job-servers: http://localhost:9090 +## aviary-job-servers: http://localhost:39090 ## Specifies the URIs for aviary job servers. The value ## is a comma separated list of URIs. A full URI has the ## form 'scheme://user/password@host:port/path". The scheme ## will default to http if not specified, the port will -## default to 9090, and the path will default to +## default to 39090, and the path will default to ## /services/job/. User and password will be empty by ## default. As a convenience, a URI that explicitly ## sets a port number may be followed by one or more @@ -215,23 +215,23 @@ ## mulitple job servers whose URIs differ only ## by port number. -## aviary-query-servers: http://localhost:9091 +## aviary-query-servers: http://localhost:39091 ## Like aviary-job-servers but specifies URIs for aviary -## query servers. The port value defaults to 9091 and the +## query servers. The port value defaults to 39091 and the ## path defaults to /services/query/. Other ## defaults are as noted for aviary-job-servers. -## aviary-collector-servers: http://localhost:9000 +## aviary-collector-servers: http://localhost:39000 ## Like aviary-job-servers but specifies URIs for aviary -## collector servers. The port value defaults to 9000 and +## collector servers. The port value defaults to 39000 and ## the path defaults to /services/collector. Other ## defaults are as noted for aviary-job-servers. -## aviary-locator: http://localhost:9000 +## aviary-locator: http://localhost:39000 ## Specifies the URI for the aviary locator. This is ## a single value, not a list of URIs. The form of ## the URI is the same as that of aviary-job-servers. -## The port will default to 9000 and the path will +## The port will default to 39000 and the path will ## default to /services/locator/locate. Other defaults ## are as noted for aviary-job-servers. Modified: trunk/cumin/python/cumin/config.py =================================================================== --- trunk/cumin/python/cumin/config.py 2013-06-24 20:18:39 UTC (rev 5775) +++ trunk/cumin/python/cumin/config.py 2013-07-01 17:21:08 UTC (rev 5776) @@ -174,10 +174,10 @@ strict_section) param = ConfigParameter(self, "aviary-hadoop-servers", str) - param.default = "http://localhost:9090" + param.default = "http://localhost:39090" param = ConfigParameter(self, "aviary-query-servers", str) - param.default = "http://localhost:9091" + param.default = "http://localhost:39091" param = ConfigParameter(self, "aviary-locator", str) param.default = "" @@ -217,7 +217,7 @@ strict_section) # data uses the collector service, too param = ConfigParameter(self, "aviary-collector-servers", str) - param.default = "http://localhost:9000" + param.default = "http://localhost:39000" class CuminWebConfigSection(BrokeredConfigSection): def __init__(self, config, name, strict_section=False): @@ -240,7 +240,7 @@ # Web uses the job server, too param = ConfigParameter(self, "aviary-job-servers", str) - param.default = "http://localhost:9090" + param.default = "http://localhost:39090" param = ConfigParameter(self, "server-cert", str) param.default = ""

1 0

r5775 - trunk/cumin/python/cumin/gridhadoop
by croberts＠fedoraproject.org 24 Jun '13

24 Jun '13

Author: croberts Date: 2013-06-24 20:18:39 +0000 (Mon, 24 Jun 2013) New Revision: 5775 Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py Log: Mapping "Unmanaged" to "Infrastructure" on the Details pages of hadoop objects. Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-24 20:09:00 UTC (rev 5774) +++ trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-24 20:18:39 UTC (rev 5775) @@ -291,6 +291,8 @@ setattr(self, prop.name, aviary_response[1][0]["ref"][prop.name.lower()]) elif prop.name.lower() in ["parent_id", "parent_ipc"]: setattr(self, prop.name, aviary_response[1][0]["parent"][prop.name.lower().split("_")[1]]) + elif prop.name.lower() in ["state"] and aviary_response[1][0][prop.name.lower()].lower() == "unmanaged": + setattr(self, prop.name, "Infrastructure") else: setattr(self, prop.name, aviary_response[1][0][prop.name.lower()]) except AttributeError, e:

1 0

r5774 - in trunk: cumin/python/cumin/gridhadoop sage/python/sage/aviary
by croberts＠fedoraproject.org 24 Jun '13

24 Jun '13

Author: croberts Date: 2013-06-24 20:09:00 +0000 (Mon, 24 Jun 2013) New Revision: 5774 Modified: trunk/cumin/python/cumin/gridhadoop/jobtracker.py trunk/sage/python/sage/aviary/aviaryoperations.py Log: Fix so that adding an external job tracker will now pass along the owner field. Modified: trunk/cumin/python/cumin/gridhadoop/jobtracker.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-06-24 13:19:26 UTC (rev 5773) +++ trunk/cumin/python/cumin/gridhadoop/jobtracker.py 2013-06-24 20:09:00 UTC (rev 5774) @@ -103,8 +103,9 @@ def do_invoke(self, session, object, invoc, args): self.invoc = invoc (ipc, http) = args + owner = session.client_session.username() host = self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0] - self.app.remote.add_external_job_tracker(host, ipc, http, invoc.make_callback()) + self.app.remote.add_external_job_tracker(host, ipc, http, owner, invoc.make_callback()) def get_title(self, session, x): return "Add an infrastructure job tracker" Modified: trunk/sage/python/sage/aviary/aviaryoperations.py =================================================================== --- trunk/sage/python/sage/aviary/aviaryoperations.py 2013-06-24 13:19:26 UTC (rev 5773) +++ trunk/sage/python/sage/aviary/aviaryoperations.py 2013-06-24 20:09:00 UTC (rev 5774) @@ -1156,7 +1156,7 @@ client, "startNameNode", None, owner, None, ref) t.start() - def add_external_job_tracker(self, host, ipc, url, callback): + def add_external_job_tracker(self, host, ipc, url, owner, callback): # This is special because the HadoooID is special, and # also because the id refers to the jt itself as an external # and not a namenode @@ -1189,7 +1189,7 @@ ref.http = url t = CallThread(self.call_client_retry, my_callback, - client, "startJobTracker", ref) + client, "startJobTracker", ref, None, owner, None) t.start() def _make_id(self, client, val):

1 0

r5773 - trunk/cumin/python/cumin/gridhadoop
by croberts＠fedoraproject.org 24 Jun '13

24 Jun '13

Author: croberts Date: 2013-06-24 13:19:26 +0000 (Mon, 24 Jun 2013) New Revision: 5773 Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py Log: Addressing some issues with how our HadoopObjects are built and how they are displayed when not all values are present. Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-24 13:17:23 UTC (rev 5772) +++ trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-24 13:19:26 UTC (rev 5773) @@ -2,7 +2,7 @@ from cumin.objectselector import ObjectSelector, ObjectLinkColumn, ObjectTable, \ ObjectTableColumn, ObjectQmfTable, ObjectQmfSelectorTable, ObjectSelectorTaskForm, ObjectSelectorTask -from cumin.objectframe import ObjectFrame, ObjectTaskForm, ObjectDetails +from cumin.objectframe import ObjectFrame, ObjectTaskForm, ObjectDetails, DetailsAttributes from cumin.util import * from cumin.qmfadapter import ObjectQmfAdapter from cumin.task import Task, TaskLink @@ -62,10 +62,10 @@ val = record.ref.http elif (column.name == "Ipc"): val = record.ref.ipc - elif (column.name == "Id"): + elif (column.name in ["Id", "_id"]): val = record.ref.id else: - val = "" + val = None field_data.append(val) return field_data @@ -302,11 +302,19 @@ name = self.__class__.__name__ args = (name, self._class, self._id, self._save_time) return "%s(%s,%s,%s)" % args + + def get_value(self, attr): + try: + value = getattr(self, attr) + except AttributeError: + value = "" + return value + class HadoopObjectDetails(ObjectDetails): def __init__(self, app, name, object): super(HadoopObjectDetails, self).__init__(app, name, object) - + class HadoopNodeDeleteTask(ObjectSelectorTask): def enter(self, session): form_session = super(HadoopNodeDeleteTask, self).enter(session)

1 0

r5772 - trunk/cumin/python/cumin
by croberts＠fedoraproject.org 24 Jun '13

24 Jun '13

Author: croberts Date: 2013-06-24 13:17:23 +0000 (Mon, 24 Jun 2013) New Revision: 5772 Modified: trunk/cumin/python/cumin/objectframe.py Log: In the event of an attribute value not being able to be formatted properly, we just return the raw value now. Modified: trunk/cumin/python/cumin/objectframe.py =================================================================== --- trunk/cumin/python/cumin/objectframe.py 2013-06-23 13:31:28 UTC (rev 5771) +++ trunk/cumin/python/cumin/objectframe.py 2013-06-24 13:17:23 UTC (rev 5772) @@ -131,13 +131,20 @@ obj = self.object.get(session) for attr in self.get_attributes(session): - # name and title are from rosemary xml files - name = attr.title - # We are going to escape the value in ObjectAttributesEntry below - value = obj.get_formatted_value(attr.name, escape=False) - title = attr.description + try: + # name and title are from rosemary xml files + name = attr.title + # We are going to escape the value in ObjectAttributesEntry below + value = obj.get_formatted_value(attr.name, escape=False) + title = attr.description - writer.write(self.entry.render(session, name, value, title)) + writer.write(self.entry.render(session, name, value, title)) + except: + name = attr.title + value = obj.get_value(attr.name) + title = attr.description + + writer.write(self.entry.render(session, name, value, title)) return writer.to_string()

1 0

r5771 - in trunk: cumin/python/cumin/gridhadoop sage/python/sage/aviary
by croberts＠fedoraproject.org 23 Jun '13

23 Jun '13

Author: croberts Date: 2013-06-23 13:31:28 +0000 (Sun, 23 Jun 2013) New Revision: 5771 Modified: trunk/cumin/python/cumin/gridhadoop/namenode.py trunk/sage/python/sage/aviary/aviaryoperations.py Log: Now passing owner to add_external_name_node. Modified: trunk/cumin/python/cumin/gridhadoop/namenode.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-06-23 13:30:30 UTC (rev 5770) +++ trunk/cumin/python/cumin/gridhadoop/namenode.py 2013-06-23 13:31:28 UTC (rev 5771) @@ -101,7 +101,8 @@ self.invoc = invoc (ipc, http) = args host = self.app.remote.get_hosts("SCHEDULER", "HADOOP")[0] - self.app.remote.add_external_name_node(host, ipc, http, invoc.make_callback()) + owner = session.client_session.username() + self.app.remote.add_external_name_node(host, ipc, http, owner, invoc.make_callback()) def get_title(self, session, x): return "Add an infrastructure name node" Modified: trunk/sage/python/sage/aviary/aviaryoperations.py =================================================================== --- trunk/sage/python/sage/aviary/aviaryoperations.py 2013-06-23 13:30:30 UTC (rev 5770) +++ trunk/sage/python/sage/aviary/aviaryoperations.py 2013-06-23 13:31:28 UTC (rev 5771) @@ -1122,7 +1122,7 @@ def get_task_tracker_list(self, owner=None, callback=None): return self._get_node_list(self.get_task_tracker, owner, callback) - def add_external_name_node(self, host, ipc, url, callback): + def add_external_name_node(self, host, ipc, url, owner, callback): # This is special because the HadoopID is special assert callable(callback) @@ -1153,7 +1153,7 @@ ref.http = url t = CallThread(self.call_client_retry, my_callback, - client, "startNameNode", None, None, None, ref) + client, "startNameNode", None, owner, None, ref) t.start() def add_external_job_tracker(self, host, ipc, url, callback):

1 0

r5770 - trunk/cumin/python/cumin/gridhadoop
by croberts＠fedoraproject.org 23 Jun '13

23 Jun '13

Author: croberts Date: 2013-06-23 13:30:30 +0000 (Sun, 23 Jun 2013) New Revision: 5770 Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py Log: Translating "unmanaged" to "Infrastructure" for state. Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-23 11:29:17 UTC (rev 5769) +++ trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-23 13:30:30 UTC (rev 5770) @@ -51,7 +51,10 @@ if column.name.lower() in ["parent_id", "parent_ipc"]: val = record.parent[column.name.lower().split("_")[1]] elif column.name == "State": - val = record[column.name.lower()].title() + if record[column.name.lower()].title() == "Unmanaged": + val = "Infrastructure" + else: + val = record[column.name.lower()].title() else: val = record[column.name.lower()] except AttributeError: @@ -59,8 +62,10 @@ val = record.ref.http elif (column.name == "Ipc"): val = record.ref.ipc + elif (column.name == "Id"): + val = record.ref.id else: - val = record.ref.id + val = "" field_data.append(val) return field_data

1 0

r5769 - trunk/cumin/python/cumin/gridhadoop
by croberts＠fedoraproject.org 23 Jun '13

23 Jun '13

Author: croberts Date: 2013-06-23 11:29:17 +0000 (Sun, 23 Jun 2013) New Revision: 5769 Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py Log: Now grabbing the http value from its new location in HadoopId Modified: trunk/cumin/python/cumin/gridhadoop/hadoop.py =================================================================== --- trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-22 12:00:14 UTC (rev 5768) +++ trunk/cumin/python/cumin/gridhadoop/hadoop.py 2013-06-23 11:29:17 UTC (rev 5769) @@ -55,7 +55,9 @@ else: val = record[column.name.lower()] except AttributeError: - if (column.name == "Ipc"): + if (column.name == "Http"): + val = record.ref.http + elif (column.name == "Ipc"): val = record.ref.ipc else: val = record.ref.id

1 0

r5768 - trunk/cumin/model/access
by croberts＠fedoraproject.org 22 Jun '13

22 Jun '13

Author: croberts Date: 2013-06-22 12:00:14 +0000 (Sat, 22 Jun 2013) New Revision: 5768 Modified: trunk/cumin/model/access/persona.xml Log: Removing the inventory tab from the hadoop persona. Modified: trunk/cumin/model/access/persona.xml =================================================================== --- trunk/cumin/model/access/persona.xml 2013-06-21 21:51:38 UTC (rev 5767) +++ trunk/cumin/model/access/persona.xml 2013-06-22 12:00:14 UTC (rev 5768) @@ -55,7 +55,6 @@ <Persona name="hadoop" auth="True"> <Module name="account"/> <Module name="configuration"/> - <Module name="inventory"/> <Module name="gridhadoop"/> <Module name="user"/> <Module name="user.hadoop"/>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cumin-developers