diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-22 11:05:54 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-22 11:05:54 -0400 |
| commit | 49618e4b03f890424a580a77a583ed2c18989dc6 (patch) | |
| tree | 69db2958ce597e09ac49e1c359f4fe1d17f7c2ed | |
| parent | 699cf3e939fd0d2e3e50841ac229d3670787bfe9 (diff) | |
| parent | 0ea797cd8e709d910c428234417fb179bdfd1525 (diff) | |
Merged with Dan.
| -rw-r--r-- | nova/virt/fake.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/virt/fake.py b/nova/virt/fake.py index b42f4ca2f..c12ee3ab8 100644 --- a/nova/virt/fake.py +++ b/nova/virt/fake.py @@ -42,9 +42,9 @@ def get_connection(_): class FakeInstance(object): - def __init__(self, name, power_state): + def __init__(self, name, state): self.name = name - self.power_state = power_state + self.state = state class FakeConnection(driver.ComputeDriver): @@ -150,8 +150,8 @@ class FakeConnection(driver.ComputeDriver): """ name = instance.name - pstate = power_state.RUNNING - fake_instance = FakeInstance(name, pstate) + state = power_state.RUNNING + fake_instance = FakeInstance(name, state) self.instances[name] = fake_instance def snapshot(self, context, instance, name): @@ -325,7 +325,7 @@ class FakeConnection(driver.ComputeDriver): if instance_name not in self.instances: raise exception.InstanceNotFound(instance_id=instance_name) i = self.instances[instance_name] - return {'state': i.power_state, + return {'state': i.state, 'max_mem': 0, 'mem': 0, 'num_cpu': 2, |
