perlchild
diff --git a/‎salt/fileclient.py
Lines chan 10000 ged: 23 additions & 0 deletions b/‎salt/fileclient.py
Lines chan 10000 ged: 23 additions & 0 deletions
diff --git a/‎salt/modules/cp.py
Lines changed: 23 additions & 0 deletions b/‎salt/modules/cp.py
Lines changed: 23 additions & 0 deletions
diff --git a/‎tests/unit/test_fileclient.py
Lines changed: 48 additions & 0 deletions b/‎tests/unit/test_fileclient.py
Lines changed: 48 additions & 0 deletions
@@ -341,6 +341,29 @@ def is_cached(self, path, saltenv='base', cachedir=None):
 
         return ''
 
+    def cache_dest(self, url, saltenv='base', cachedir=None):
+        '''
+        Return the expected cache location for the specified URL and
+        environment.
+        '''
+        proto = urlparse(url).scheme
+
+        if proto == '':
+            # Local file path
+            return url
+
+        if proto == 'salt':
+            url, senv = salt.utils.url.parse(url)
+            if senv:
+                saltenv = senv
+            return salt.utils.path.join(
+                self.opts['cachedir'],
+                'files',
+                saltenv,
+                url.lstrip('|/'))
+
+        return self._extrn_path(url, saltenv, cachedir=cachedir)
+
     def list_states(self, saltenv):
         '''
         Return a list of all available sls modules on the master for a given
 
@@ -525,6 +525,29 @@ def cache_file(path, saltenv='base', source_hash=None):
     return result
 
 
+def cache_dest(url, saltenv='base'):
+    '''
+    .. versionadded:: Neon
+
+    Returns the expected cache path for the file, if cached using
+    :py:func:`cp.cache_file <salt.modules.cp.cache_file>`.
+
+    .. note::
+        This only returns the _expected_ path, it does not tell you if the URL
+        is really cached. To check if the URL is cached, use
+        :py:func:`cp.is_cached <salt.modules.cp.is_cached>` instead.
+
+    CLI Examples:
+
+    .. code-block:: bash
+
+        salt '*' cp.cache_dest https://foo.com/bar.rpm
+        salt '*' cp.cache_dest salt://my/file
+        salt '*' cp.cache_dest salt://my/file saltenv=dev
+    '''
+    return _client().cache_dest(url, saltenv)
+
+
 def cache_files(paths, saltenv='base'):
     '''
     Used to gather many files from the Master, the gathered files will be
 
@@ -411,3 +411,51 @@ def test_cache_file_with_alternate_cachedir_and_relative_path(self):
                 log.debug('cache_loc = %s', cache_loc)
                 log.debug('content = %s', content)
                 self.assertTrue(saltenv in content)
+
+    def test_cache_dest(self):
+        '''
+        Tests functionality for cache_dest
+        '''
+        patched_opts = dict((x, y) for x, y in six.iteritems(self.minion_opts))
+        patched_opts.update(self.MOCKED_OPTS)
+
+        relpath = 'foo.com/bar.txt'
+        cachedir = self.minion_opts['cachedir']
+
+        def _external(saltenv='base'):
+            return salt.utils.path.join(
+                patched_opts['cachedir'],
+       
8000
         'extrn_files',
+                saltenv,
+                relpath)
+
+        def _salt(saltenv='base'):
+            return salt.utils.path.join(
+                patched_opts['cachedir'],
+                'files',
+                saltenv,
+                relpath)
+
+        def _check(ret, expected):
+            assert ret == expected, '{0} != {1}'.format(ret, expected)
+
+        with patch.dict(fileclient.__opts__, patched_opts):
+            client = fileclient.get_file_client(
+                fileclient.__opts__, pillar=False)
+
+            _check(client.cache_dest('https://' + relpath),
+                   _external())
+
+            _check(client.cache_dest('https://' + relpath, 'dev'),
+           
685C
        _external('dev'))
+
+            _check(client.cache_dest('salt://' + relpath),
+                   _salt())
+
+            _check(client.cache_dest('salt://' + relpath, 'dev'),
+                   _salt('dev'))
+
+            _check(client.cache_dest('salt://' + relpath + '?saltenv=dev'),
+                   _salt('dev'))
+
+            _check('/foo/bar', '/foo/bar')