diff --git a/tacker/tests/unit/vnfm/test_vim_client.py b/tacker/tests/unit/vnfm/test_vim_client.py
index 934b8809f..89b1979d0 100644
--- a/tacker/tests/unit/vnfm/test_vim_client.py
+++ b/tacker/tests/unit/vnfm/test_vim_client.py
@@ -9,8 +9,8 @@
 #    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
 
+import mock
 from sqlalchemy.orm import exc as orm_exc
 
 from tacker.extensions import nfvo
@@ -23,17 +23,84 @@ class TestVIMClient(base.TestCase):
 
     def setUp(self):
         super(TestVIMClient, self).setUp()
-        self.vim_info = {'id': 'aaaa', 'name': 'VIM0',
-                         'auth_cred': {'password': '****'}, 'type': 'test_vim'}
+        self.vim_info = {'id': 'aaaa', 'name': 'VIM0', 'type': 'test_vim',
+                         'auth_cred': {'password': '****'},
+                         'auth_url': 'http://127.0.0.1/identity/v3',
+                         'placement_attr': {'regions': ['TestRegionOne']}}
+        self.vimclient = vim_client.VimClient()
+        self.service_plugins = mock.Mock()
+        self.nfvo_plugin = mock.Mock()
 
     def test_get_vim_without_defined_default_vim(self):
-        vimclient = vim_client.VimClient()
-        service_plugins = mock.Mock()
-        nfvo_plugin = mock.Mock()
-        nfvo_plugin.get_default_vim.side_effect = \
+        self.nfvo_plugin.get_default_vim.side_effect = \
             orm_exc.NoResultFound()
-        service_plugins.get.return_value = nfvo_plugin
+        self.service_plugins.get.return_value = self.nfvo_plugin
         with mock.patch.object(manager.TackerManager, 'get_service_plugins',
-                               return_value=service_plugins):
+                               return_value=self.service_plugins):
             self.assertRaises(nfvo.VimDefaultNotDefined,
-                              vimclient.get_vim, None)
+                              self.vimclient.get_vim, None)
+
+    def test_get_vim_not_found_exception(self):
+        vim_id = self.vim_info['id']
+        self.nfvo_plugin.get_vim.side_effect = \
+            orm_exc.NoResultFound()
+        self.service_plugins.get.return_value = self.nfvo_plugin
+        with mock.patch.object(manager.TackerManager, 'get_service_plugins',
+                               return_value=self.service_plugins):
+            self.assertRaises(nfvo.VimNotFoundException,
+                              self.vimclient.get_vim, None, vim_id=vim_id)
+
+    def test_get_vim_region_not_found_region_name_invalid(self):
+        self.nfvo_plugin.get_vim.return_value = self.vim_info
+        self.service_plugins.get.return_value = self.nfvo_plugin
+        with mock.patch.object(manager.TackerManager, 'get_service_plugins',
+                               return_value=self.service_plugins):
+            self.assertRaises(nfvo.VimRegionNotFoundException,
+                              self.vimclient.get_vim, None,
+                              vim_id=self.vim_info['id'],
+                              region_name='Test')
+
+    def test_get_vim(self):
+        self.nfvo_plugin.get_vim.return_value = self.vim_info
+        self.service_plugins.get.return_value = self.nfvo_plugin
+        self.vimclient._build_vim_auth = mock.Mock()
+        self.vimclient._build_vim_auth.return_value = {'password': '****'}
+        with mock.patch.object(manager.TackerManager, 'get_service_plugins',
+                               return_value=self.service_plugins):
+            vim_result = self.vimclient.get_vim(None,
+                                                vim_id=self.vim_info['id'],
+                                                region_name='TestRegionOne')
+            vim_expect = {'vim_auth': {'password': '****'}, 'vim_id': 'aaaa',
+                          'vim_name': 'VIM0', 'vim_type': 'test_vim'}
+            self.assertEqual(vim_expect, vim_result)
+
+    def test_get_vim_with_default_name(self):
+        self.vim_info.pop('name')
+        self.nfvo_plugin.get_vim.return_value = self.vim_info
+        self.service_plugins.get.return_value = self.nfvo_plugin
+        self.vimclient._build_vim_auth = mock.Mock()
+        self.vimclient._build_vim_auth.return_value = {'password': '****'}
+        with mock.patch.object(manager.TackerManager, 'get_service_plugins',
+                               return_value=self.service_plugins):
+            vim_result = self.vimclient.get_vim(None,
+                                                vim_id=self.vim_info['id'],
+                                                region_name='TestRegionOne')
+            vim_expect = {'vim_auth': {'password': '****'}, 'vim_id': 'aaaa',
+                          'vim_name': 'aaaa', 'vim_type': 'test_vim'}
+            self.assertEqual(vim_expect, vim_result)
+
+    def test_find_vim_key_with_key_not_found_exception(self):
+        vim_id = self.vim_info['id']
+        self.assertRaises(nfvo.VimKeyNotFoundException,
+                          self.vimclient._find_vim_key, vim_id)
+
+    def test_region_valid_false(self):
+        vim_regions = ['TestRegionOne', 'TestRegionTwo']
+        region_name = 'TestRegion'
+        self.assertFalse(self.vimclient.region_valid(vim_regions,
+                                                     region_name))
+
+    def test_region_valid_true(self):
+        vim_regions = ['TestRegionOne', 'TestRegionTwo']
+        region_name = 'TestRegionOne'
+        self.assertTrue(self.vimclient.region_valid(vim_regions, region_name))