Commit de039dd4 authored by Iustin Pop's avatar Iustin Pop
Browse files

Merge branch 'devel-2.4' into stable-2.4



* devel-2.4:
  1-char comment typo fix
  Expand some acronyms, add to glossary
  query_unittest: Fix argument to set()
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parents 4ecb94d5 73f1d185
......@@ -6,6 +6,11 @@ Glossary
.. glossary::
BE Parameter
BE stands for Backend. BE parameters are hypervisor-independent
instance parameters such as the amount of RAM/virtual CPUs it has
been allocated.
HVM
Hardware virtualization mode, where the virtual machine is
oblivious to the fact that's being virtualized and all the
......@@ -15,6 +20,10 @@ Glossary
The code associated with an OpCode, e.g. the code that implements
the startup of an instance.
LUXI
Local UniX Interface. The IPC method over unix sockets used between
the cli tools and the master daemon.
OpCode
A data structure encapsulating a basic cluster operation; for
example, start instance, add instance, etc.
......
......@@ -200,7 +200,7 @@ DEV_CONSOLE = "/dev/console"
PROC_MOUNTS = "/proc/mounts"
# luxi related constants
# Local UniX Interface related constants
LUXI_EOM = "\3"
LUXI_VERSION = CONFIG_VERSION
......@@ -651,7 +651,7 @@ HVS_PARAMETER_TYPES = {
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
# BE parameter names
# Backend parameter names
BE_MEMORY = "memory"
BE_VCPUS = "vcpus"
BE_AUTO_BALANCE = "auto_balance"
......@@ -981,7 +981,7 @@ QR_GROUP = "group"
#: List of resources which can be queried using L{opcodes.OpQuery}
QR_OP_QUERY = frozenset([QR_INSTANCE, QR_NODE, QR_GROUP])
#: List of resources which can be queried using LUXI
#: List of resources which can be queried using Local UniX Interface
QR_OP_LUXI = QR_OP_QUERY.union([
QR_LOCK,
])
......
......@@ -1123,7 +1123,7 @@ class Cluster(TaggableObject):
if self.modify_ssh_setup is None:
self.modify_ssh_setup = True
# default_bridge is no longer used it 2.1. The slot is left there to
# default_bridge is no longer used in 2.1. The slot is left there to
# support auto-upgrading. It can be removed once we decide to deprecate
# upgrading straight from 2.0.
if self.default_bridge is not None:
......
......@@ -710,8 +710,11 @@ class TestInstanceQuery(unittest.TestCase):
"inst6": {
"memory": 768,
},
"inst7": {
"vcpus": 3,
},
}
wrongnode_inst = set("inst2")
wrongnode_inst = set(["inst7"])
consinfo = dict((inst.name, None) for inst in instances)
consinfo["inst7"] = \
......@@ -822,7 +825,7 @@ class TestInstanceQuery(unittest.TestCase):
self.assertEqual(tested_status,
set(["ERROR_nodeoffline", "ERROR_nodedown",
"running", "ERROR_up", "ERROR_down",
"ADMIN_down"]))
"ADMIN_down", "ERROR_wrongnode"]))
def _CheckInstanceConsole(self, instance, (status, consdata)):
if instance.name == "inst7":
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment