diff --git a/config/crd/bases/req.nephio.org_datanetworks.yaml b/config/crd/bases/req.nephio.org_datanetworks.yaml index 8d694bd7..c61d63ea 100644 --- a/config/crd/bases/req.nephio.org_datanetworks.yaml +++ b/config/crd/bases/req.nephio.org_datanetworks.yaml @@ -33,7 +33,7 @@ spec: type: object spec: properties: - networkInstanceReference: + networkInstance: description: NetworkInstance defines the networkInstance context to which this DNN belongs Name and optionally Namespace is used here properties: @@ -87,9 +87,58 @@ spec: type: object type: array required: - - networkInstanceReference + - networkInstance type: object status: + properties: + ipAllocationStatus: + description: IPAllocationStatus defines the observed state of IPAllocation + properties: + conditions: + description: Conditions of the resource. + items: + description: A Condition that may apply to a resource + properties: + kind: + description: Type of this condition. At most one of each + condition type may apply to a resource at any point in + time. + type: string + lastTransitionTime: + description: LastTransitionTime is the last time this condition + transitioned from one status to another. + format: date-time + type: string + message: + description: A Message containing details about this condition's + last transition from one status to another, if any. + type: string + reason: + description: A Reason for this condition's last transition + from one status to another. + type: string + status: + description: Status of this condition; is it currently True, + False, or Unknown? + type: string + required: + - kind + - lastTransitionTime + - reason + - status + type: object + type: array + expiryTime: + description: expiryTime indicated when the allocation expires + type: string + gateway: + description: Gateway identifies the gatway IP for the network + type: string + prefix: + description: AllocatedPrefix identifies the prefix that was allocated + by the IPAM system + type: string + type: object type: object type: object served: true diff --git a/config/crd/bases/req.nephio.org_interfaces.yaml b/config/crd/bases/req.nephio.org_interfaces.yaml index 30bba1d7..01c7cee8 100644 --- a/config/crd/bases/req.nephio.org_interfaces.yaml +++ b/config/crd/bases/req.nephio.org_interfaces.yaml @@ -91,6 +91,104 @@ spec: - networkInstance type: object status: + properties: + ipAllocationStatus: + description: IPAllocationStatus defines the observed state of IPAllocation + properties: + conditions: + description: Conditions of the resource. + items: + description: A Condition that may apply to a resource + properties: + kind: + description: Type of this condition. At most one of each + condition type may apply to a resource at any point in + time. + type: string + lastTransitionTime: + description: LastTransitionTime is the last time this condition + transitioned from one status to another. + format: date-time + type: string + message: + description: A Message containing details about this condition's + last transition from one status to another, if any. + type: string + reason: + description: A Reason for this condition's last transition + from one status to another. + type: string + status: + description: Status of this condition; is it currently True, + False, or Unknown? + type: string + required: + - kind + - lastTransitionTime + - reason + - status + type: object + type: array + expiryTime: + description: expiryTime indicated when the allocation expires + type: string + gateway: + description: Gateway identifies the gatway IP for the network + type: string + prefix: + description: AllocatedPrefix identifies the prefix that was allocated + by the IPAM system + type: string + type: object + vlanAllocationStatus: + description: VLANAllocationStatus defines the observed state of VLANAllocation + properties: + conditions: + description: Conditions of the resource. + items: + description: A Condition that may apply to a resource + properties: + kind: + description: Type of this condition. At most one of each + condition type may apply to a resource at any point in + time. + type: string + lastTransitionTime: + description: LastTransitionTime is the last time this condition + transitioned from one status to another. + format: date-time + type: string + message: + description: A Message containing details about this condition's + last transition from one status to another, if any. + type: string + reason: + description: A Reason for this condition's last transition + from one status to another. + type: string + status: + description: Status of this condition; is it currently True, + False, or Unknown? + type: string + required: + - kind + - lastTransitionTime + - reason + - status + type: object + type: array + expiryTime: + description: expiryTime indicated when the allocation expires + type: string + vlanID: + description: AllocatedVlan identifies the vlan that was allocated + by the VLAN backend + type: integer + vlanRange: + description: AllocatedVlan identifies the vlan range that was + allocated by the VLAN backend + type: string + type: object type: object type: object served: true diff --git a/config/crd/bases/workload.nephio.org_amfdeployments.yaml b/config/crd/bases/workload.nephio.org_amfdeployments.yaml index 139464fa..fc5d62e5 100644 --- a/config/crd/bases/workload.nephio.org_amfdeployments.yaml +++ b/config/crd/bases/workload.nephio.org_amfdeployments.yaml @@ -226,7 +226,7 @@ spec: - bgpNeighbors - routerID type: object - dnns: + dataNetworks: description: DataNetworks defines the data networks assocated with the network instance items: diff --git a/config/crd/bases/workload.nephio.org_smfdeployments.yaml b/config/crd/bases/workload.nephio.org_smfdeployments.yaml index d02334ac..50c7627c 100644 --- a/config/crd/bases/workload.nephio.org_smfdeployments.yaml +++ b/config/crd/bases/workload.nephio.org_smfdeployments.yaml @@ -226,7 +226,7 @@ spec: - bgpNeighbors - routerID type: object - dnns: + dataNetworks: description: DataNetworks defines the data networks assocated with the network instance items: diff --git a/config/crd/bases/workload.nephio.org_upfdeployments.yaml b/config/crd/bases/workload.nephio.org_upfdeployments.yaml index f42c8411..5839f61c 100644 --- a/config/crd/bases/workload.nephio.org_upfdeployments.yaml +++ b/config/crd/bases/workload.nephio.org_upfdeployments.yaml @@ -226,7 +226,7 @@ spec: - bgpNeighbors - routerID type: object - dnns: + dataNetworks: description: DataNetworks defines the data networks assocated with the network instance items: diff --git a/nf_requirements/v1alpha1/zz_generated.deepcopy.go b/nf_requirements/v1alpha1/zz_generated.deepcopy.go index 2ab6e355..9061502f 100644 --- a/nf_requirements/v1alpha1/zz_generated.deepcopy.go +++ b/nf_requirements/v1alpha1/zz_generated.deepcopy.go @@ -22,6 +22,8 @@ limitations under the License. package v1alpha1 import ( + ipamv1alpha1 "github.com/nokia/k8s-ipam/apis/alloc/ipam/v1alpha1" + vlanv1alpha1 "github.com/nokia/k8s-ipam/apis/alloc/vlan/v1alpha1" "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -91,7 +93,7 @@ func (in *DataNetwork) DeepCopyInto(out *DataNetwork) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status + in.Status.DeepCopyInto(&out.Status) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataNetwork. @@ -142,6 +144,11 @@ func (in *DataNetworkSpec) DeepCopy() *DataNetworkSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DataNetworkStatus) DeepCopyInto(out *DataNetworkStatus) { *out = *in + if in.IPAllocationStatus != nil { + in, out := &in.IPAllocationStatus, &out.IPAllocationStatus + *out = new(ipamv1alpha1.IPAllocationStatus) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataNetworkStatus. @@ -160,7 +167,7 @@ func (in *Interface) DeepCopyInto(out *Interface) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status + in.Status.DeepCopyInto(&out.Status) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Interface. @@ -204,6 +211,16 @@ func (in *InterfaceSpec) DeepCopy() *InterfaceSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *InterfaceStatus) DeepCopyInto(out *InterfaceStatus) { *out = *in + if in.IPAllocationStatus != nil { + in, out := &in.IPAllocationStatus, &out.IPAllocationStatus + *out = new(ipamv1alpha1.IPAllocationStatus) + (*in).DeepCopyInto(*out) + } + if in.VLANAllocationStatus != nil { + in, out := &in.VLANAllocationStatus, &out.VLANAllocationStatus + *out = new(vlanv1alpha1.VLANAllocationStatus) + (*in).DeepCopyInto(*out) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InterfaceStatus.