Removing dependency on the "mock" package

Now that we are python3 only, we should move to using the built
in version of mock that supports all of our testing needs and
remove the dependency on the "mock" package.

Also see commit: Ifcaf1c21bea0ec3c35278e49cecc90a101a82113

Change-Id: I11dc8a80471be347f89a30f59c1cc14cdb879726

lower-constraints.txt

@@ -6,7 +6,6 @@ fixtures==3.0.0
 flake8==2.6.2
 flake8-import-order==0.12
 hacking>=1.1.0 # Apache-2.0
-mock==2.0.0
 netaddr==0.7.18
 openstackdocstheme==1.18.1
 oslo.i18n==3.15.3

test-requirements.txt

@@ -8,7 +8,6 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.00
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
-mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0 # Apache-2.0

vmware_nsxlib/tests/unit/v3/nsxlib_testcase.py

@@ -15,8 +15,8 @@
 #
 import copy
 import unittest
+from unittest import mock
 
-import mock
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils
 from requests import models

vmware_nsxlib/tests/unit/v3/policy/test_ipsec_vpn_resources.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3.policy import test_resources
 from vmware_nsxlib.v3.policy import ipsec_vpn_defs

vmware_nsxlib/tests/unit/v3/policy/test_lb_resources.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3.policy import test_resources

vmware_nsxlib/tests/unit/v3/policy/test_resources.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3.policy import policy_testcase

vmware_nsxlib/tests/unit/v3/policy/test_transaction.py

@@ -16,7 +16,7 @@
 
 import copy
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3.policy import policy_testcase

vmware_nsxlib/tests/unit/v3/test_cert.py

@@ -15,8 +15,8 @@
 #
 
 import os
+from unittest import mock
 
-import mock
 from OpenSSL import crypto
 from oslo_serialization import jsonutils
 

vmware_nsxlib/tests/unit/v3/test_cluster.py

@@ -14,8 +14,8 @@
 #    under the License.
 #
 import unittest
+from unittest import mock
 
-import mock
 from requests import codes
 from requests import exceptions as requests_exceptions
 from requests import models

vmware_nsxlib/tests/unit/v3/test_cluster_management.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 

vmware_nsxlib/tests/unit/v3/test_load_balancer.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3 import test_constants as consts

vmware_nsxlib/tests/unit/v3/test_ns_group_manager.py

@@ -12,7 +12,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.v3 import exceptions as nsxlib_exc

vmware_nsxlib/tests/unit/v3/test_qos_switching_profile.py

@@ -14,8 +14,8 @@
 # limitations under the License.
 #
 import copy
+from unittest import mock
 
-import mock
 from oslo_log import log
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase

vmware_nsxlib/tests/unit/v3/test_resources.py

@@ -14,9 +14,9 @@
 #    under the License.
 #
 import copy
+from unittest import mock
 
 import eventlet
-import mock
 
 from oslo_serialization import jsonutils
 from oslo_utils import uuidutils

vmware_nsxlib/tests/unit/v3/test_router.py

@@ -15,8 +15,7 @@
 #
 
 import copy
-
+from unittest import mock
-import mock
 
 from oslo_utils import uuidutils
 

vmware_nsxlib/tests/unit/v3/test_security.py

@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
-import six
 
 from oslo_utils import uuidutils
+import six
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3 import test_constants

vmware_nsxlib/tests/unit/v3/test_trust_management.py

@@ -14,7 +14,7 @@
 #    under the License.
 #
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.tests.unit.v3 import test_constants as consts

vmware_nsxlib/tests/unit/v3/test_utils.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 from vmware_nsxlib.tests.unit.v3 import nsxlib_testcase
 from vmware_nsxlib.v3 import exceptions