From bd9d3a8fa5843dca49a4903d66f603f678ed0fa5 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Thu, 2 Aug 2018 08:58:59 -0500
Subject: Rename varlink socket and interface

io.projectatomic.podman -> io.podman

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1204
Approved by: mheon
---
 contrib/python/podman/examples/run_example.sh |  4 ++--
 contrib/python/podman/podman/client.py        | 10 +++++-----
 contrib/python/podman/podman/libs/errors.py   |  8 ++++----
 contrib/python/podman/test/test_client.py     |  4 ++--
 contrib/python/podman/test/test_runner.sh     |  2 +-
 contrib/python/podman/test/test_tunnel.py     |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'contrib/python/podman')

diff --git a/contrib/python/podman/examples/run_example.sh b/contrib/python/podman/examples/run_example.sh
index 0f6575073..d81ddf456 100755
--- a/contrib/python/podman/examples/run_example.sh
+++ b/contrib/python/podman/examples/run_example.sh
@@ -22,8 +22,8 @@ if [[ $(id -u) != 0 ]]; then
   exit 2
 fi
 
-if ! systemctl --quiet is-active io.projectatomic.podman.socket; then
-  echo 1>&2 'podman is not running. systemctl enable --now io.projectatomic.podman.socket'
+if ! systemctl --quiet is-active io.podman.socket; then
+  echo 1>&2 'podman is not running. systemctl enable --now io.podman.socket'
   exit 1
 fi
 
diff --git a/contrib/python/podman/podman/client.py b/contrib/python/podman/podman/client.py
index fedd9310e..327bfdee2 100644
--- a/contrib/python/podman/podman/client.py
+++ b/contrib/python/podman/podman/client.py
@@ -31,7 +31,7 @@ class BaseClient():
     @classmethod
     def factory(cls,
                 uri=None,
-                interface='io.projectatomic.podman',
+                interface='io.podman',
                 *args,
                 **kwargs):
         """Construct a Client based on input."""
@@ -153,18 +153,18 @@ class Client():
 
         >>> import podman
         >>> c = podman.Client(uri='unix:/tmp/podman.sock',
-                              remote_uri='ssh://user@host/run/podman/io.projectatomic.podman',
+                              remote_uri='ssh://user@host/run/podman/io.podman',
                               identity_file='~/.ssh/id_rsa')
     """
 
     def __init__(self,
-                 uri='unix:/run/podman/io.projectatomic.podman',
-                 interface='io.projectatomic.podman',
+                 uri='unix:/run/podman/io.podman',
+                 interface='io.podman',
                  **kwargs):
         """Construct a podman varlink Client.
 
         uri from default systemd unit file.
-        interface from io.projectatomic.podman.varlink, do not change unless
+        interface from io.podman.varlink, do not change unless
             you are a varlink guru.
         """
         self._client = BaseClient.factory(uri, interface, **kwargs)
diff --git a/contrib/python/podman/podman/libs/errors.py b/contrib/python/podman/podman/libs/errors.py
index d34577a57..9d7559c84 100644
--- a/contrib/python/podman/podman/libs/errors.py
+++ b/contrib/python/podman/podman/libs/errors.py
@@ -50,10 +50,10 @@ class PodmanError(VarlinkErrorProxy):
 
 
 ERROR_MAP = {
-    'io.projectatomic.podman.ContainerNotFound': ContainerNotFound,
-    'io.projectatomic.podman.ErrorOccurred': ErrorOccurred,
-    'io.projectatomic.podman.ImageNotFound': ImageNotFound,
-    'io.projectatomic.podman.RuntimeError': PodmanError,
+    'io.podman.ContainerNotFound': ContainerNotFound,
+    'io.podman.ErrorOccurred': ErrorOccurred,
+    'io.podman.ImageNotFound': ImageNotFound,
+    'io.podman.RuntimeError': PodmanError,
 }
 
 
diff --git a/contrib/python/podman/test/test_client.py b/contrib/python/podman/test/test_client.py
index d36cb1a43..3fc6d39dc 100644
--- a/contrib/python/podman/test/test_client.py
+++ b/contrib/python/podman/test/test_client.py
@@ -15,7 +15,7 @@ class TestClient(unittest.TestCase):
     def test_local(self, mock_ping):
         p = Client(
             uri='unix:/run/podman',
-            interface='io.projectatomic.podman',
+            interface='io.podman',
         )
 
         self.assertIsInstance(p._client, LocalClient)
@@ -27,7 +27,7 @@ class TestClient(unittest.TestCase):
     def test_remote(self, mock_ping):
         p = Client(
             uri='unix:/run/podman',
-            interface='io.projectatomic.podman',
+            interface='io.podman',
             remote_uri='ssh://user@hostname/run/podman/podman',
             identity_file='~/.ssh/id_rsa')
 
diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh
index 17dd2a30c..a9142d36d 100755
--- a/contrib/python/podman/test/test_runner.sh
+++ b/contrib/python/podman/test/test_runner.sh
@@ -106,7 +106,7 @@ RUN chmod 755 /tmp/hello.sh
 ENTRYPOINT ["/tmp/hello.sh"]
 EOT
 
-export PODMAN_HOST="unix:${TMPDIR}/podman/io.projectatomic.podman"
+export PODMAN_HOST="unix:${TMPDIR}/podman/io.podman"
 PODMAN_ARGS="--storage-driver=vfs \
   --root=${TMPDIR}/crio \
   --runroot=${TMPDIR}/crio-run \
diff --git a/contrib/python/podman/test/test_tunnel.py b/contrib/python/podman/test/test_tunnel.py
index cdcc8466a..8ee4b1052 100644
--- a/contrib/python/podman/test/test_tunnel.py
+++ b/contrib/python/podman/test/test_tunnel.py
@@ -56,7 +56,7 @@ class TestTunnel(unittest.TestCase):
 
         context = Context(
             'unix:/01',
-            'io.projectatomic.podman',
+            'io.podman',
             '/tmp/user/socket',
             '/run/podman/socket',
             'user',
-- 
cgit v1.2.3-54-g00ecf