replacing old openshift api with new one

Author: izapolsk

wrapanapi/containers/providers/rhopenshift.py

@@ -138,40 +138,25 @@ def __init__(self, hostname, protocol="https", port=8443, k_entry="api/v1", o_en
         self.api = self.k_api  # default api is the kubernetes one for Kubernetes-class requests
         self.list_image_openshift = self.list_docker_image  # For backward compatibility
 
-    def list_route(self):
+    def list_route(self, namespace=None):
         """Returns list of routes"""
-        entities = []
-        entities_j = self.o_api.get('route')[1]['items']
-        for entity_j in entities_j:
-            meta = entity_j['metadata']
-            entity = Route(self, meta['name'], meta['namespace'])
-            entities.append(entity)
-        return entities
+        if namespace:
+            routes = self.o_api.list_namespaced_route(namespace=namespace).items
+        else:
+            routes = self.o_api.list_route_for_all_namespaces().items
+        return routes
 
-    def list_docker_registry(self):
-        """Returns list of docker registries"""
-        entities = []
-        entities_j = self.o_api.get('imagestream')[1]['items']
-        for entity_j in entities_j:
-            if 'dockerImageRepository' not in entity_j['status']:
-                continue
-            meta = entity_j['metadata']
-            entity = ImageRegistry(self, meta['name'],
-                                   entity_j['status']['dockerImageRepository'],
-                                   meta['namespace'])
-            if entity not in entities:
-                entities.append(entity)
-        return entities
+    def list_image_streams(self, namespace=None):
+        """Returns list of image streams"""
+        if namespace:
+            image_streams = self.o_api.list_namespaced_image_stream(namespace=namespace).items
+        else:
+            image_streams = self.o_api.list_image_stream_for_all_namespaces().items
+        return image_streams
 
     def list_project(self):
         """Returns list of projects"""
-        entities = []
-        entities_j = self.o_api.get('project')[1]['items']
-        for entity_j in entities_j:
-            meta = entity_j['metadata']
-            entity = Project(self, meta['name'])
-            entities.append(entity)
-        return entities
+        return self.o_api.list_project().items
 
     def list_template(self, namespace=None):
         """Returns list of templates"""
@@ -1111,15 +1096,15 @@ def in_steady_state(self, vm_name):
     def can_rename(self):
         return hasattr(self, "rename_vm")
 
-    def list_project_(self):
+    def list_project__names(self):
         """Obtains project names
 
         Returns: list of project names
         """
         projects = self.o_api.list_project().items
         return [proj.metadata.name for proj in projects]
 
-    list_vm = list_project_
+    list_vm = list_project_names
 
     def delete_template(self, template_name, namespace='openshift'):
         """Deletes template