Add 'Instance' field 'admin_state_source' to data of unit tests.
Signed-off-by: Jose A. Lopes <[email protected]>
---
test/data/htools/hail-alloc-drbd.json | 10 +++++
.../data/htools/hail-alloc-restricted-network.json | 3 ++
test/data/htools/hail-alloc-spindles.json | 4 ++
test/data/htools/hail-change-group.json | 10 +++++
test/data/htools/hail-node-evac.json | 10 +++++
test/data/htools/hail-reloc-drbd.json | 10 +++++
test/data/htools/rapi/instances.json | 11 ++++++
test/data/instance-prim-sec.txt | 1 +
test/hs/Test/Ganeti/Objects.hs | 4 ++
test/hs/Test/Ganeti/Query/Instance.hs | 14 ++++---
test/py/cmdlib/testsupport/config_mock.py | 4 ++
test/py/ganeti.query_unittest.py | 46 ++++++++++++++++------
12 files changed, 110 insertions(+), 17 deletions(-)
diff --git a/test/data/htools/hail-alloc-drbd.json
b/test/data/htools/hail-alloc-drbd.json
index 6e926d5..d68cfa1 100644
--- a/test/data/htools/hail-alloc-drbd.json
+++ b/test/data/htools/hail-alloc-drbd.json
@@ -121,6 +121,7 @@
],
"vcpus": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"spindle_use": 1,
"memory": 128,
@@ -153,6 +154,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -183,6 +185,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 8192,
"nodes": [
@@ -213,6 +216,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -244,6 +248,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -280,6 +285,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -310,6 +316,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -341,6 +348,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -373,6 +381,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -404,6 +413,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
diff --git a/test/data/htools/hail-alloc-restricted-network.json
b/test/data/htools/hail-alloc-restricted-network.json
index 4245a31..b324423 100644
--- a/test/data/htools/hail-alloc-restricted-network.json
+++ b/test/data/htools/hail-alloc-restricted-network.json
@@ -23,6 +23,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -53,6 +54,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -83,6 +85,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
diff --git a/test/data/htools/hail-alloc-spindles.json
b/test/data/htools/hail-alloc-spindles.json
index 6ec2a83..dd46052 100644
--- a/test/data/htools/hail-alloc-spindles.json
+++ b/test/data/htools/hail-alloc-spindles.json
@@ -169,6 +169,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 1024,
"nodes": [
@@ -199,6 +200,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 1024,
"nodes": [
@@ -229,6 +231,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 1024,
"nodes": [
@@ -259,6 +262,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 1024,
"nodes": [
diff --git a/test/data/htools/hail-change-group.json
b/test/data/htools/hail-change-group.json
index 8363e6e..03e8a3f 100644
--- a/test/data/htools/hail-change-group.json
+++ b/test/data/htools/hail-change-group.json
@@ -169,6 +169,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -200,6 +201,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -230,6 +232,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 8192,
"nodes": [
@@ -260,6 +263,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -291,6 +295,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -327,6 +332,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -357,6 +363,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -388,6 +395,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -420,6 +428,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -451,6 +460,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
diff --git a/test/data/htools/hail-node-evac.json
b/test/data/htools/hail-node-evac.json
index 605840d..54c4220 100644
--- a/test/data/htools/hail-node-evac.json
+++ b/test/data/htools/hail-node-evac.json
@@ -118,6 +118,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -149,6 +150,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -179,6 +181,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 8192,
"nodes": [
@@ -209,6 +212,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -240,6 +244,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -276,6 +281,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -306,6 +312,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -337,6 +344,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -369,6 +377,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -400,6 +409,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
diff --git a/test/data/htools/hail-reloc-drbd.json
b/test/data/htools/hail-reloc-drbd.json
index ba142f3..cbe34a1 100644
--- a/test/data/htools/hail-reloc-drbd.json
+++ b/test/data/htools/hail-reloc-drbd.json
@@ -122,6 +122,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -153,6 +154,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -183,6 +185,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 8192,
"nodes": [
@@ -213,6 +216,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -244,6 +248,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "up",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -280,6 +285,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -310,6 +316,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -341,6 +348,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
@@ -373,6 +381,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "drbd",
"memory": 128,
"nodes": [
@@ -404,6 +413,7 @@
"vcpus": 1,
"spindle_use": 1,
"admin_state": "down",
+ "admin_state_source": "admin",
"disk_template": "plain",
"memory": 128,
"nodes": [
diff --git a/test/data/htools/rapi/instances.json
b/test/data/htools/rapi/instances.json
index 42ccb0f..0ee9577 100644
--- a/test/data/htools/rapi/instances.json
+++ b/test/data/htools/rapi/instances.json
@@ -53,6 +53,7 @@
null
],
"admin_state": "up",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -138,6 +139,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -207,6 +209,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -304,6 +307,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -387,6 +391,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -454,6 +459,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br1"
],
@@ -521,6 +527,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -589,6 +596,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -656,6 +664,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -755,6 +764,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
@@ -822,6 +832,7 @@
null
],
"admin_state": "down",
+ "admin_state_source": "admin",
"nic.links": [
"xen-br0"
],
diff --git a/test/data/instance-prim-sec.txt b/test/data/instance-prim-sec.txt
index a947dfb..4e9d766 100644
--- a/test/data/instance-prim-sec.txt
+++ b/test/data/instance-prim-sec.txt
@@ -1,4 +1,5 @@
[[{"admin_state": "up",
+ "admin_state_source": "admin",
"beparams": {},
"ctime": 1372838883.9710441,
"disk_template": "drbd",
diff --git a/test/hs/Test/Ganeti/Objects.hs b/test/hs/Test/Ganeti/Objects.hs
index e24e398..f89fbe9 100644
--- a/test/hs/Test/Ganeti/Objects.hs
+++ b/test/hs/Test/Ganeti/Objects.hs
@@ -101,6 +101,8 @@ $(genArbitrary ''PartialBeParams)
$(genArbitrary ''AdminState)
+$(genArbitrary ''AdminStateSource)
+
$(genArbitrary ''PartialNicParams)
$(genArbitrary ''PartialNic)
@@ -125,6 +127,8 @@ instance Arbitrary Instance where
<*> pure (GenericContainer Map.empty)
-- admin_state
<*> arbitrary
+ -- admin_state_source
+ <*> arbitrary
-- nics
<*> arbitrary
-- disks
diff --git a/test/hs/Test/Ganeti/Query/Instance.hs
b/test/hs/Test/Ganeti/Query/Instance.hs
index aa4c56e..a8abc16 100644
--- a/test/hs/Test/Ganeti/Query/Instance.hs
+++ b/test/hs/Test/Ganeti/Query/Instance.hs
@@ -44,15 +44,17 @@ import Test.HUnit
{-# ANN module "HLint: ignore Use camelCase" #-}
--- | Creates an instance with the desired name, pnode uuid, and AdminState.
--- All other fields are placeholders.
-createInstance :: String -> String -> AdminState -> Instance
-createInstance name pnodeUuid adminState =
+-- | Creates an instance with the desired name, pnode uuid,
+-- 'AdminState', and 'AdminStateSource'. All other fields are
+-- placeholders.
+createInstance :: String -> String -> AdminState -> AdminStateSource ->
Instance
+createInstance name pnodeUuid adminState adminStateSource =
Instance name pnodeUuid "" Kvm
(GenericContainer Map.empty)
(PartialBeParams Nothing Nothing Nothing Nothing Nothing Nothing)
(GenericContainer Map.empty)
- adminState [] [] DTDrbd8 False Nothing 0.0 0.0 "" 0 Set.empty
+ adminState adminStateSource [] [] DTDrbd8 False Nothing 0.0 0.0 "" 0
+ Set.empty
-- | A fake InstanceInfo to be used to check values.
fakeInstanceInfo :: InstanceInfo
@@ -72,7 +74,7 @@ responseSuccess name instNames = (name, Right .
-- | The instance used for testing. Called Waldo as test cases involve trouble
-- finding information related to it.
waldoInstance :: Instance
-waldoInstance = createInstance "Waldo" "prim" AdminUp
+waldoInstance = createInstance "Waldo" "prim" AdminUp AdminSource
-- | Check that an error is thrown when the node is offline
case_nodeOffline :: Assertion
diff --git a/test/py/cmdlib/testsupport/config_mock.py
b/test/py/cmdlib/testsupport/config_mock.py
index d485453..15e8f41 100644
--- a/test/py/cmdlib/testsupport/config_mock.py
+++ b/test/py/cmdlib/testsupport/config_mock.py
@@ -182,6 +182,7 @@ class ConfigMock(config.ConfigWriter):
beparams=None,
osparams=None,
admin_state=None,
+ admin_state_source=None,
nics=None,
disks=None,
disk_template=None,
@@ -219,6 +220,8 @@ class ConfigMock(config.ConfigWriter):
osparams = {}
if admin_state is None:
admin_state = constants.ADMINST_DOWN
+ if admin_state_source is None:
+ admin_state_source = constants.ADMIN_SOURCE
if nics is None:
nics = [self.CreateNic()]
if disk_template is None:
@@ -248,6 +251,7 @@ class ConfigMock(config.ConfigWriter):
beparams=beparams,
osparams=osparams,
admin_state=admin_state,
+ admin_state_source=admin_state_source,
nics=nics,
disks=disks,
disk_template=disk_template,
diff --git a/test/py/ganeti.query_unittest.py b/test/py/ganeti.query_unittest.py
index cdbfd95..29d32dd 100755
--- a/test/py/ganeti.query_unittest.py
+++ b/test/py/ganeti.query_unittest.py
@@ -694,7 +694,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst1", hvparams={}, beparams={}, nics=[],
uuid="inst1-uuid",
ctime=1291244000, mtime=1291244400, serial_no=30,
- admin_state=constants.ADMINST_UP, hypervisor=constants.HT_XEN_PVM,
+ admin_state=constants.ADMINST_UP,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_PVM,
os="linux1",
primary_node="node1-uuid",
disk_template=constants.DT_PLAIN,
@@ -704,7 +706,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst2", hvparams={}, nics=[],
uuid="inst2-uuid",
ctime=1291211000, mtime=1291211077, serial_no=1,
- admin_state=constants.ADMINST_UP, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_UP,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="node5-uuid",
disk_template=constants.DT_DISKLESS,
@@ -718,7 +722,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst3", hvparams={}, beparams={},
uuid="inst3-uuid",
ctime=1291011000, mtime=1291013000, serial_no=1923,
- admin_state=constants.ADMINST_DOWN, hypervisor=constants.HT_KVM,
+ admin_state=constants.ADMINST_DOWN,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_KVM,
os="busybox",
primary_node="node6-uuid",
disk_template=constants.DT_DRBD8,
@@ -735,7 +741,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst4", hvparams={}, beparams={},
uuid="inst4-uuid",
ctime=1291244390, mtime=1291244395, serial_no=25,
- admin_state=constants.ADMINST_DOWN, hypervisor=constants.HT_XEN_PVM,
+ admin_state=constants.ADMINST_DOWN,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_PVM,
os="linux1",
primary_node="nodeoff2-uuid",
disk_template=constants.DT_DRBD8,
@@ -761,7 +769,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst5", hvparams={}, nics=[],
uuid="inst5-uuid",
ctime=1231211000, mtime=1261200000, serial_no=3,
- admin_state=constants.ADMINST_UP, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_UP,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="nodebad2-uuid",
disk_template=constants.DT_DISKLESS,
@@ -775,7 +785,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst6", hvparams={}, nics=[],
uuid="inst6-uuid",
ctime=7513, mtime=11501, serial_no=13390,
- admin_state=constants.ADMINST_DOWN, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_DOWN,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="node7-uuid",
disk_template=constants.DT_DISKLESS,
@@ -791,7 +803,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst7", hvparams={}, nics=[],
uuid="inst7-uuid",
ctime=None, mtime=None, serial_no=1947,
- admin_state=constants.ADMINST_DOWN, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_DOWN,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="node6-uuid",
disk_template=constants.DT_DISKLESS,
@@ -802,7 +816,9 @@ class TestInstanceQuery(unittest.TestCase):
objects.Instance(name="inst8", hvparams={}, nics=[],
uuid="inst8-uuid",
ctime=None, mtime=None, serial_no=19478,
- admin_state=constants.ADMINST_OFFLINE, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_OFFLINE,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="node6-uuid",
disk_template=constants.DT_DISKLESS,
@@ -810,10 +826,15 @@ class TestInstanceQuery(unittest.TestCase):
disks_active=False,
beparams={},
osparams={}),
- objects.Instance(name="inst9", hvparams={}, nics=[],
+ objects.Instance(
+ name="inst9",
+ hvparams={constants.HV_KVM_USER_SHUTDOWN: True},
+ nics=[],
uuid="inst9-uuid",
ctime=None, mtime=None, serial_no=19478,
- admin_state=constants.ADMINST_UP, hypervisor=constants.HT_XEN_HVM,
+ admin_state=constants.ADMINST_UP,
+ admin_state_source=constants.ADMIN_SOURCE,
+ hypervisor=constants.HT_XEN_HVM,
os="deb99",
primary_node="node6-uuid",
disk_template=constants.DT_DISKLESS,
@@ -919,7 +940,10 @@ class TestInstanceQuery(unittest.TestCase):
if inst.admin_state == constants.ADMINST_UP:
exp_status = constants.INSTST_ERRORDOWN
elif inst.admin_state == constants.ADMINST_DOWN:
- exp_status = constants.INSTST_ADMINDOWN
+ if inst.admin_state_source == constants.USER_SOURCE:
+ exp_status = constants.INSTST_USERDOWN
+ else:
+ exp_status = constants.INSTST_ADMINDOWN
else:
exp_status = constants.INSTST_ADMINOFFLINE
--
1.9.1.423.g4596e3a
