state machine integration wip

tests/domain/cloud/test_azure_csp.py

@@ -153,7 +153,7 @@ def test_create_tenant(mock_azure: AzureCloudProvider):
     mock_azure.sdk.requests.post.return_value = mock_result
     payload = TenantCSPPayload(
         **dict(
-            creds={"username": "mock-cloud", "pass": "shh"},
+            creds={"username": "mock-cloud", "password": "shh"},
             user_id="admin",
             password="JediJan13$coot",
             domain_name="jediccpospawnedtenant2",
@@ -190,7 +190,7 @@ def test_create_billing_profile(mock_azure: AzureCloudProvider):
                 country="US",
                 postal_code="19109",
             ),
-            creds={"username": "mock-cloud", "pass": "shh"},
+            creds={"username": "mock-cloud", "password": "shh"},
             tenant_id="60ff9d34-82bf-4f21-b565-308ef0533435",
             display_name="Test Billing Profile",
         )
@@ -258,7 +258,7 @@ def test_validate_billing_profile_creation(mock_azure: AzureCloudProvider):
     )
 
 
-def test_grant_billing_profile_tenant_access(mock_azure: AzureCloudProvider):
+def test_create_billing_profile_tenant_access(mock_azure: AzureCloudProvider):
     mock_azure.sdk.adal.AuthenticationContext.return_value.context.acquire_token_with_client_credentials.return_value = {
         "accessToken": "TOKEN"
     }
@@ -295,7 +295,7 @@ def test_grant_billing_profile_tenant_access(mock_azure: AzureCloudProvider):
         )
     )
 
-    result = mock_azure.grant_billing_profile_tenant_access(payload)
+    result = mock_azure.create_billing_profile_tenant_access(payload)
     body: BillingRoleAssignmentCSPResult = result.get("body")
     assert (
         body.billing_role_assignment_name
@@ -303,7 +303,7 @@ def test_grant_billing_profile_tenant_access(mock_azure: AzureCloudProvider):
     )
 
 
-def test_enable_task_order_billing(mock_azure: AzureCloudProvider):
+def test_create_task_order_billing(mock_azure: AzureCloudProvider):
     mock_azure.sdk.adal.AuthenticationContext.return_value.context.acquire_token_with_client_credentials.return_value = {
         "accessToken": "TOKEN"
     }
@@ -401,7 +401,7 @@ def test_validate_task_order_billing_enabled(mock_azure):
     )
 
 
-def test_report_clin(mock_azure: AzureCloudProvider):
+def test_create_billing_instruction(mock_azure: AzureCloudProvider):
     mock_azure.sdk.adal.AuthenticationContext.return_value.context.acquire_token_with_client_credentials.return_value = {
         "accessToken": "TOKEN"
     }
@@ -432,7 +432,7 @@ def test_report_clin(mock_azure: AzureCloudProvider):
             billing_profile_name="KQWI-W2SU-BG7-TGB",
         )
     )
-    result = mock_azure.report_clin(payload)
+    result = mock_azure.create_billing_instruction(payload)
     body: ReportCLINCSPResult = result.get("body")
     assert body.reported_clin_name == "TO1:CLIN001"
 

tests/domain/test_portfolio_state_machine.py

@@ -1,11 +1,12 @@
 import pytest
+import re
 
 from tests.factories import (
     PortfolioFactory,
     PortfolioStateMachineFactory,
 )
 
-from atst.models import FSMStates
+from atst.models import FSMStates, PortfolioStateMachine
 from atst.models.mixins.state_machines import AzureStages, StageStates, compose_state
 from atst.domain.csp import get_stage_csp_class
 
@@ -78,7 +79,7 @@ def test_state_machine_initialization(portfolio):
 
 
 def test_fsm_transition_start(portfolio):
-    sm = PortfolioStateMachineFactory.create(portfolio=portfolio)
+    sm: PortfolioStateMachine = PortfolioStateMachineFactory.create(portfolio=portfolio)
     assert sm.portfolio
     assert sm.state == FSMStates.UNSTARTED
 
@@ -87,5 +88,48 @@ def test_fsm_transition_start(portfolio):
 
     sm.start()
     assert sm.state == FSMStates.STARTED
-    sm.create_tenant(a=1, b=2)
+
+    # Should source all creds for portfolio? might be easier to manage than per-step specific ones
+    creds = {"username": "mock-cloud", "password": "shh"}
+    if portfolio.csp_data is not None:
+        csp_data = portfolio.csp_data
+    else:
+        csp_data = {}
+
+    ppoc = portfolio.owner
+    user_id = f"{ppoc.first_name[0]}{ppoc.last_name}".lower()
+    domain_name = re.sub("[^0-9a-zA-Z]+", "", portfolio.name).lower()
+
+    portfolio_data = {
+        "user_id": user_id,
+        "password": "jklfsdNCVD83nklds2#202",
+        "domain_name": domain_name,
+        "first_name": ppoc.first_name,
+        "last_name": ppoc.last_name,
+        "country_code": "US",
+        "password_recovery_email_address": ppoc.email,
+        "address": {
+            "company_name": "",
+            "address_line_1": "",
+            "city": "",
+            "region": "",
+            "country": "",
+            "postal_code": "",
+        },
+        "billing_profile_display_name": "My Billing Profile",
+    }
+
+    collected_data = dict(list(csp_data.items()) + list(portfolio_data.items()))
+    sm.trigger_next_transition(creds=creds, csp_data=collected_data)
+
     assert sm.state == FSMStates.TENANT_CREATED
+    assert portfolio.csp_data.get("tenant_id", None) is not None
+
+    if portfolio.csp_data is not None:
+        csp_data = portfolio.csp_data
+    else:
+        csp_data = {}
+    collected_data = dict(list(csp_data.items()) + list(portfolio_data.items()))
+    sm.trigger_next_transition(creds=creds, csp_data=collected_data)
+    assert sm.state == FSMStates.BILLING_PROFILE_CREATED
+