From 666c8ea9224af4b1e2def04f6c7fbf830e77a579 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 22 Oct 2014 20:47:59 -0600 Subject: [PATCH] Pedantic: make sure Idle-PC is spelled that way. --- gns3server/modules/dynamips/backends/vm.py | 18 +++++++++--------- gns3server/modules/dynamips/nodes/router.py | 4 ++-- gns3server/modules/dynamips/schemas/vm.py | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gns3server/modules/dynamips/backends/vm.py b/gns3server/modules/dynamips/backends/vm.py index 4d09f9bd..d400ba3a 100644 --- a/gns3server/modules/dynamips/backends/vm.py +++ b/gns3server/modules/dynamips/backends/vm.py @@ -667,17 +667,17 @@ class VM(object): @IModule.route("dynamips.vm.idlepcs") def vm_idlepcs(self, request): """ - Get idle-pc proposals. + Get Idle-PC proposals. Mandatory request parameters: - id (vm identifier) Optional request parameters: - - compute (returns previously compute idle-pc values if False) + - compute (returns previously compute Idle-PC values if False) Response parameters: - id (vm identifier) - - idlepcs (idle-pc values in an array) + - idlepcs (Idle-PC values in an array) :param request: JSON request """ @@ -695,7 +695,7 @@ class VM(object): if "compute" in request and request["compute"] == False: idlepcs = router.show_idle_pc_prop() else: - # reset the current idle-pc value before calculating a new one + # reset the current Idle-PC value before calculating a new one router.idlepc = "0x0" idlepcs = router.get_idle_pc_prop() except DynamipsError as e: @@ -709,7 +709,7 @@ class VM(object): @IModule.route("dynamips.vm.auto_idlepc") def vm_auto_idlepc(self, request): """ - Auto idle-pc calculation. + Auto Idle-PC calculation. Mandatory request parameters: - id (vm identifier) @@ -717,7 +717,7 @@ class VM(object): Response parameters: - id (vm identifier) - logs (logs for the calculation) - - idlepc (idle-pc value) + - idlepc (Idle-PC value) :param request: JSON request """ @@ -732,7 +732,7 @@ class VM(object): return try: - router.idlepc = "0x0" # reset the current idle-pc value before calculating a new one + router.idlepc = "0x0" # reset the current Idle-PC value before calculating a new one was_auto_started = False if router.get_status() != "running": router.start() @@ -743,11 +743,11 @@ class VM(object): validated_idlepc = "0x0" idlepcs = router.get_idle_pc_prop() if not idlepcs: - logs.append("No idle-pc values found") + logs.append("No Idle-PC values found") for idlepc in idlepcs: router.idlepc = idlepc.split()[0] - logs.append("Trying idle-pc value {}".format(router.idlepc)) + logs.append("Trying Idle-PC value {}".format(router.idlepc)) start_time = time.time() initial_cpu_usage = router.get_cpu_usage() logs.append("Initial CPU usage = {}%".format(initial_cpu_usage)) diff --git a/gns3server/modules/dynamips/nodes/router.py b/gns3server/modules/dynamips/nodes/router.py index f985af1c..ba1ca522 100644 --- a/gns3server/modules/dynamips/nodes/router.py +++ b/gns3server/modules/dynamips/nodes/router.py @@ -804,10 +804,10 @@ class Router(object): # router is not running raise DynamipsError("router {name} is not running".format(name=self._name)) - log.info("router {name} [id={id}] has started calculating idle-pc values".format(name=self._name, id=self._id)) + log.info("router {name} [id={id}] has started calculating Idle-PC values".format(name=self._name, id=self._id)) begin = time.time() idlepcs = self._hypervisor.send("vm get_idle_pc_prop {} 0".format(self._name)) - log.info("router {name} [id={id}] has finished calculating idle-pc values after {time:.4f} seconds".format(name=self._name, + log.info("router {name} [id={id}] has finished calculating Idle-PC values after {time:.4f} seconds".format(name=self._name, id=self._id, time=time.time() - begin)) return idlepcs diff --git a/gns3server/modules/dynamips/schemas/vm.py b/gns3server/modules/dynamips/schemas/vm.py index bc11bd7a..3fcc8143 100644 --- a/gns3server/modules/dynamips/schemas/vm.py +++ b/gns3server/modules/dynamips/schemas/vm.py @@ -200,7 +200,7 @@ VM_UPDATE_SCHEMA = { "type": "integer" }, "idlepc": { - "description": "idle-pc value", + "description": "Idle-PC value", "type": "string", "pattern": "^(0x[0-9a-fA-F]+)?$" }, @@ -471,7 +471,7 @@ VM_EXPORT_CONFIG_SCHEMA = { VM_IDLEPCS_SCHEMA = { "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Request validation to calculate or show idle-pcs for VM instance", + "description": "Request validation to calculate or show Idle-PCs for VM instance", "type": "object", "properties": { "id": { @@ -479,7 +479,7 @@ VM_IDLEPCS_SCHEMA = { "type": "integer" }, "compute": { - "description": "indicates to compute new idle-pc values", + "description": "indicates to compute new Idle-PC values", "type": "boolean" }, }, @@ -489,7 +489,7 @@ VM_IDLEPCS_SCHEMA = { VM_AUTO_IDLEPC_SCHEMA = { "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Request an auto idle-pc calculation for this VM instance", + "description": "Request an auto Idle-PC calculation for this VM instance", "type": "object", "properties": { "id": {