Refactor CloudManager et al.

frontend/src/components/cluster/ClustersList.vue

@@ -42,23 +42,6 @@
                   <code>centos</code></v-col
                 >
               </v-row>
-              <v-row>
-                <v-col>FreeIPA admin username</v-col>
-                <v-col>
-                  <copy-button :color="expandedContentColor" text="admin" />
-                  <code>admin</code></v-col
-                >
-              </v-row>
-              <v-row>
-                <v-col>FreeIPA admin password</v-col>
-                <v-col>
-                  <template v-if="item.freeipa_passwd">
-                    <copy-button :color="expandedContentColor" :text="item.freeipa_passwd" />
-                    <password-display :password="item.freeipa_passwd" :color="expandedContentColor" />
-                  </template>
-                  <span v-else>not available</span>
-                </v-col>
-              </v-row>
               <v-row>
                 <v-col>Guest usernames</v-col>
                 <v-col>

frontend/src/repositories/DomainsRepository.js

@@ -0,0 +1,9 @@
+import Repository from "./Repository";
+
+const resource = "/domains";
+
+export default {
+  getDomains() {
+    return Repository.get(`${resource}/`);
+  },
+};

frontend/tests/unit/components/cluster/ClusterEditor.spec.js

@@ -8,6 +8,10 @@ import { cloneDeep } from "lodash";
 import moxios from 'moxios';
 import Repository from "@/repositories/Repository";
 
+import { jest } from "@jest/globals";
+
+jest.setTimeout(100);
+
 Vue.use(Vuetify);
 
 const localVue = createLocalVue();
@@ -58,16 +62,20 @@ const DEFAULT_POSSIBLE_RESOURCES = Object.freeze({
   tag_types: {"mgmt": ["p4-6gb", "c2-7.5gb-31"], "login": ["p2-3gb", "p4-6gb"], "node": ["p2-3gb", "p4-6gb"]},
   "types": ["p1-1.5gb", "p2-3gb", "p4-6gb"],
   volumes: {},
+});
+
+const DEFAULT_DOMAINS =   Object.freeze({
   domain: ["magic-castle.cloud", "mc.ca"]
 });
 
 const DEFAULT_QUOTAS = Object.freeze({
-  instance_count: { max: 115 },
-  ram: { max: 221184 },
-  vcpus: { max: 224 },
-  volume_count: { max: 114 },
-  volume_size: { max: 490 },
-  ips: { max: 3 },
+  instance_count: 115,
+  ram: 221184,
+  vcpus: 224,
+  ports: 200,
+  volume_count: 114,
+  volume_size: 490,
+  ips: 3,
 });
 
 const DEFAULT_RESOURCE_DETAILS = Object.freeze({
@@ -93,6 +101,7 @@ async function getDefaultClusterEditorWrapper(existingCluster=true, hostname="te
     }
   });
   await wrapper.vm.promise;
+  await wrapper.vm.promise_dns;
   return wrapper;
 }
 
@@ -102,23 +111,30 @@ describe("ClusterEditor", () => {
     // import and pass your custom axios instance to this method
     moxios.install(Repository)
     moxios.wait(function () {
-      let request = moxios.requests.mostRecent();
-      if(request.url.includes("/available-resources")) {
-        request.respondWith({
-          status: 200,
-          response: {
-            'possible_resources': DEFAULT_POSSIBLE_RESOURCES,
-            'quotas': DEFAULT_QUOTAS,
-            'resource_details': DEFAULT_RESOURCE_DETAILS
-          }
-        })
-      } else if (request.url.includes("/users/me")) {
-        request.respondWith({
-          status: 200,
-          response: DEFAULT_USER
-        })
-      } else {
-        console.log(request.url);
+      for(let i = 0; i < moxios.requests.count(); i++) {
+        let request = moxios.requests.at(i);
+        if(request.url.includes("/available-resources")) {
+          request.respondWith({
+            status: 200,
+            response: {
+              'possible_resources': DEFAULT_POSSIBLE_RESOURCES,
+              'quotas': DEFAULT_QUOTAS,
+              'resource_details': DEFAULT_RESOURCE_DETAILS
+            }
+          })
+        } else if (request.url.includes("/users/me")) {
+          request.respondWith({
+            status: 200,
+            response: DEFAULT_USER
+          })
+        } else if (request.url.includes("/domains")) {
+          request.respondWith({
+            status: 200,
+            response: DEFAULT_DOMAINS
+          })
+        } else {
+          console.log(request.url);
+        }
       }
     })
   })

mchub/__init__.py

@@ -10,7 +10,8 @@ def create_app(db_path=None):
     from .database import db
     from .resources.magic_castle_api import MagicCastleAPI
     from .resources.progress_api import ProgressAPI
-    from .resources.available_resources_api import AvailableResourcesApi
+    from .resources.available_resources_api import AvailableResourcesAPI
+    from .resources.domains_api import DomainsAPI
     from .resources.user_api import UserAPI
     from .resources.project_api import ProjectAPI
     from .resources.template_api import TemplateAPI
@@ -54,7 +55,14 @@ def create_app(db_path=None):
         methods=["GET"],
     )
 
-    available_resources_view = AvailableResourcesApi.as_view("available_resources")
+    domains_view = DomainsAPI.as_view("domains")
+    app.add_url_rule(
+        "/api/domains/",
+        view_func=domains_view,
+        methods=["GET"],
+    )
+
+    available_resources_view = AvailableResourcesAPI.as_view("available_resources")
     app.add_url_rule(
         "/api/available-resources/host/<string:hostname>",
         view_func=available_resources_view,

mchub/models/cloud/cloud_manager.py

@@ -1,26 +1,36 @@
 from ..cloud.openstack_manager import OpenStackManager
-from ..cloud.dns_manager import DnsManager
 
 MANAGER_CLASSES = {
     "openstack": OpenStackManager,
 }
 
 class CloudManager:
-    def __init__(self, project, **kwargs):
-        manager_class = MANAGER_CLASSES.get(project.provider)
-        if manager_class:
-            self.manager = manager_class(project=project, **kwargs)
+    def __init__(self, project, allocated_resources):
+        if project:
+            manager_class = MANAGER_CLASSES.get(project.provider)
+            if manager_class:
+                self.manager = manager_class(project, allocated_resources)
+            else:
+                raise ValueError(f"Unknown cloud provider {project.provider}")
         else:
-            raise ValueError("Invalid cloud provider")
+            self.manager = DefaultCloudManager(project, allocated_resources)
 
     @property
     def available_resources(self):
         """
-        Retrieves the available cloud resources including resources from OpenStack
-        and available domains.
+        Retrieves the available cloud resources from the cloud provider.
         """
-        available_resources = self.manager.available_resources
-        available_resources["possible_resources"][
-            "domain"
-        ] = DnsManager.get_available_domains()
-        return available_resources
+        return self.manager.available_resources
+
+class DefaultCloudManager:
+    def __init__(self, project, allocated_resources):
+        self.project = project
+        self.allocated_resources = allocated_resources
+
+    @property
+    def available_resources(self):
+        return {
+            "quotas": {},
+            "possible_resources": {},
+            "resource_details": {},
+        }