From 8730b1638b4c4e796eeca0ab45faec8eb971ad3b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 1 Apr 2020 09:00:47 +0200
Subject: [PATCH] Hacking: Fix F601

Fix:
F601 dictionary key 'qos' repeated with different values

Change-Id: Ie957c3ed84f13363ec53a5b26c52002e79d6f5b8
---
 manila/tests/db/migrations/alembic/migrations_data_checks.py | 1 -
 manila/tests/share/drivers/netapp/dataontap/fakes.py         | 4 ----
 manila/tests/share/drivers/test_service_instance.py          | 1 -
 tox.ini                                                      | 3 +--
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/manila/tests/db/migrations/alembic/migrations_data_checks.py b/manila/tests/db/migrations/alembic/migrations_data_checks.py
index e9d1471c2b..3ea05119d7 100644
--- a/manila/tests/db/migrations/alembic/migrations_data_checks.py
+++ b/manila/tests/db/migrations/alembic/migrations_data_checks.py
@@ -130,7 +130,6 @@ def fake_share(**kwargs):
         'display_name': 'fake_share',
         'display_description': 'my fake share',
         'snapshot_id': uuidutils.generate_uuid(),
-        'share_proto': 'nfs',
         'is_public': True,
         'size': 1,
         'deleted': 'False',
diff --git a/manila/tests/share/drivers/netapp/dataontap/fakes.py b/manila/tests/share/drivers/netapp/dataontap/fakes.py
index 0fd7b60551..d2de19d000 100644
--- a/manila/tests/share/drivers/netapp/dataontap/fakes.py
+++ b/manila/tests/share/drivers/netapp/dataontap/fakes.py
@@ -662,7 +662,6 @@ POOLS = [
         'total_capacity_gb': 3.3,
         'free_capacity_gb': 1.1,
         'allocated_capacity_gb': 2.2,
-        'qos': 'False',
         'reserved_percentage': 5,
         'dedupe': [True, False],
         'compression': [True, False],
@@ -685,7 +684,6 @@ POOLS = [
         'total_capacity_gb': 6.0,
         'free_capacity_gb': 2.0,
         'allocated_capacity_gb': 4.0,
-        'qos': 'False',
         'reserved_percentage': 5,
         'dedupe': [True, False],
         'compression': [True, False],
@@ -711,7 +709,6 @@ POOLS_VSERVER_CREDS = [
         'total_capacity_gb': 'unknown',
         'free_capacity_gb': 1.1,
         'allocated_capacity_gb': 0.0,
-        'qos': 'False',
         'reserved_percentage': 5,
         'dedupe': [True, False],
         'compression': [True, False],
@@ -731,7 +728,6 @@ POOLS_VSERVER_CREDS = [
         'total_capacity_gb': 'unknown',
         'free_capacity_gb': 2.0,
         'allocated_capacity_gb': 0.0,
-        'qos': 'False',
         'reserved_percentage': 5,
         'dedupe': [True, False],
         'compression': [True, False],
diff --git a/manila/tests/share/drivers/test_service_instance.py b/manila/tests/share/drivers/test_service_instance.py
index 3c0ad3a0fe..10426316c5 100644
--- a/manila/tests/share/drivers/test_service_instance.py
+++ b/manila/tests/share/drivers/test_service_instance.py
@@ -1046,7 +1046,6 @@ class ServiceInstanceManagerTestCase(test.TestCase):
             'instance_id': server_get['id'],
             'ip': ip_address,
             'networks': server_get['networks'],
-            'router_id': network_data['router']['id'],
             'public_port_id': 'fake_public_port',
             'service_port_id': 'fake_service_port',
             'admin_port_id': 'fake_admin_port',
diff --git a/tox.ini b/tox.ini
index 38cebe48c0..ff39aad5b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -140,8 +140,7 @@ commands = alembic -c manila/db/migrations/alembic.ini revision -m ""{posargs}
 # E731 do not assign a lambda expression, use a def
 # E117 over-indented
 # E226 missing whitespace around arithmetic operator
-# F601 dictionary key 'qos' repeated with different values
-ignore = E117,E123,E226,E241,E305,E402,E731,E741,F601,W503,W504,W605
+ignore = E117,E123,E226,E241,E305,E402,E731,E741,W503,W504,W605
 builtins = _
 # [H106] Don't put vim configuration in source files.
 # [H203] Use assertIs(Not)None to check for None.