updated infra

.gitignore

@@ -21,4 +21,5 @@ dist
 
 # Go workspace file
 go.work
-vendor
+vendor
+db

apis/id/id.go

@@ -38,8 +38,8 @@ type PartitionNodeID struct {
 	Node string `json:"node" yaml:"node" protobuf:"bytes,3,opt,name=node"`
 }
 
-type PortID struct {
-	NodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
+type PartitionPortID struct {
+	PartitionNodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
 	// ModuleBay defines the moduleBay reference id
 	ModuleBay *int `json:"moduleBay,omitempty" yaml:"moduleBay,omitempty" protobuf:"bytes,2,opt,name=moduleBay"`
 	// Module defines the module reference id
@@ -48,14 +48,8 @@ type PortID struct {
 	Port int `json:"port" yaml:"port" protobuf:"bytes,4,opt,name=port"`
 }
 
-type AdaptorID struct {
-	NodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
-	// ModuleBay defines the moduleBay reference id
-	ModuleBay *int `json:"moduleBay,omitempty" yaml:"moduleBay,omitempty" protobuf:"bytes,2,opt,name=moduleBay"`
-	// Module defines the module reference id
-	Module *int `json:"module,omitempty" yaml:"module,omitempty" protobuf:"bytes,3,opt,name=module"`
-	// Port defines the id of the port
-	Port int `json:"port" yaml:"port" protobuf:"bytes,4,opt,name=port"`
+type PartitionAdaptorID struct {
+	PartitionPortID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
 	// Adaptor defines the name of the adaptor
 	Adaptor string `json:"adaptor" yaml:"adaptor" protobuf:"bytes,5,opt,name=adaptor"`
 }

apis/id/v1alpha1/id.go

@@ -38,8 +38,8 @@ type PartitionNodeID struct {
 	Node string `json:"node" yaml:"node" protobuf:"bytes,3,opt,name=node"`
 }
 
-type PortID struct {
-	NodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
+type PartitionPortID struct {
+	PartitionNodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
 	// ModuleBay defines the moduleBay reference id
 	ModuleBay *int `json:"moduleBay,omitempty" yaml:"moduleBay,omitempty" protobuf:"bytes,2,opt,name=moduleBay"`
 	// Module defines the module reference id
@@ -48,15 +48,9 @@ type PortID struct {
 	Port int `json:"port" yaml:"port" protobuf:"bytes,4,opt,name=port"`
 }
 
-type AdaptorID struct {
-	NodeID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
-	// ModuleBay defines the moduleBay reference id
-	ModuleBay *int `json:"moduleBay,omitempty" yaml:"moduleBay,omitempty" protobuf:"bytes,2,opt,name=moduleBay"`
-	// Module defines the module reference id
-	Module *int `json:"module,omitempty" yaml:"module,omitempty" protobuf:"bytes,3,opt,name=module"`
-	// Port defines the id of the port
-	Port int `json:"port" yaml:"port" protobuf:"bytes,4,opt,name=port"`
-	//Adaptor defines the adaptor used in the port, like an sfp, qsfp
+type PartitionAdaptorID struct {
+	PartitionPortID `json:",inline" yaml:",inline" protobuf:"bytes,1,opt,name=nodeID"`
+	// Adaptor defines the name of the adaptor
 	Adaptor string `json:"adaptor" yaml:"adaptor" protobuf:"bytes,5,opt,name=adaptor"`
 }
 

apis/infra/adaptor_helper.go

@@ -0,0 +1,32 @@
+/*
+Copyright 2024 Nokia.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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 infra
+
+import (
+	"github.com/kform-dev/choreo/apis/condition"
+)
+
+// GetCondition returns the condition based on the condition kind
+func (r *Adaptor) GetCondition(t condition.ConditionType) condition.Condition {
+	return r.Status.GetCondition(t)
+}
+
+// SetConditions sets the conditions on the resource. it allows for 0, 1 or more conditions
+// to be set at once
+func (r *Adaptor) SetConditions(c ...condition.Condition) {
+	r.Status.SetConditions(c...)
+}