installed physix92 (bug 2997) and physix93-94 (bug 3000)
This commit is contained in:
parent
79741a248d
commit
160bc22c3d
|
@ -9,8 +9,8 @@
|
||||||
import re
|
import re
|
||||||
import pygraphviz # port install py-pygraphviz
|
import pygraphviz # port install py-pygraphviz
|
||||||
from inventory import Inventory, MachineSpecIdNotFound
|
from inventory import Inventory, MachineSpecIdNotFound
|
||||||
from SimpaDbUtil import SqlFile, SqlDatabaseReader
|
from SimpaDbUtil import SqlFile, SqlDatabaseReader, TableAttrNotFound
|
||||||
from Lib import SimpaDbUtil
|
# from Lib import SimpaDbUtil
|
||||||
|
|
||||||
|
|
||||||
def add_capacity_constraints(capacity1, capacity2):
|
def add_capacity_constraints(capacity1, capacity2):
|
||||||
|
@ -265,7 +265,7 @@ class PowerConfig(object):
|
||||||
rack_id, rack_slot_index = inventory.get_machine_rack_location(machine_name)
|
rack_id, rack_slot_index = inventory.get_machine_rack_location(machine_name)
|
||||||
machine.rack_id = rack_id
|
machine.rack_id = rack_id
|
||||||
machine.rack_slot_index = rack_slot_index
|
machine.rack_slot_index = rack_slot_index
|
||||||
except SimpaDbUtil.TableAttrNotFound:
|
except TableAttrNotFound:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if re.match('[a-z]+.._..', machine_name):
|
if re.match('[a-z]+.._..', machine_name):
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
import datetime
|
import datetime
|
||||||
from Lib import SimpaDbUtil
|
#from Lib import SimpaDbUtil
|
||||||
|
import SimpaDbUtil
|
||||||
|
|
||||||
|
|
||||||
class MachineSpecIdNotFound(Exception):
|
class MachineSpecIdNotFound(Exception):
|
||||||
|
|
Loading…
Reference in New Issue