Merge "convert networkcapacity to LF"

1 files changed, 71 insertions, 71 deletions

diff --git a/yardstick/benchmark/scenarios/networking/networkcapacity.py b/yardstick/benchmark/scenarios/networking/networkcapacity.py
index fed2fbd65..438452e40 100644
--- a/yardstick/benchmark/scenarios/networking/networkcapacity.py
+++ b/yardstick/benchmark/scenarios/networking/networkcapacity.py
@@ -1,71 +1,71 @@
-##############################################################################

-# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.

-#

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Apache License, Version 2.0

-# which accompanies this distribution, and is available at

-# http://www.apache.org/licenses/LICENSE-2.0

-##############################################################################

-import pkg_resources

-import logging

-import json

-

-import yardstick.ssh as ssh

-from yardstick.benchmark.scenarios import base

-

-LOG = logging.getLogger(__name__)

-

-

-class NetworkCapacity(base.Scenario):

-    """Measure Network capacity and scale.

-

-    This scenario reads network status including number of connections,

-    number of frames sent/received.

-    """

-    __scenario_type__ = "NetworkCapacity"

-    TARGET_SCRIPT = "networkcapacity.bash"

-

-    def __init__(self, scenario_cfg, context_cfg):

-        self.scenario_cfg = scenario_cfg

-        self.context_cfg = context_cfg

-        self.setup_done = False

-

-    def setup(self):

-        """scenario setup"""

-        self.target_script = pkg_resources.resource_filename(

-            "yardstick.benchmark.scenarios.networking",

-            NetworkCapacity.TARGET_SCRIPT)

-

-        host = self.context_cfg['host']

-        if host is None:

-            raise RuntimeError('No right node.please check the configuration')

-        host_user = host.get('user', 'ubuntu')

-        ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)

-        host_ip = host.get('ip', None)

-        host_pwd = host.get('password', None)

-

-        LOG.debug("user:%s, host:%s", host_user, host_ip)

-        self.client = ssh.SSH(host_user, host_ip, password=host_pwd,

-                              port=ssh_port)

-        self.client.wait(timeout=600)

-

-        # copy script to host

-        self.client.run("cat > ~/networkcapacity.sh",

-                        stdin=open(self.target_script, 'rb'))

-

-        self.setup_done = True

-

-    def run(self, result):

-        """execute the benchmark"""

-

-        if not self.setup_done:

-            self.setup()

-

-        cmd = "sudo bash networkcapacity.sh"

-

-        LOG.debug("Executing command: %s", cmd)

-        status, stdout, stderr = self.client.execute(cmd)

-        if status:

-            raise RuntimeError(stderr)

-

-        result.update(json.loads(stdout))

+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+import pkg_resources
+import logging
+import json
+
+import yardstick.ssh as ssh
+from yardstick.benchmark.scenarios import base
+
+LOG = logging.getLogger(__name__)
+
+
+class NetworkCapacity(base.Scenario):
+    """Measure Network capacity and scale.
+
+    This scenario reads network status including number of connections,
+    number of frames sent/received.
+    """
+    __scenario_type__ = "NetworkCapacity"
+    TARGET_SCRIPT = "networkcapacity.bash"
+
+    def __init__(self, scenario_cfg, context_cfg):
+        self.scenario_cfg = scenario_cfg
+        self.context_cfg = context_cfg
+        self.setup_done = False
+
+    def setup(self):
+        """scenario setup"""
+        self.target_script = pkg_resources.resource_filename(
+            "yardstick.benchmark.scenarios.networking",
+            NetworkCapacity.TARGET_SCRIPT)
+
+        host = self.context_cfg['host']
+        if host is None:
+            raise RuntimeError('No right node.please check the configuration')
+        host_user = host.get('user', 'ubuntu')
+        ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)
+        host_ip = host.get('ip', None)
+        host_pwd = host.get('password', None)
+
+        LOG.debug("user:%s, host:%s", host_user, host_ip)
+        self.client = ssh.SSH(host_user, host_ip, password=host_pwd,
+                              port=ssh_port)
+        self.client.wait(timeout=600)
+
+        # copy script to host
+        self.client.run("cat > ~/networkcapacity.sh",
+                        stdin=open(self.target_script, 'rb'))
+
+        self.setup_done = True
+
+    def run(self, result):
+        """execute the benchmark"""
+
+        if not self.setup_done:
+            self.setup()
+
+        cmd = "sudo bash networkcapacity.sh"
+
+        LOG.debug("Executing command: %s", cmd)
+        status, stdout, stderr = self.client.execute(cmd)
+        if status:
+            raise RuntimeError(stderr)
+
+        result.update(json.loads(stdout))