From tashi-commits-return-543-apmail-incubator-tashi-commits-archive=incubator.apache.org@incubator.apache.org Wed Jun 20 02:29:22 2012 Return-Path: X-Original-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-tashi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D54D6D866 for ; Wed, 20 Jun 2012 02:29:22 +0000 (UTC) Received: (qmail 46692 invoked by uid 500); 20 Jun 2012 02:29:22 -0000 Delivered-To: apmail-incubator-tashi-commits-archive@incubator.apache.org Received: (qmail 46670 invoked by uid 500); 20 Jun 2012 02:29:22 -0000 Mailing-List: contact tashi-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tashi-dev@incubator.apache.org Delivered-To: mailing list tashi-commits@incubator.apache.org Received: (qmail 46661 invoked by uid 99); 20 Jun 2012 02:29:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jun 2012 02:29:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FRT_STOCK2 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jun 2012 02:29:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6BFB32388962; Wed, 20 Jun 2012 02:29:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351918 - /incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py Date: Wed, 20 Jun 2012 02:29:00 -0000 To: tashi-commits@incubator.apache.org From: stroucki@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120620022900.6BFB32388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stroucki Date: Wed Jun 20 02:28:59 2012 New Revision: 1351918 URL: http://svn.apache.org/viewvc?rev=1351918&view=rev Log: resourcequerysql: hw_blenc has no use yet, and its inclusion would require users to alter their database schema. Hold off on this until this field has some use. Modified: incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py Modified: incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py URL: http://svn.apache.org/viewvc/incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py?rev=1351918&r1=1351917&r2=1351918&view=diff ============================================================================== --- incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py (original) +++ incubator/tashi/branches/trunk-staging/src/zoni/data/resourcequerysql.py Wed Jun 20 02:28:59 2012 @@ -737,7 +737,7 @@ class ResourceQuerySql(InfoStore): host['hw_port'] = int(i[6]) # Get drac info - query = "select h.hw_id, h.hw_name, h.hw_model, h.hw_ipaddr, h.hw_userid, h.hw_password, h.hw_blenc, p.port_num from hardwareinfo h, portmap p where p.hw_id = h.hw_id and hw_type = 'drac' and sys_id = " + str(host['sys_id']) + query = "select h.hw_id, h.hw_name, h.hw_model, h.hw_ipaddr, h.hw_userid, h.hw_password, 0, p.port_num from hardwareinfo h, portmap p where p.hw_id = h.hw_id and hw_type = 'drac' and sys_id = " + str(host['sys_id']) result = self.selectDb(query) if result.rowcount > 0: for i in result.fetchall(): @@ -748,7 +748,8 @@ class ResourceQuerySql(InfoStore): host['drac_userid'] = i[4] host['drac_password'] = i[5] # Extensions from MIMOS - for Dell Blade - host['drac_enclosure'] = i[6] + # XXXstroucki removed hw_blenc from query + # host['drac_enclosure'] = i[6] host['drac_port'] = int(i[7]) # Get PDU info @@ -764,7 +765,7 @@ class ResourceQuerySql(InfoStore): host['pdu_port'] = int(i[6]) # Extensions from MIMOS - for HP Blade iLO - query = "select h.hw_id, h.hw_name, h.hw_model, h.hw_ipaddr, h.hw_userid, h.hw_password, h.hw_blenc, p.port_num from hardwareinfo h, portmap p where p.hw_id = h.hw_id and hw_type = 'hpilo' and sys_id = " + str(host['sys_id']) + query = "select h.hw_id, h.hw_name, h.hw_model, h.hw_ipaddr, h.hw_userid, h.hw_password, 0, p.port_num from hardwareinfo h, portmap p where p.hw_id = h.hw_id and hw_type = 'hpilo' and sys_id = " + str(host['sys_id']) result = self.selectDb(query) for i in result.fetchall(): host['ilo_id'] = int(i[0]) @@ -773,7 +774,8 @@ class ResourceQuerySql(InfoStore): host['ilo_ipaddr'] = i[3] host['ilo_userid'] = i[4] host['ilo_password'] = i[5] - host['ilo_enclosure'] = i[6] + # XXXstroucki removed hw_blenc from query + #host['ilo_enclosure'] = i[6] host['ilo_port'] = int(i[7]) #print "host is ", host