fix for latest

TerryHowe · TerryHowe · commit 3139215cda04 · 2014-04-02T12:48:31.000-06:00
Change-Id: I11ef494fe202e92687c13cce72ecb0dc4bc18d3a
diff --git a/openstackclient/network/v2_0/floatingip.py b/openstackclient/network/v2_0/floatingip.py
@@ -15,7 +15,6 @@
 
 """FloatingIp action implementations"""
 
-from neutronclient.neutron.v2_0 import floatingip as neu2
 from openstackclient.network import common
 
 
@@ -40,7 +39,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteFloatingIp(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/fw/__init__.py b/openstackclient/network/v2_0/fw/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
diff --git a/openstackclient/network/v2_0/fw/firewall.py b/openstackclient/network/v2_0/fw/firewall.py
@@ -15,7 +15,6 @@
 
 """Firewall action implementations"""
 
-from neutronclient.neutron.v2_0.fw import firewall as neu2
 from openstackclient.network import common
 
 
@@ -62,7 +61,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteFirewall(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/gateway.py b/openstackclient/network/v2_0/gateway.py
@@ -40,7 +40,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.func: { } }
+        return {self.func: {}}
 
 
 class DeleteGateway(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/lb/__init__.py b/openstackclient/network/v2_0/lb/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
diff --git a/openstackclient/network/v2_0/lb/member.py b/openstackclient/network/v2_0/lb/member.py
@@ -15,7 +15,6 @@
 
 """Load Balancer member action implementations"""
 
-from neutronclient.neutron.v2_0.lb import member as neu2
 from openstackclient.network import common
 
 
@@ -48,7 +47,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteMember(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/lb/vip.py b/openstackclient/network/v2_0/lb/vip.py
@@ -15,7 +15,6 @@
 
 """Load Balancer VIP action implementations"""
 
-from neutronclient.neutron.v2_0.lb import vip as neu2
 from openstackclient.network import common
 
 
@@ -62,7 +61,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteVip(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/security_group.py b/openstackclient/network/v2_0/security_group.py
@@ -15,7 +15,6 @@
 
 """Security Group action implementations"""
 
-from neutronclient.neutron.v2_0 import securitygroup as neu2
 from openstackclient.network import common
 
 
@@ -35,7 +34,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteSecurityGroup(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/security_group_rule.py b/openstackclient/network/v2_0/security_group_rule.py
@@ -17,7 +17,6 @@
 
 import argparse
 
-from neutronclient.neutron.v2_0 import securitygroup as neu2
 from openstackclient.network import common
 
 
@@ -57,7 +56,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteSecurityGroupRule(common.DeleteCommand):
@@ -72,7 +71,7 @@ class ListSecurityGroupRule(common.ListCommand):
 
     resource = 'security_group_rule'
     list_columns = ['id', 'security_group_id', 'direction', 'protocol',
-                    'remote_ip_prefix','remote_group_id']
+                    'remote_ip_prefix', 'remote_group_id']
 
     def get_parser(self, prog_name):
         parser = super(ListSecurityGroupRule, self).get_parser(prog_name)
diff --git a/openstackclient/network/v2_0/subnet.py b/openstackclient/network/v2_0/subnet.py
@@ -15,7 +15,6 @@
 
 """Subnet action implementations"""
 
-from neutronclient.neutron.v2_0 import subnet as neu2
 from openstackclient.network import common
 
 
@@ -98,7 +97,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteSubnet(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/vpn/__init__.py b/openstackclient/network/v2_0/vpn/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
diff --git a/openstackclient/network/v2_0/vpn/ikepolicy.py b/openstackclient/network/v2_0/vpn/ikepolicy.py
@@ -16,7 +16,6 @@
 """IKE Policy action implementations"""
 
 from neutronclient.common import utils
-from neutronclient.neutron.v2_0.vpn import ikepolicy as neu2
 from neutronclient.neutron.v2_0.vpn import utils as vpn_utils
 from openstackclient.network import common
 
@@ -66,7 +65,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteIkepolicy(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/vpn/ipsecpolicy.py b/openstackclient/network/v2_0/vpn/ipsecpolicy.py
@@ -16,7 +16,6 @@
 """IPSec Policy action implementations"""
 
 from neutronclient.common import utils
-from neutronclient.neutron.v2_0.vpn import ipsecpolicy as neu2
 from neutronclient.neutron.v2_0.vpn import utils as vpn_utils
 from openstackclient.network import common
 
@@ -65,7 +64,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteIpsecpolicy(common.DeleteCommand):
diff --git a/openstackclient/network/v2_0/vpn/service.py b/openstackclient/network/v2_0/vpn/service.py
@@ -15,7 +15,6 @@
 
 """VPN action implementations"""
 
-from neutronclient.neutron.v2_0.vpn import vpnservice as neu2
 from openstackclient.network import common
 
 
@@ -45,7 +44,7 @@ def get_parser(self, prog_name):
         return parser
 
     def get_body(self, parsed_args):
-        return { self.resource: { } }
+        return {self.resource: {}}
 
 
 class DeleteService(common.DeleteCommand):
diff --git a/openstackclient/tests/network/v2_0/fw/__init__.py b/openstackclient/tests/network/v2_0/fw/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
diff --git a/openstackclient/tests/network/v2_0/lb/__init__.py b/openstackclient/tests/network/v2_0/lb/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
diff --git a/openstackclient/tests/network/v2_0/vpn/__init__.py b/openstackclient/tests/network/v2_0/vpn/__init__.py
@@ -1,14 +0,0 @@
-#   Copyright 2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
