From 1582654a9caf03ba46677f0b20abe399a9136ec2 Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 27 Sep 2024 11:14:46 +0200 Subject: [PATCH] equals func on exec + draft container subobject --- models/resource_model/resource_model.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/models/resource_model/resource_model.go b/models/resource_model/resource_model.go index 7d59f72..3769448 100644 --- a/models/resource_model/resource_model.go +++ b/models/resource_model/resource_model.go @@ -29,27 +29,27 @@ type AbstractResource struct { /* * GetModelValue returns the value of the model key */ -func (abs *AbstractResource) GetModelValue(key string) interface{} { +func (abs *AbstractResource) GetModelValue(cat string, key string) interface{} { if abs.ResourceModel == nil || abs.ResourceModel.Model == nil { return nil } if _, ok := abs.ResourceModel.Model[key]; !ok { return nil } - return abs.ResourceModel.Model[key].Value + return abs.ResourceModel.Model[cat][key].Value } /* * GetModelType returns the type of the model key */ -func (abs *AbstractResource) GetModelType(key string) interface{} { +func (abs *AbstractResource) GetModelType(cat string, key string) interface{} { if abs.ResourceModel == nil || abs.ResourceModel.Model == nil { return nil } if _, ok := abs.ResourceModel.Model[key]; !ok { return nil } - return abs.ResourceModel.Model[key].Type + return abs.ResourceModel.Model[cat][key].Type } /* @@ -66,14 +66,14 @@ func (abs *AbstractResource) GetModelKeys() []string { /* * GetModelReadOnly returns the readonly of the model key */ -func (abs *AbstractResource) GetModelReadOnly(key string) interface{} { +func (abs *AbstractResource) GetModelReadOnly(cat string, key string) interface{} { if abs.ResourceModel == nil || abs.ResourceModel.Model == nil { return nil } if _, ok := abs.ResourceModel.Model[key]; !ok { return nil } - return abs.ResourceModel.Model[key].ReadOnly + return abs.ResourceModel.Model[cat][key].ReadOnly } type Model struct { @@ -88,9 +88,9 @@ type Model struct { * Warning: This struct is not user available, it is only used by the system */ type ResourceModel struct { - UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"` - ResourceType string `json:"resource_type,omitempty" bson:"resource_type,omitempty" validate:"required"` - Model map[string]Model `json:"model,omitempty" bson:"model,omitempty"` + UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"` + ResourceType string `json:"resource_type,omitempty" bson:"resource_type,omitempty" validate:"required"` + Model map[string]map[string]Model `json:"model,omitempty" bson:"model,omitempty"` } func (ao *ResourceModel) GetID() string {