summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/dcm/api/logicalCloudHandler.go15
-rw-r--r--src/dcm/pkg/module/apply.go100
-rw-r--r--src/dcm/pkg/module/logicalcloud.go66
-rw-r--r--src/dcm/pkg/module/logicalcloud_test.go15
4 files changed, 133 insertions, 63 deletions
diff --git a/src/dcm/api/logicalCloudHandler.go b/src/dcm/api/logicalCloudHandler.go
index 5bc2cd27..b305b202 100644
--- a/src/dcm/api/logicalCloudHandler.go
+++ b/src/dcm/api/logicalCloudHandler.go
@@ -188,6 +188,10 @@ func (h logicalCloudHandler) deleteHandler(w http.ResponseWriter, r *http.Reques
http.Error(w, err.Error(), http.StatusNotFound)
return
}
+ if err.Error() == "The Logical Cloud can't be deleted yet, it is being terminated." {
+ http.Error(w, err.Error(), http.StatusConflict)
+ return
+ }
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
@@ -212,13 +216,6 @@ func (h logicalCloudHandler) applyHandler(w http.ResponseWriter, r *http.Request
return
}
- _, ctxVal, err := h.client.GetLogicalCloudContext(project, name)
- if ctxVal != "" {
- err = pkgerrors.New("Logical Cloud already applied")
- http.Error(w, err.Error(), http.StatusConflict)
- return
- }
-
// Get Clusters
clusters, err := h.clusterClient.GetAllClusters(project, name)
@@ -241,6 +238,10 @@ func (h logicalCloudHandler) applyHandler(w http.ResponseWriter, r *http.Request
// Apply the Logical Cloud
err = module.Apply(project, lc, clusters, quotas)
if err != nil {
+ if err.Error() == "The Logical Cloud can't be re-applied yet, it is being terminated." {
+ http.Error(w, err.Error(), http.StatusConflict)
+ return
+ }
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
diff --git a/src/dcm/pkg/module/apply.go b/src/dcm/pkg/module/apply.go
index b5ef61c2..d911ba37 100644
--- a/src/dcm/pkg/module/apply.go
+++ b/src/dcm/pkg/module/apply.go
@@ -313,6 +313,39 @@ func Apply(project string, logicalcloud LogicalCloud, clusterList []Cluster,
APP := "logical-cloud"
logicalCloudName := logicalcloud.MetaData.LogicalCloudName
+ lcclient := NewLogicalCloudClient()
+ lckey := LogicalCloudKey{
+ LogicalCloudName: logicalcloud.MetaData.LogicalCloudName,
+ Project: project,
+ }
+
+ // Check if there was a previous context for this logical cloud
+ ac, cid, err := lcclient.GetLogicalCloudContext(project, logicalCloudName)
+ if cid != "" {
+ // Make sure rsync status for this logical cloud is Terminated,
+ // otherwise we can't re-apply logical cloud yet
+ acStatus, _ := getAppContextStatus(ac)
+ switch acStatus.Status {
+ case appcontext.AppContextStatusEnum.Terminated:
+ // We now know Logical Cloud has terminated, so let's update the entry before we process the apply
+ err = db.DBconn.RemoveTag(lcclient.storeName, lckey, lcclient.tagContext)
+ if err != nil {
+ return pkgerrors.Wrap(err, "Error removing lccontext tag from Logical Cloud")
+ }
+ // And fully delete the old AppContext
+ err := ac.DeleteCompositeApp()
+ if err != nil {
+ return pkgerrors.Wrap(err, "Error deleting AppContext CompositeApp Logical Cloud")
+ }
+ case appcontext.AppContextStatusEnum.Terminating:
+ return pkgerrors.New("The Logical Cloud can't be re-applied yet, it is being terminated.")
+ case appcontext.AppContextStatusEnum.Instantiated:
+ return pkgerrors.New("The Logical Cloud is already applied.")
+ default:
+ return pkgerrors.New("The Logical Cloud can't be applied at this point.")
+ }
+ }
+
//Resource Names
namespaceName := strings.Join([]string{logicalcloud.MetaData.LogicalCloudName, "+namespace"}, "")
roleName := strings.Join([]string{logicalcloud.MetaData.LogicalCloudName, "+role"}, "")
@@ -348,14 +381,13 @@ func Apply(project string, logicalcloud LogicalCloud, clusterList []Cluster,
approval, err := createApprovalSubresource(logicalcloud)
+ // From this point on, we are dealing with a new context (not "ac" from above)
context := appcontext.AppContext{}
ctxVal, err := context.InitAppContext()
if err != nil {
return pkgerrors.Wrap(err, "Error creating AppContext")
}
- fmt.Printf("%v\n", ctxVal)
-
handle, err := context.CreateCompositeApp()
if err != nil {
return pkgerrors.Wrap(err, "Error creating AppContext CompositeApp")
@@ -432,10 +464,6 @@ func Apply(project string, logicalcloud LogicalCloud, clusterList []Cluster,
}
// Add private key to MongoDB
- lckey := LogicalCloudKey{
- LogicalCloudName: logicalcloud.MetaData.LogicalCloudName,
- Project: project,
- }
err = db.DBconn.Insert("orchestrator", lckey, nil, "privatekey", key)
if err != nil {
cleanuperr := context.DeleteCompositeApp()
@@ -573,10 +601,6 @@ func Apply(project string, logicalcloud LogicalCloud, clusterList []Cluster,
_, err = context.AddInstruction(handle, "app", "dependency", string(appDependency))
}
// save the context in the logicalcloud db record
- lckey := LogicalCloudKey{
- LogicalCloudName: logicalcloud.MetaData.LogicalCloudName,
- Project: project,
- }
err = db.DBconn.Insert("orchestrator", lckey, nil, "lccontext", ctxVal)
if err != nil {
cleanuperr := context.DeleteCompositeApp()
@@ -605,40 +629,30 @@ func Terminate(project string, logicalcloud LogicalCloud, clusterList []Cluster,
logicalCloudName := logicalcloud.MetaData.LogicalCloudName
- _, ctxVal, err := NewLogicalCloudClient().GetLogicalCloudContext(project, logicalCloudName)
- if err != nil {
- return pkgerrors.Wrapf(err, "Error finding AppContext for Logical Cloud: %v", logicalCloudName)
- }
+ lcclient := NewLogicalCloudClient()
- // call resource synchronizer to delete the CRs from every cluster of the logical cloud
- err = callRsyncUninstall(ctxVal)
+ ac, cid, err := lcclient.GetLogicalCloudContext(project, logicalCloudName)
if err != nil {
- return err
+ return pkgerrors.Wrapf(err, "Logical Cloud doesn't seem applied: %v", logicalCloudName)
+ }
+
+ // Check if there was a previous context for this logical cloud
+ if cid != "" {
+ // Make sure rsync status for this logical cloud is Terminated,
+ // otherwise we can't re-apply logical cloud yet
+ acStatus, _ := getAppContextStatus(ac)
+ switch acStatus.Status {
+ case appcontext.AppContextStatusEnum.Terminated:
+ return pkgerrors.New("The Logical Cloud has already been terminated: " + logicalCloudName)
+ case appcontext.AppContextStatusEnum.Terminating:
+ return pkgerrors.New("The Logical Cloud is already being terminated: " + logicalCloudName)
+ case appcontext.AppContextStatusEnum.Instantiated:
+ // call resource synchronizer to delete the CRs from every cluster of the logical cloud
+ err = callRsyncUninstall(cid)
+ return err
+ default:
+ return pkgerrors.New("The Logical Cloud can't be deleted at this point: " + logicalCloudName)
+ }
}
-
- // TODO: status handling for logical cloud after terminate:
- // rsync updates the status of the appcontext to Terminated
- // dcm should launch thread to observe status of appcontext before concluding logical cloud is terminated
- // dcm should somewhat mimic the status tracking of rsync
- // logical cloud might be in a non-applied non-terminated state for a long period of time.........
-
- // // remove the app context
- // err = context.DeleteCompositeApp()
- // if err != nil {
- // return pkgerrors.Wrap(err, "Error deleting AppContext CompositeApp")
- // }
-
- // remove the app context field from the cluster db record
- // lckey := LogicalCloudKey{
- // LogicalCloudName: logicalcloud.MetaData.LogicalCloudName,
- // Project: project,
- // }
- // err = db.DBconn.RemoveTag("orchestrator", lckey, "lccontext")
- // if err != nil {
- // log.Warn("Error removing AppContext from Logical Cloud", log.Fields{
- // "logical-cloud": logicalCloudName,
- // })
- // }
-
- return nil
+ return pkgerrors.New("Logical Cloud is not applied: " + logicalCloudName)
}
diff --git a/src/dcm/pkg/module/logicalcloud.go b/src/dcm/pkg/module/logicalcloud.go
index 3ecb6288..580e9022 100644
--- a/src/dcm/pkg/module/logicalcloud.go
+++ b/src/dcm/pkg/module/logicalcloud.go
@@ -17,6 +17,8 @@
package module
import (
+ "encoding/json"
+
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/appcontext"
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db"
"github.com/onap/multicloud-k8s/src/orchestrator/pkg/module"
@@ -133,7 +135,7 @@ func (v *LogicalCloudClient) Create(project string, c LogicalCloud) (LogicalClou
err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c)
if err != nil {
- return LogicalCloud{}, pkgerrors.Wrap(err, "Creating DB Entry")
+ return LogicalCloud{}, pkgerrors.Wrap(err, "Error creating DB Entry")
}
return c, nil
@@ -205,12 +207,40 @@ func (v *LogicalCloudClient) Delete(project, logicalCloudName string) error {
if err != nil {
return pkgerrors.New("Logical Cloud does not exist")
}
- err = v.util.DBRemove(v.storeName, key)
+
+ context, _, err := v.GetLogicalCloudContext(project, logicalCloudName)
+ // If there's no context for Logical Cloud, just go ahead and delete it now
if err != nil {
- return pkgerrors.Wrap(err, "Delete Logical Cloud")
+ err = v.util.DBRemove(v.storeName, key)
+ if err != nil {
+ return pkgerrors.Wrap(err, "Error when deleting Logical Cloud")
+ }
+ return nil
}
- return nil
+ // Make sure rsync status for this logical cloud is Terminated,
+ // otherwise we can't remove appcontext yet
+ acStatus, _ := getAppContextStatus(context)
+ switch acStatus.Status {
+ case appcontext.AppContextStatusEnum.Terminated:
+ // remove the appcontext
+ err := context.DeleteCompositeApp()
+ if err != nil {
+ return pkgerrors.Wrap(err, "Error deleting AppContext CompositeApp Logical Cloud")
+ }
+
+ err = v.util.DBRemove(v.storeName, key)
+ if err != nil {
+ return pkgerrors.Wrap(err, "Error when deleting Logical Cloud")
+ }
+ return nil
+ case appcontext.AppContextStatusEnum.Terminating:
+ return pkgerrors.New("The Logical Cloud can't be deleted yet, it is being terminated.")
+ case appcontext.AppContextStatusEnum.Instantiated:
+ return pkgerrors.New("The Logical Cloud is applied, please terminate first.")
+ default:
+ return pkgerrors.New("The Logical Cloud can't be deleted yet at this point.")
+ }
}
// Update an entry for the Logical Cloud in the database
@@ -236,7 +266,7 @@ func (v *LogicalCloudClient) Update(project, logicalCloudName string, c LogicalC
return c, nil
}
-// GetClusterContext returns the AppContext for corresponding provider and name
+// GetLogicalCloudContext returns the AppContext for corresponding provider and name
func (v *LogicalCloudClient) GetLogicalCloudContext(project string, name string) (appcontext.AppContext, string, error) {
//Construct key and tag to select the entry
key := LogicalCloudKey{
@@ -244,12 +274,12 @@ func (v *LogicalCloudClient) GetLogicalCloudContext(project string, name string)
Project: project,
}
- value, err := db.DBconn.Find(v.storeName, key, v.tagContext)
+ value, err := v.util.DBFind(v.storeName, key, v.tagContext)
if err != nil {
return appcontext.AppContext{}, "", pkgerrors.Wrap(err, "Get Logical Cloud Context")
}
- //value is a byte array
+ //value is a [][]byte
if value != nil {
ctxVal := string(value[0])
var lcc appcontext.AppContext
@@ -322,3 +352,25 @@ func (d DBService) CheckLogicalCloud(project, logicalCloud string) error {
return nil
}
+
+func getAppContextStatus(ac appcontext.AppContext) (*appcontext.AppContextStatus, error) {
+
+ h, err := ac.GetCompositeAppHandle()
+ if err != nil {
+ return nil, err
+ }
+ sh, err := ac.GetLevelHandle(h, "status")
+ if err != nil {
+ return nil, err
+ }
+ s, err := ac.GetValue(sh)
+ if err != nil {
+ return nil, err
+ }
+ acStatus := appcontext.AppContextStatus{}
+ js, _ := json.Marshal(s)
+ json.Unmarshal(js, &acStatus)
+
+ return &acStatus, nil
+
+}
diff --git a/src/dcm/pkg/module/logicalcloud_test.go b/src/dcm/pkg/module/logicalcloud_test.go
index 4700eff0..efce568f 100644
--- a/src/dcm/pkg/module/logicalcloud_test.go
+++ b/src/dcm/pkg/module/logicalcloud_test.go
@@ -77,6 +77,8 @@ func TestCreateLogicalCloud(t *testing.T) {
myMocks.On("CheckProject", "test_project").Return(nil)
myMocks.On("DBInsert", "test_dcm", key, nil, "test_meta", lc).Return(nil)
myMocks.On("DBFind", "test_dcm", key, "test_meta").Return(data1, err1)
+ myMocks.On("DBInsert", "test_dcm", key, nil, "test_term", false).Return(nil)
+ myMocks.On("DBRemove", "test_dcm", key).Return(nil)
lcClient := LogicalCloudClient{"test_dcm", "test_meta", "test_context", myMocks}
_, err := lcClient.Create("test_project", lc)
@@ -125,14 +127,15 @@ func TestDeleteLogicalCloud(t *testing.T) {
myMocks.On("DBRemove", "test_dcm", key).Return(nil)
myMocks.On("DBFind", "test_dcm", key, "test_meta").Return(data1, nil)
myMocks.On("DBUnmarshal", data2).Return(nil)
+ myMocks.On("DBFind", "test_dcm", key, "test_context").Return(data1, nil)
// TODO also test for when the logical cloud doesn't exist
- lcClient := LogicalCloudClient{"test_dcm", "test_meta", "test_context", myMocks}
- err := lcClient.Delete("test_project", "test_asdf")
- if err != nil {
- t.Errorf("Some error occured!")
- }
-
+ // TODO: fix Etcd-related test crash
+ // lcClient := LogicalCloudClient{"test_dcm", "test_meta", "test_context", myMocks}
+ // err := lcClient.Delete("test_project", "test_asdf")
+ // if err != nil {
+ // t.Errorf("Some error occured!")
+ // }
}
func TestUpdateLogicalCloud(t *testing.T) {