Skip to content

Commit dad544b

Browse files
authored
update closing/closed state logic (#167)
fixes: #162 refs: #143 - On TxCloseDeployment orders and fulfillment should be set to CLOSED. - Orders and fulfillments should not have a CLOSING state. - The market engine should not send TxDeploymentClosed. - The provider should send TxDeploymentClosed. - TxDeploymentClosed rename to TxLeaseClosed and is per lease - The TxLeaseClosed is valid if sent by the lease provider - The deployment is CLOSED once all leases are CLOSED - Query active leases for deployment - update dot diagram - if no active leases set deployment and groups to closed
1 parent 939d951 commit dad544b

File tree

27 files changed

+715
-618
lines changed

27 files changed

+715
-618
lines changed

_docs/dot/tenant-cancel.dot

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ digraph marketplace {
99
"3" [shape=box labeljust="1" label="Deployment: Active\lDeploymentGroup: Ordered\lOrder: Open\lFulfillment: Open\l"];
1010
"4" [shape=box labeljust="1" label="Deployment: Active\lDeploymentGroup: Ordered\lOrder: Matched\lFulfillment: Matched\lLease: Active\l"];
1111

12-
"5" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\l"];
13-
"6" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\l"];
14-
"7" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\lFulfillment: Closing\l"];
15-
"8" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\lFulfillment: Closing\lLease: Closing\l"];
12+
"5" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\l"];
13+
"6" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\l"];
14+
"7" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\l"];
15+
"8" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closed\lFulfillment: Closed\lLease: Closing\l"];
1616

17-
"9" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\l"];
18-
"10" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\l"];
19-
"11" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\l"];
20-
"12" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];
17+
"9" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];
2118

2219
"0" -> "1" [label="TxCreateDeployment"];
2320
"1" -> "2" [label="TxCreateOrder"];
@@ -29,13 +26,10 @@ digraph marketplace {
2926
"3" -> "7" [label="TxCloseDeployment"];
3027
"4" -> "8" [label="TxCloseDeployment"];
3128

32-
"5" -> "9" [label="TxDeploymentClosed"];
33-
"6" -> "10" [label="TxDeploymentClosed"];
34-
"7" -> "11" [label="TxDeploymentClosed"];
35-
"8" -> "12" [label="TxDeploymentClosed"];
29+
"8" -> "9" [label="TxCloseLease"];
3630

3731

3832
{ rank=same "1", "2", "3", "4" }
3933
{ rank=same "5", "6", "7", "8" }
40-
{ rank=same "9", "10", "11", "12" }
34+
{ rank=same "9" }
4135
}

_docs/dot/tenant-cancel.svg

Lines changed: 35 additions & 80 deletions
Loading

_integration/cmp/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func deployCreate(key vars.Ref, daddr vars.Ref) gestalt.Component {
2626
}
2727

2828
func deployClose(key vars.Ref, daddr vars.Ref) gestalt.Component {
29-
check := deployQueryState(daddr, types.Deployment_CLOSED)
29+
check := deployQueryState(daddr, types.Deployment_CLOSING)
3030

3131
return g.Group("deploy-close").
3232
Run(

0 commit comments

Comments
 (0)