From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 16 Mar 2015 01:36:40 +0000 (-0400)
Subject: Fix pep8 violations in csit/libraries/SwitchClasses/Ovs.py
X-Git-Tag: release/helium-sr3~54^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=42bded87ce02a2168d293e90e09dc57b5eef672c;p=integration%2Ftest.git

Fix pep8 violations in csit/libraries/SwitchClasses/Ovs.py

Change-Id: Ic3e03f9851145d0c119d2e746efc09f886173ec2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/test/csit/libraries/SwitchClasses/Ovs.py b/test/csit/libraries/SwitchClasses/Ovs.py
index d076d80cee..c5c69dbd59 100644
--- a/test/csit/libraries/SwitchClasses/Ovs.py
+++ b/test/csit/libraries/SwitchClasses/Ovs.py
@@ -3,11 +3,9 @@ Provision 3800 Object Definition
 Authors: james.luhrsen@hp.com
 Created: 2014-10-02
 """
-import string
-import robot
 import re
-from robot.libraries.BuiltIn import BuiltIn
-from BaseSwitch import *
+from BaseSwitch import *  # noqa
+
 
 class Ovs(BaseSwitch):
     '''
@@ -25,71 +23,60 @@ class Ovs(BaseSwitch):
 
     mgmt_prompt = '>'
 
-
     initialization_type = 'cleanup'
 
     @property
     def connection_configs(self):
-        return \
-            ['pwd']
+        return ['pwd']
 
     @property
     def cleanup_cmds(self):
-        return \
-            ['/sbin/ifconfig | egrep \'^s\' | awk \'{print \"sudo ovs-vsctl del-br\",$1}\' | sh']
+        return ['/sbin/ifconfig | egrep \'^s\' | awk \'{print \"sudo ovs-vsctl del-br\",$1}\' | sh']
 
     @property
     def initialization_cmds(self):
-        return \
-            [self.cleanup_cmds]
+        return [self.cleanup_cmds]
 
     @property
     def base_openflow_config(self):
-        return \
-            ['sudo ovs-vsctl add-br s1', \
-             'sudo ovs-vsctl set bridge s1 protocols=OpenFlow13', \
-             'sudo ovs-vsctl set-controller s1 tcp:' + self.of_controller_ip]
+        return ['sudo ovs-vsctl add-br s1',
+                'sudo ovs-vsctl set bridge s1 protocols=OpenFlow13',
+                'sudo ovs-vsctl set-controller s1 tcp:' + self.of_controller_ip]
 
     @property
     def openflow_validation_cmd(self):
-        return \
-            'sudo ovs-vsctl show'
+        return 'sudo ovs-vsctl show'
 
     @property
     def openflow_enable_config(self):
-        return \
-            ['sudo ovs-vsctl set-controller s1 tcp:' + self.of_controller_ip]
+        return ['sudo ovs-vsctl set-controller s1 tcp:' + self.of_controller_ip]
 
     @property
     def openflow_enable_validations(self):
-        return \
-            ['is_connected: true']
+        return ['is_connected: true']
 
     invalid_of_controller_ip = '1.1.1.1'
+
     @property
     def openflow_disable_config(self):
-        return \
-            ['sudo ovs-vsctl set-controller s1 tcp:' + self.invalid_of_controller_ip]
+        return ['sudo ovs-vsctl set-controller s1 tcp:' + self.invalid_of_controller_ip]
 
     @property
     def openflow_disable_validations(self):
-        return \
-            []
+        return []
 
     @property
     def dump_all_flows(self):
-        return \
-            'sudo /usr/bin/ovs-ofctl dump-flows s1 -O OpenFlow13'
+        return 'sudo /usr/bin/ovs-ofctl dump-flows s1 -O OpenFlow13'
 
     @property
     def flow_validations(self):
-        return \
-            ['dl_src=' + self.src_mac + \
-             ',dl_dst=' + self.dst_mac + \
-             ',nw_src=' + self.ip_src + \
-             ',nw_dst=' + self.ip_dst + \
-             ' actions=' + self.action, \
-             'table=' + self.table_id]
+        return ['dl_src=' + self.src_mac +
+                ',dl_dst=' + self.dst_mac +
+                ',nw_src=' + self.ip_src +
+                ',nw_dst=' + self.ip_dst +
+                ' actions=' + self.action,
+                'table=' + self.table_id]
 
     def create_flow_match_elements(self, flow_xml):
         super(Ovs, self).create_flow_match_elements(flow_xml)
@@ -98,8 +85,7 @@ class Ovs(BaseSwitch):
 
     @property
     def datapath_id_output_command(self):
-        return \
-            '/sbin/ifconfig | egrep \'^s1\' | awk \'{print $5}\''
+        return '/sbin/ifconfig | egrep \'^s1\' | awk \'{print $5}\''
 
     datapath_id_output_string = ''
     datapath_id = ''
@@ -108,6 +94,6 @@ class Ovs(BaseSwitch):
         if not self.datapath_id_output_string:
             self.datapath_id = 'unknown'
         else:
-         #32:cc:bf:34:ed:4c
-         datapath_id_hex = re.sub(':', '', self.datapath_id_output_string)
-         self.datapath_id = self.convert_hex_to_decimal_as_string(datapath_id_hex)
+            # 32:cc:bf:34:ed:4c
+            datapath_id_hex = re.sub(':', '', self.datapath_id_output_string)
+            self.datapath_id = self.convert_hex_to_decimal_as_string(datapath_id_hex)