Merge branch 'develop' into feature/config-service

daemon/core/nodes/base.py

@@ -111,7 +111,7 @@ class NodeBase:
         :param wait: True to wait for status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises CoreCommandError: when a non-zero exit status occurs
+        :raises CoreCommandError: when a non-zero exit status occurs
         """
         if self.server is None:
             return utils.cmd(args, env, cwd, wait, shell)
@@ -426,7 +426,7 @@ class CoreNodeBase(NodeBase):
         :param wait: True to wait for status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises CoreCommandError: when a non-zero exit status occurs
+        :raises CoreCommandError: when a non-zero exit status occurs
         """
         raise NotImplementedError
 
@@ -607,7 +607,7 @@ class CoreNode(CoreNodeBase):
         :param wait: True to wait for status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises CoreCommandError: when a non-zero exit status occurs
+        :raises CoreCommandError: when a non-zero exit status occurs
         """
         if self.server is None:
             return self.client.check_cmd(args, wait=wait, shell=shell)

daemon/core/nodes/client.py

@@ -60,7 +60,7 @@ class VnodeClient:
         :param wait: True to wait for command status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises core.CoreCommandError: when there is a non-zero exit status
+        :raises core.CoreCommandError: when there is a non-zero exit status
         """
         self._verify_connection()
         args = self.create_cmd(args)

daemon/core/nodes/interface.py

@@ -80,7 +80,7 @@ class CoreInterface:
         :param wait: True to wait for status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises CoreCommandError: when a non-zero exit status occurs
+        :raises CoreCommandError: when a non-zero exit status occurs
         """
         if self.server is None:
             return utils.cmd(args, env, cwd, wait, shell)

daemon/core/nodes/network.py

@@ -309,7 +309,7 @@ class CoreNetwork(CoreNetworkBase):
         :param wait: True to wait for status, False otherwise
         :param shell: True to use shell, False otherwise
         :return: combined stdout and stderr
-:raises CoreCommandError: when a non-zero exit status occurs
+        :raises CoreCommandError: when a non-zero exit status occurs
         """
         logging.debug("network node(%s) cmd", self.name)
         output = utils.cmd(args, env, cwd, wait, shell)

daemon/core/nodes/physical.py

@@ -373,7 +373,7 @@ class Rj45Node(CoreNodeBase, CoreInterface):
         :param ifindex: interface index
         :param ifname: interface name
         :return: interface index
-:raises ValueError: when an interface has already been created, one max
+        :raises ValueError: when an interface has already been created, one max
         """
         with self.lock:
             if ifindex is None: