Skip to content

Commit

Permalink
update closing/closed state logic (#167)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
aastein committed Apr 2, 2018
1 parent 939d951 commit dad544b
Show file tree
Hide file tree
Showing 27 changed files with 715 additions and 618 deletions.
20 changes: 7 additions & 13 deletions _docs/dot/tenant-cancel.dot
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@ digraph marketplace {
"3" [shape=box labeljust="1" label="Deployment: Active\lDeploymentGroup: Ordered\lOrder: Open\lFulfillment: Open\l"];
"4" [shape=box labeljust="1" label="Deployment: Active\lDeploymentGroup: Ordered\lOrder: Matched\lFulfillment: Matched\lLease: Active\l"];

"5" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\l"];
"6" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\l"];
"7" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\lFulfillment: Closing\l"];
"8" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closing\lFulfillment: Closing\lLease: Closing\l"];
"5" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\l"];
"6" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\l"];
"7" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\l"];
"8" [shape=box label="Deployment: Closing\lDeploymentGroup: Closing\lOrder: Closed\lFulfillment: Closed\lLease: Closing\l"];

"9" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\l"];
"10" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\l"];
"11" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\l"];
"12" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];
"9" [shape=box label="Deployment: Closed\lDeploymentGroup: Closed\lOrder: Closed\lFulfillment: Closed\lLease: Closed\l"];

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

"5" -> "9" [label="TxDeploymentClosed"];
"6" -> "10" [label="TxDeploymentClosed"];
"7" -> "11" [label="TxDeploymentClosed"];
"8" -> "12" [label="TxDeploymentClosed"];
"8" -> "9" [label="TxCloseLease"];


{ rank=same "1", "2", "3", "4" }
{ rank=same "5", "6", "7", "8" }
{ rank=same "9", "10", "11", "12" }
{ rank=same "9" }
}
115 changes: 35 additions & 80 deletions _docs/dot/tenant-cancel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion _integration/cmp/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func deployCreate(key vars.Ref, daddr vars.Ref) gestalt.Component {
}

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

return g.Group("deploy-close").
Run(
Expand Down
Loading

0 comments on commit dad544b

Please sign in to comment.