Remove remotetype

This removes references to remote type since it isn't used
any longer.

Author: scanon

imagegw/shifter_imagegw/config.py

@@ -5,12 +5,19 @@
 
 
 class Location():
+    # Used to override the location as the URL
+    # This is not typically required.
+    url: str  = None
+    # Note this is deprecated but left for reference
     remotetype: str  = 'dockerv2'
+
+    # Note this is deprecated but left for reference
     authentication: str  = 'http'
-    url: str  = None
 
     def __init__(self, data: dict):
-        self.remotetype = data['remotetype']
+        rtype = data.get('remotetype', 'dockerv2')
+        if rtype != 'dockerv2':
+            raise NotImplementedError(f'Unsupported remote type {rtype}')
         self.authentication = data['authentication']
         self.url = data.get('url')
 

imagegw/shifter_imagegw/imageworker.py

@@ -274,13 +274,9 @@ def _pull_image(self):
 
         if location in self.conf.Locations:
             params = self.conf.Locations[location]
-            rtype = params.remotetype
         else:
             raise KeyError(f'{location} not found in configuration')
 
-        if rtype != 'dockerv2':
-            raise NotImplementedError(f'Unsupported remote type {rtype}')
-
         return self._pull_dockerv2(location, repo, tag)
 
     def _examine_image(self):

imagegw/test/imagemngr_test.py

@@ -142,7 +142,6 @@ def __init__(self):
             self.pull = {'system': self.system,
                          'itype': self.itype,
                          'tag': self.tag,
-                         'remotetype': 'dockerv2',
                          'userACL': [], 'groupACL': []}
             self.session = Session(uid=100, gid=100, system=self.system,
                                    user="user", group="user")
@@ -652,7 +651,6 @@ def xtest_pull_testimage(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': 'scanon/shanetest:latest',
-        'remotetype': 'dockerv2',
         'userACL': [],
         'groupACL': []
     }
@@ -797,7 +795,6 @@ def test_pulls_acl_change(ctx):
         'system': record['system'],
         'itype': record['itype'],
         'tag': record['pulltag'],
-        'remotetype': 'dockerv2',
         'userACL': [1001, 1002],
         'groupACL': [1003, 1004]
     }
@@ -817,7 +814,6 @@ def test_pull_logic(ctx):
         'system': record['system'],
         'itype': record['itype'],
         'tag': tag,
-        'remotetype': 'dockerv2',
     }
     id = ctx.images.insert_one(record).inserted_id
     assert id
@@ -874,7 +870,6 @@ def test_pull_public_acl(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': ctx.tag,
-        'remotetype': 'dockerv2',
         'userACL': [1001, 1002],
         'groupACL': [1003, 1004]
     }
@@ -913,7 +908,6 @@ def test_pull_public_acl_token(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': ctx.public,
-        'remotetype': 'dockerv2',
         'userACL': [1001, 1002],
         'groupACL': [1003, 1004]
     }
@@ -946,7 +940,6 @@ def test_pull_acl(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': ctx.private,
-        'remotetype': 'dockerv2',
         'userACL': [1001, 1002],
         'groupACL': [1003, 1004]
     }
@@ -1019,7 +1012,6 @@ def test_import(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': ctx.tag,
-        'remotetype': 'dockerv2',
         'filepath': '/images/test/test.squashfs',
         'format': 'squashfs',
         'userACL': [],
@@ -1270,7 +1262,6 @@ def test_pull_multiple_tags(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': ctx.public,
-        'remotetype': 'dockerv2'
     }
     # Do the pull
     session = ctx.session
@@ -1292,7 +1283,6 @@ def test_pull_multiple_tags(ctx):
         'system': ctx.system,
         'itype': ctx.itype,
         'tag': newtag,
-        'remotetype': 'dockerv2'
     }
     rec = ctx.m.pull(session, pr)  # ,delay=False)
     id = rec['_id']