From d641c3864d4ba71e127d332c4ac2082f98bba1e5 Mon Sep 17 00:00:00 2001 From: "Igor D.C" Date: Tue, 28 Jul 2020 03:05:05 +0000 Subject: DCM - fix code formatting via vscode Visual Studio Code automatic code formatting was performed on the 4 modified DCM files. Issue-ID: MULTICLOUD-1143 Signed-off-by: Igor D.C Change-Id: I24d2b44181b5c0737df7cb4541f9eede0950211a --- src/dcm/pkg/module/logicalcloud.go | 343 ++++++++++++++++++------------------- 1 file changed, 170 insertions(+), 173 deletions(-) (limited to 'src/dcm/pkg/module/logicalcloud.go') diff --git a/src/dcm/pkg/module/logicalcloud.go b/src/dcm/pkg/module/logicalcloud.go index 9fb1b6fb..51ee387d 100644 --- a/src/dcm/pkg/module/logicalcloud.go +++ b/src/dcm/pkg/module/logicalcloud.go @@ -12,280 +12,277 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package module import ( - "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db" - "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module" + "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/db" + "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module" - pkgerrors "github.com/pkg/errors" + pkgerrors "github.com/pkg/errors" ) // LogicalCloud contains the parameters needed for a Logical Cloud type LogicalCloud struct { - MetaData MetaDataList `json:"metadata"` - Specification Spec `json:"spec"` + MetaData MetaDataList `json:"metadata"` + Specification Spec `json:"spec"` } - // MetaData contains the parameters needed for metadata type MetaDataList struct { - LogicalCloudName string `json:"name"` - Description string `json:"description"` - UserData1 string `json:"userData1"` - UserData2 string `json:"userData2"` + LogicalCloudName string `json:"name"` + Description string `json:"description"` + UserData1 string `json:"userData1"` + UserData2 string `json:"userData2"` } // Spec contains the parameters needed for spec type Spec struct { - NameSpace string `json:"namespace"` - User UserData `json:"user"` - + NameSpace string `json:"namespace"` + User UserData `json:"user"` } // UserData contains the parameters needed for user type UserData struct { - UserName string `json:"user-name"` - Type string `json:"type"` - UserPermissions []UserPerm `json:"user-permissions"` + UserName string `json:"user-name"` + Type string `json:"type"` + UserPermissions []UserPerm `json:"user-permissions"` } // UserPerm contains the parameters needed for user permissions type UserPerm struct { - PermName string `json:"permission-name"` - APIGroups []string `json:"apiGroups"` - Resources []string `json:"resources"` - Verbs []string `json:"verbs"` + PermName string `json:"permission-name"` + APIGroups []string `json:"apiGroups"` + Resources []string `json:"resources"` + Verbs []string `json:"verbs"` } // LogicalCloudKey is the key structure that is used in the database type LogicalCloudKey struct { - Project string `json:"project"` - LogicalCloudName string `json:"logical-cloud-name"` + Project string `json:"project"` + LogicalCloudName string `json:"logical-cloud-name"` } // LogicalCloudManager is an interface that exposes the connection // functionality type LogicalCloudManager interface { - Create(project string, c LogicalCloud) (LogicalCloud, error) - Get(project, name string) (LogicalCloud, error) - GetAll(project string) ([]LogicalCloud, error) - Delete(project, name string) error - Update(project, name string, c LogicalCloud) (LogicalCloud, error) - + Create(project string, c LogicalCloud) (LogicalCloud, error) + Get(project, name string) (LogicalCloud, error) + GetAll(project string) ([]LogicalCloud, error) + Delete(project, name string) error + Update(project, name string, c LogicalCloud) (LogicalCloud, error) } // Interface facilitates unit testing by mocking functions type Utility interface { - DBInsert(storeName string, key db.Key, query interface{}, meta string, c interface{}) error - DBFind(storeName string, key db.Key, meta string) ([][]byte, error) - DBUnmarshal(value []byte, out interface{}) error - DBRemove(storeName string, key db.Key) error - CheckProject(project string) error - CheckLogicalCloud(project, logicalCloud string) error + DBInsert(storeName string, key db.Key, query interface{}, meta string, c interface{}) error + DBFind(storeName string, key db.Key, meta string) ([][]byte, error) + DBUnmarshal(value []byte, out interface{}) error + DBRemove(storeName string, key db.Key) error + CheckProject(project string) error + CheckLogicalCloud(project, logicalCloud string) error } // LogicalCloudClient implements the LogicalCloudManager // It will also be used to maintain some localized state type LogicalCloudClient struct { - storeName string - tagMeta string - util Utility + storeName string + tagMeta string + util Utility } // Added for unit testing; implements Utility interface -type DBService struct {} +type DBService struct{} // LogicalCloudClient returns an instance of the LogicalCloudClient // which implements the LogicalCloudManager func NewLogicalCloudClient() *LogicalCloudClient { - service := DBService{} - return &LogicalCloudClient{ - storeName: "orchestrator", - tagMeta: "logicalcloud", - util: service, - } + service := DBService{} + return &LogicalCloudClient{ + storeName: "orchestrator", + tagMeta: "logicalcloud", + util: service, + } } // Create entry for the logical cloud resource in the database func (v *LogicalCloudClient) Create(project string, c LogicalCloud) (LogicalCloud, error) { - //Construct key consisting of name - key := LogicalCloudKey{ - Project: project, - LogicalCloudName: c.MetaData.LogicalCloudName, - } - - //Check if project exists - err := v.util.CheckProject(project) - if err != nil { - return LogicalCloud{}, pkgerrors.New("Unable to find the project") - } - - //Check if this Logical Cloud already exists - _, err = v.Get(project, c.MetaData.LogicalCloudName) - if err == nil { - return LogicalCloud{}, pkgerrors.New("Logical Cloud already exists") - } - - err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c) - if err != nil { - return LogicalCloud{}, pkgerrors.Wrap(err, "Creating DB Entry") - } - - return c, nil + //Construct key consisting of name + key := LogicalCloudKey{ + Project: project, + LogicalCloudName: c.MetaData.LogicalCloudName, + } + + //Check if project exists + err := v.util.CheckProject(project) + if err != nil { + return LogicalCloud{}, pkgerrors.New("Unable to find the project") + } + + //Check if this Logical Cloud already exists + _, err = v.Get(project, c.MetaData.LogicalCloudName) + if err == nil { + return LogicalCloud{}, pkgerrors.New("Logical Cloud already exists") + } + + err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c) + if err != nil { + return LogicalCloud{}, pkgerrors.Wrap(err, "Creating DB Entry") + } + + return c, nil } // Get returns Logical Cloud corresponding to logical cloud name func (v *LogicalCloudClient) Get(project, logicalCloudName string) (LogicalCloud, error) { - //Construct the composite key to select the entry - key := LogicalCloudKey{ - Project: project, - LogicalCloudName: logicalCloudName, - } - value, err := v.util.DBFind(v.storeName, key, v.tagMeta) - if err != nil { - return LogicalCloud{}, pkgerrors.Wrap(err, "Get Logical Cloud") - } - - //value is a byte array - if value != nil { - lc := LogicalCloud{} - err = v.util.DBUnmarshal(value[0], &lc) - if err != nil { - return LogicalCloud{}, pkgerrors.Wrap(err, "Unmarshaling value") - } - return lc, nil - } - - return LogicalCloud{}, pkgerrors.New("Error getting Logical Cloud") + //Construct the composite key to select the entry + key := LogicalCloudKey{ + Project: project, + LogicalCloudName: logicalCloudName, + } + value, err := v.util.DBFind(v.storeName, key, v.tagMeta) + if err != nil { + return LogicalCloud{}, pkgerrors.Wrap(err, "Get Logical Cloud") + } + + //value is a byte array + if value != nil { + lc := LogicalCloud{} + err = v.util.DBUnmarshal(value[0], &lc) + if err != nil { + return LogicalCloud{}, pkgerrors.Wrap(err, "Unmarshaling value") + } + return lc, nil + } + + return LogicalCloud{}, pkgerrors.New("Error getting Logical Cloud") } // GetAll returns Logical Clouds in the project func (v *LogicalCloudClient) GetAll(project string) ([]LogicalCloud, error) { - //Construct the composite key to select the entry - key := LogicalCloudKey{ - Project: project, - LogicalCloudName: "", - } - - var resp []LogicalCloud - values, err := v.util.DBFind(v.storeName, key, v.tagMeta) - if err != nil { - return []LogicalCloud{}, pkgerrors.Wrap(err, "Get Logical Clouds") - } - - for _, value := range values { - lc := LogicalCloud{} - err = v.util.DBUnmarshal(value, &lc) - if err != nil { - return []LogicalCloud{}, pkgerrors.Wrap(err, "Unmarshaling values") - } - resp = append(resp, lc) - } - - return resp, nil + //Construct the composite key to select the entry + key := LogicalCloudKey{ + Project: project, + LogicalCloudName: "", + } + + var resp []LogicalCloud + values, err := v.util.DBFind(v.storeName, key, v.tagMeta) + if err != nil { + return []LogicalCloud{}, pkgerrors.Wrap(err, "Get Logical Clouds") + } + + for _, value := range values { + lc := LogicalCloud{} + err = v.util.DBUnmarshal(value, &lc) + if err != nil { + return []LogicalCloud{}, pkgerrors.Wrap(err, "Unmarshaling values") + } + resp = append(resp, lc) + } + + return resp, nil } // Delete the Logical Cloud entry from database func (v *LogicalCloudClient) Delete(project, logicalCloudName string) error { - //Construct the composite key to select the entry - key := LogicalCloudKey{ - Project: project, - LogicalCloudName: logicalCloudName, - } - err := v.util.DBRemove(v.storeName, key) - if err != nil { - return pkgerrors.Wrap(err, "Delete Logical Cloud") - } - - return nil + //Construct the composite key to select the entry + key := LogicalCloudKey{ + Project: project, + LogicalCloudName: logicalCloudName, + } + err := v.util.DBRemove(v.storeName, key) + if err != nil { + return pkgerrors.Wrap(err, "Delete Logical Cloud") + } + + return nil } // Update an entry for the Logical Cloud in the database func (v *LogicalCloudClient) Update(project, logicalCloudName string, c LogicalCloud) (LogicalCloud, error) { - key := LogicalCloudKey{ - Project: project, - LogicalCloudName: logicalCloudName, - } - // Check for mismatch, logicalCloudName and payload logical cloud name - if c.MetaData.LogicalCloudName != logicalCloudName { - return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud name mismatch") - } - //Check if this Logical Cloud exists - _, err := v.Get(project, logicalCloudName) - if err != nil { - return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud doesn't exist") - } - err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c) - if err != nil { - return LogicalCloud{}, pkgerrors.Wrap(err, "Updating DB Entry") - } - return c, nil + key := LogicalCloudKey{ + Project: project, + LogicalCloudName: logicalCloudName, + } + // Check for mismatch, logicalCloudName and payload logical cloud name + if c.MetaData.LogicalCloudName != logicalCloudName { + return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud name mismatch") + } + //Check if this Logical Cloud exists + _, err := v.Get(project, logicalCloudName) + if err != nil { + return LogicalCloud{}, pkgerrors.New("Update Error - Logical Cloud doesn't exist") + } + err = v.util.DBInsert(v.storeName, key, nil, v.tagMeta, c) + if err != nil { + return LogicalCloud{}, pkgerrors.Wrap(err, "Updating DB Entry") + } + return c, nil } func (d DBService) DBInsert(storeName string, key db.Key, query interface{}, meta string, c interface{}) error { - err := db.DBconn.Insert(storeName, key, nil, meta, c) - if err != nil { - return pkgerrors.Wrap(err, "Creating DB Entry") - } + err := db.DBconn.Insert(storeName, key, nil, meta, c) + if err != nil { + return pkgerrors.Wrap(err, "Creating DB Entry") + } - return nil + return nil } func (d DBService) DBFind(storeName string, key db.Key, meta string) ([][]byte, error) { - value, err := db.DBconn.Find(storeName, key, meta) - if err != nil { - return [][]byte{}, pkgerrors.Wrap(err, "Get Resource") - } + value, err := db.DBconn.Find(storeName, key, meta) + if err != nil { + return [][]byte{}, pkgerrors.Wrap(err, "Get Resource") + } - return value, nil + return value, nil } func (d DBService) DBUnmarshal(value []byte, out interface{}) error { - err := db.DBconn.Unmarshal(value, out) - if err != nil { - return pkgerrors.Wrap(err, "Unmarshaling Value") - } + err := db.DBconn.Unmarshal(value, out) + if err != nil { + return pkgerrors.Wrap(err, "Unmarshaling Value") + } - return nil + return nil } func (d DBService) DBRemove(storeName string, key db.Key) error { - err := db.DBconn.Remove(storeName, key) - if err != nil { - return pkgerrors.Wrap(err, "Delete Resource") - } + err := db.DBconn.Remove(storeName, key) + if err != nil { + return pkgerrors.Wrap(err, "Delete Resource") + } - return nil + return nil } func (d DBService) CheckProject(project string) error { - // Check if project exists - _, err := module.NewProjectClient().GetProject(project) - if err != nil { - return pkgerrors.New("Unable to find the project") - } + // Check if project exists + _, err := module.NewProjectClient().GetProject(project) + if err != nil { + return pkgerrors.New("Unable to find the project") + } - return nil + return nil } func (d DBService) CheckLogicalCloud(project, logicalCloud string) error { - // Check if logical cloud exists - _, err := NewLogicalCloudClient().Get(project, logicalCloud) - if err != nil { - return pkgerrors.New("Unable to find the logical cloud") - } + // Check if logical cloud exists + _, err := NewLogicalCloudClient().Get(project, logicalCloud) + if err != nil { + return pkgerrors.New("Unable to find the logical cloud") + } - return nil + return nil } -- cgit 1.2.3-korg