Merge pull request #244 from Revolyssup/addfunc

Add functionality to get registrant in MeshModel

models/meshmodel/core/v1alpha1/component.go

@@ -58,6 +58,9 @@ type Models struct {
 func (c ComponentDefinition) Type() types.CapabilityType {
 	return types.ComponentDefinition
 }
+func (c ComponentDefinition) GetID() uuid.UUID {
+	return c.ID
+}
 
 var componentCreationLock sync.Mutex
 

models/meshmodel/core/v1alpha1/relationship.go

@@ -78,6 +78,9 @@ func (rdb *RelationshipDefinitionDB) GetRelationshipDefinition() (r Relationship
 func (r RelationshipDefinition) Type() types.CapabilityType {
 	return types.RelationshipDefinition
 }
+func (r RelationshipDefinition) GetID() uuid.UUID {
+	return r.ID
+}
 
 func CreateRelationship(db *database.Handler, r RelationshipDefinition) (uuid.UUID, error) {
 	r.ID = uuid.New()

models/meshmodel/registry.go

@@ -49,6 +49,7 @@ func createHost(db *database.Handler, h Host) (uuid.UUID, error) {
 // ComponentDefinitions and PolicyDefinitions are examples of entities
 type Entity interface {
 	Type() types.CapabilityType
+	GetID() uuid.UUID
 }
 
 // RegistryManager instance will expose methods for registry operations & sits between the database level operations and user facing API handlers.
@@ -149,3 +150,12 @@ func (rm *RegistryManager) GetEntities(f types.Filter) []Entity {
 		return nil
 	}
 }
+
+func (rm *RegistryManager) GetRegistrant(e Entity) Host {
+	eID := e.GetID()
+	var reg Registry
+	_ = rm.db.Where("entity = ?", eID).Find(&reg).Error
+	var h Host
+	_ = rm.db.Where("id = ?", reg.RegistrantID).Find(&h).Error
+	return h
+}

models/oam/core/v1alpha1/application_component.go

@@ -16,6 +16,8 @@ type Component struct {
 type ComponentSpec struct {
 	Type       string                 `json:"type"`
 	Version    string                 `json:"version"`
+	APIVersion string                 `json:"apiVersion"`
+	Model      string                 `json:"model"`
 	Settings   map[string]interface{} `json:"settings"`
 	Parameters []ComponentParameter   `json:"parameters"`
 }