Fix typos of retrieve

doc/topics/sdb/index.rst

@@ -71,7 +71,7 @@ Once an SDB driver is configured, you can use the ``sdb`` execution module to
 set and get values from it. There are two functions that will appear in any
 SDB module: ``set`` and ``get``.
 
-Getting a value requires only the SDB URI to be specified. To retreive a value
+Getting a value requires only the SDB URI to be specified. To retrieve a value
 from the ``kevinopenstack`` profile above, you would use:
 
 .. code-block:: bash
@@ -116,7 +116,7 @@ entry as usual, and set the value to the SDB URI. For instance:
     mykey: sdb://myetcd/mykey
 
 To retrieve this value using a module, the module in question must use the
-``config.get`` function to retrive configuration values. This would look
+``config.get`` function to retrieve configuration values. This would look
 something like:
 
 .. code-block:: python

salt/client/__init__.py

@@ -1182,7 +1182,7 @@ class LocalClient(object):
                 log.warning('jid does not exist')
                 return ret
         except Exception as exc:
-            raise SaltClientError('Load could not be retreived from '
+            raise SaltClientError('Load could not be retrieved from '
                                   'returner {0}. Exception details: {1}'.format(
                                       self.opts['master_job_cache'],
                                       exc))

salt/client/ssh/wrapper/cp.py

@@ -65,7 +65,7 @@ def get_dir(path, dest, saltenv='base'):
 
 def get_url(path, dest, saltenv='base'):
     '''
-    retrive a URL
+    retrieve a URL
     '''
     src = __context__['fileclient'].get_url(
         path,

salt/modules/git.py

@@ -302,7 +302,7 @@ def _get_toplevel(path, user=None):
 
 def _git_config(cwd, user):
     '''
-    Helper to retrive git config options
+    Helper to retrieve git config options
     '''
     contextkey = 'git.config.' + cwd
     if contextkey not in __context__:

salt/modules/mine.py

@@ -72,7 +72,7 @@ def _mine_get(load, opts):
             load['tok'] = _auth().gen_token('salt')
         except AttributeError:
             log.error('Mine could not authenticate with master. '
-                      'Mine could not be retreived.'
+                      'Mine could not be retrieved.'
                       )
             return False
     channel = salt.transport.Channel.factory(opts)

salt/modules/neutron.py

@@ -994,7 +994,7 @@ def delete_security_group_rule(security_group_rule_id, profile=None):
     return conn.delete_security_group_rule(security_group_rule_id)
 
 
-def list_vpnservices(retrive_all=True, profile=None, **kwargs):
+def list_vpnservices(retrieve_all=True, profile=None, **kwargs):
     '''
     Fetches a list of all configured VPN services for a tenant
 
@@ -1004,12 +1004,12 @@ def list_vpnservices(retrive_all=True, profile=None, **kwargs):
 
         salt '*' neutron.list_vpnservices
 
-    :param retrive_all: True or False, default: True (Optional)
+    :param retrieve_all: True or False, default: True (Optional)
     :param profile: Profile to build on (Optional)
     :return: List of VPN service
     '''
     conn = _auth(profile)
-    return conn.list_vpnservices(retrive_all, **kwargs)
+    return conn.list_vpnservices(retrieve_all, **kwargs)
 
 
 def show_vpnservice(vpnservice, profile=None, **kwargs):

salt/utils/cache.py

@@ -119,7 +119,7 @@ class CacheDisk(CacheDict):
             return {}
         with salt.utils.fopen(self._path, 'r') as fp_:
             cache = msgpack.load(fp_)
-        log.debug('Disk cache retreive: {0}'.format(cache))
+        log.debug('Disk cache retrieved: {0}'.format(cache))
         return cache
 
     def _write(self):

salt/utils/openstack/neutron.py

@@ -551,11 +551,11 @@ class SaltNeutron(NeutronShell):
             security_group_rule=sec_grp_rule_id)
         return ret if ret else True
 
-    def list_vpnservices(self, retrive_all=True, **kwargs):
+    def list_vpnservices(self, retrieve_all=True, **kwargs):
         '''
         Fetches a list of all configured VPN services for a tenant
         '''
-        return self.network_conn.list_vpnservices(retrive_all, **kwargs)
+        return self.network_conn.list_vpnservices(retrieve_all, **kwargs)
 
     def show_vpnservice(self, vpnservice, **kwargs):
         '''

tests/unit/modules/neutron_test.py

@@ -345,11 +345,11 @@ class MockNeutron(object):
         return security_group_rule_id
 
     @staticmethod
-    def list_vpnservices(retrive_all, **kwargs):
+    def list_vpnservices(retrieve_all, **kwargs):
         """
         Mock of list_vpnservices method
         """
-        return (retrive_all, kwargs)
+        return (retrieve_all, kwargs)
 
     @staticmethod
     def show_vpnservice(vpnservice, **kwargs):

tests/unit/utils/context_test.py

@@ -58,8 +58,8 @@ class ContextCacheTest(TestCase):
 
         # Test cache de-serialize
         cc = salt.utils.cache.ContextCache(__opts__, __name__)
-        retreived_cache = cc.get_cache_context()
-        self.assertDictEqual(retreived_cache, __context__)
+        retrieved_cache = cc.get_cache_context()
+        self.assertDictEqual(retrieved_cache, __context__)
 
     def test_refill_cache(self):
         '''