Ops 948/auth kc test

.github/dependabot.yaml

@@ -0,0 +1,10 @@
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/pre-commit.yaml

@@ -0,0 +1,22 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Run pre-commit hooks
+        uses: pre-commit/[email protected]

.github/workflows/test-py39-functional-microshift.yaml → .github/workflows/test-functional-microshift.yaml

@@ -1,4 +1,4 @@
-name: test-py39-functional-microshift
+name: test-functional-microshift
 
 on:
   push:
@@ -9,19 +9,19 @@ on:
 env:
   PYTHONWARNINGS: ignore
   KUBECONFIG: ${{ github.workspace }}/kubeconfig
-  ACCT_MGT_VERSION: "6012025c247ab25fb2cab3be9ad06080e28713ee"
+  ACCT_MGT_VERSION: "cecbe131843e5033ab6f6fdce2b5a8af58d80f9d"
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: "3.9"
+          python-version: 3.12
 
       - name: Fix for "grup-efi-amd64-signed" missing
         run: |
@@ -35,6 +35,10 @@ jobs:
         run: |
           bash ./ci/setup-oc-client.sh
 
+      - name: Install Keycloak
+        run: |
+          bash ./ci/setup-keycloak.sh
+
       - name: Install Microshift
         run: |
           ./ci/microshift.sh

.github/workflows/test-functional-microstack.yaml

@@ -0,0 +1,41 @@
+name: test-functional-microstack
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.12
+
+      - name: Install Keycloak
+        run: |
+          bash ./ci/setup-keycloak.sh
+
+      - name: Install ColdFront and plugin
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r test-requirements.txt
+          pip install -e .
+
+      - name: Install and start Ceph RadosGW
+        run: |
+          sudo ./ci/radosgw.sh
+
+      - name: Install and start Microstack
+        run: |
+          ./ci/microstack.sh
+
+      - name: Run functional tests
+        run: |
+          ./ci/run_functional_tests_openstack.sh

.github/workflows/test-py39-unit.yaml → .github/workflows/test-unit.yaml

@@ -1,4 +1,4 @@
-name: test-py39-unit
+name: test-unit
 
 on:
   push:
@@ -8,20 +8,20 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
 
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+      - name: Set up Python
+        uses: actions/setup-python@v6
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Install ColdFront and plugin
         run: |
           ./ci/setup.sh
 
-      - name: Run functional tests
+      - name: Run unit tests
         run: |
           ./ci/run_unit_tests.sh

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-json
+      - id: check-merge-conflict
+      - id: check-case-conflict
+      - id: detect-private-key
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.11.6
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format

README.md

@@ -78,37 +78,36 @@ dashboard or through the helper command:
 
 ```bash
 $ coldfront add_openstack_resource
-usage: coldfront add_openstack_resource [-h] --name NAME --auth-url AUTH_URL [--users-domain USERS_DOMAIN] [--projects-domain PROJECTS_DOMAIN] --idp IDP
-                                        [--protocol PROTOCOL] [--role ROLE] [--version] [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback]
-                                        [--no-color] [--force-color]
+usage: coldfront add_openstack_resource [-h] --name NAME --auth-url AUTH_URL [--users-domain USERS_DOMAIN] [--projects-domain PROJECTS_DOMAIN] --idp IDP [--protocol PROTOCOL] [--role ROLE]
+                                        [--public-network PUBLIC_NETWORK] [--network-cidr NETWORK_CIDR] [--esi] [--version] [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback]
+                                        [--no-color] [--force-color] [--skip-checks]
 coldfront add_openstack_resource: error: the following arguments are required: --name, --auth-url, --idp
 ```
 
-### Configuring for OpenShift
+An Openstack resource can be specified as an ESI resource by setting the `--esi` command flag.
+ESI resource allocations will only have quotas for network resources by default.
 
-Note: OpenShift support requires deploying the [openshift-acct-mgt][]
-API service.
-
-[openshift-acct-mgt]: https://github.com/cci-moc/openshift-acct-mgt
+### Configuring for OpenShift
 
-Authentication for OpenShift is loaded as pairs of environment variables
-`OPENSHIFT_{resource_name}_USERNAME` and `OPENSHIFT_{resource_name}_PASSWORD`
+Authentication for OpenShift is loaded as a environment variable
+`OPENSHIFT_{resource_name}_TOKEN` which should be a access token with appropriate permissions
 where `{resource_name}` is the name of the coldfront resource as all uppercase
 (with spaces and `-` replaced by `_`).
 
 Each OpenShift resource must have the following attributes set in coldfront:
- * `OpenStack Auth URL` - the URL of the `openshift-acct-mgt` endpoint.
- * `OpenStack Role for User in Project` - the name of the `ClusterRole` to assign to users
+ * `OpenShift API URL` - the URL of the Openshift cluster API.
+ * `OpenShift Role for User in Project` - the name of the `ClusterRole` to assign to users
    on the namespace.
+ * `OpenShift Identity Provider Name` - the name of the IDP configured in Openshift
 
 Registration of OpenShift coldfront resources can be performed via the UI management
 dashboard or through the helper command:
 
 ```bash
 $ coldfront add_openshift_resource
-usage: coldfront add_openshift_resource [-h] --name NAME --auth-url AUTH_URL [--role ROLE] [--version] [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback]
+usage: coldfront add_openshift_resource [-h] --name NAME --api-url API_URL --idp IDP [--role ROLE] [--for-virtualization] [--version] [-v {0,1,2,3}] [--settings SETTINGS] [--pythonpath PYTHONPATH] [--traceback]
                                         [--no-color] [--force-color] [--skip-checks]
-coldfront add_openshift_resource: error: the following arguments are required: --name, --auth-url
+coldfront add_openshift_resource: error: the following arguments are required: --name, --api-url, --idp
 ```
 
 ### Quotas
@@ -150,3 +149,17 @@ following resource allocation attribute types.
 
 By submitting a Resource Allocation Change Request and editing those attributes
 a PI can request a change in their quota.
+
+## Pre-commit hooks
+```
+pip install pre-commit
+```
+Pre-commit runs tools like:
+- [Ruff](https://docs.astral.sh/ruff/) — fast linter and fixer
+- Basic checks like trailing whitespace removal, JSON validation, and more.
+
+To set up Git hook locally:
+```
+pre-commit install
+```
+After this, every time you make a commit, the hooks will run automatically!

ci/devstack-config-ip.sh

@@ -0,0 +1,2 @@
+HOST_IP=`ip addr show eth0 | grep "inet " | awk '{ print $2 }' | awk -F "/"  '{ print $1 }'`
+HOST_IPV6=`ip addr show eth0 | grep "inet6 " | awk '{ print $2 }' | awk -F "/"  '{ print $1 }'`

ci/microshift.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #
 # Installs Microshift on Docker
 #