Merging the account manager into the plugin

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

@@ -9,7 +9,6 @@ on:
 env:
   PYTHONWARNINGS: ignore
   KUBECONFIG: ${{ github.workspace }}/kubeconfig
-  ACCT_MGT_VERSION: "6012025c247ab25fb2cab3be9ad06080e28713ee"
 
 jobs:
   build:
@@ -35,7 +34,7 @@ jobs:
         run: |
           bash ./ci/setup-oc-client.sh
 
-      - name: Install Microshift
+      - name: Install Microshift and add service account
         run: |
           ./ci/microshift.sh
 

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

@@ -25,3 +25,4 @@ jobs:
       - name: Run functional tests
         run: |
           ./ci/run_unit_tests.sh
+          pytest ./src/coldfront_plugin_cloud/tests/unit/moc_openshift/ -v --cov=acct_mgt --cov-report=term

ci/microshift.sh

@@ -44,14 +44,5 @@ while ! oc get route -A; do
 done
 echo "::endgroup::"
 
-# Install OpenShift Account Management
-git clone "${ACCT_MGT_REPOSITORY}" "$test_dir/openshift-acct-mgt"
-git -C "$test_dir/openshift-acct-mgt" config advice.detachedHead false
-git -C "$test_dir/openshift-acct-mgt" checkout "$ACCT_MGT_VERSION"
-
-echo "::group::Deploy openshift-acct-mgt"
-oc apply -k "$test_dir/openshift-acct-mgt/k8s/overlays/crc"
-oc wait -n onboarding --for=condition=available --timeout=800s deployment/onboarding
-echo "::endgroup::"
-
-sleep 60
+oc create sa coldfront
+oc adm policy add-cluster-role-to-user cluster-admin system:serviceaccount:default:coldfront

ci/run_functional_tests_openshift.sh

@@ -3,16 +3,17 @@
 # Tests expect the resource to be name Devstack
 set -xe
 
-export OPENSHIFT_MICROSHIFT_USERNAME="admin"
-export OPENSHIFT_MICROSHIFT_PASSWORD="pass"
-
 if [[ ! "${CI}" == "true" ]]; then
     source /tmp/coldfront_venv/bin/activate
 fi
 
 export DJANGO_SETTINGS_MODULE="local_settings"
 export FUNCTIONAL_TESTS="True"
-export OS_AUTH_URL="https://onboarding-onboarding.cluster.local"
+
+export OS_AUTH_URL="https://onboarding-onboarding.cluster.local:6443"
+export ACCT_MGT_IDENTITY_PROVIDER=developer #TODO: Replace this with resource attribute instead
+
+export OPENSHIFT_MICROSHIFT_TOKEN="$(oc create token coldfront)"
 
 coverage run --source="." -m django test coldfront_plugin_cloud.tests.functional.openshift
 coverage report

ci/run_functional_tests_openstack.sh

@@ -22,10 +22,6 @@ fi
 export DJANGO_SETTINGS_MODULE="local_settings"
 export FUNCTIONAL_TESTS="True"
 export OS_AUTH_URL="http://$HOST_IP/identity"
-export KEYCLOAK_URL="http://$HOST_IP:8080"
-export KEYCLOAK_USER="admin"
-export KEYCLOAK_PASS="nomoresecret"
-export KEYCLOAK_REALM="master"
 
 coverage run --source="." -m django test coldfront_plugin_cloud.tests.functional.openstack
 coverage report

ci/run_unit_tests.sh

@@ -6,5 +6,7 @@ fi
 
 export DJANGO_SETTINGS_MODULE="local_settings"
 
-coverage run --source="." -m django test coldfront_plugin_cloud.tests.unit
+coverage run --source="." -a -m django test coldfront_plugin_cloud.tests.unit.test_attribute_migration
+coverage run --source="." -a -m django test coldfront_plugin_cloud.tests.unit.test_calculate_quota_unit_hours
+coverage run --source="." -a -m django test coldfront_plugin_cloud.tests.unit.test_utils
 coverage report

requirements.txt

@@ -6,3 +6,7 @@ python-memcached==1.59
 python-novaclient
 python-neutronclient
 python-swiftclient
+python-dotenv
+gunicorn
+kubernetes
+openshift