wip

Author: nikatza

Tiltfile

@@ -42,16 +42,11 @@ k8s_yaml(device_yaml())
 k8s_resource(new_name='leaf1', objects=['leaf1:device', 'secret-basic-auth:secret'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 
 k8s_yaml('./config/samples/v1alpha1_interface.yaml')
-k8s_yaml('./config/samples/cisco/nx/v1alpha1_portchannelconfig.yaml')
 k8s_resource(new_name='lo0', objects=['lo0:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 k8s_resource(new_name='lo1', objects=['lo1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 k8s_resource(new_name='eth1-1', objects=['eth1-1:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 k8s_resource(new_name='eth1-2', objects=['eth1-2:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 k8s_resource(new_name='svi-10', objects=['svi-10:interface'], resource_deps=['vlan-10'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
-k8s_resource(new_name='eth1-10', objects=['eth1-10:interface'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
-# Interface resources relevant to vPC configuration are defined below in the "vpcdomain" sample
-#k8s_resource(new_name='po1-cfg', objects=['po1-cfg:portchannelconfig'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
-#k8s_resource(new_name='po2', objects=['po2:interface'],  trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)
 
 k8s_yaml('./config/samples/v1alpha1_banner.yaml')
 k8s_resource(new_name='banner', objects=['banner:banner'], trigger_mode=TRIGGER_MODE_MANUAL, auto_init=False)

api/cisco/nx/v1alpha1/portchannelconfig_types.go

@@ -201,13 +201,29 @@ type VPCDomainStatus struct {
 	// +optional
 	KeepaliveStatus KeepAliveStatus `json:"keepaliveStatus,omitempty"`
 
+	// KeepaliveStatusMsg provides additional information about the keepalive status.
+	// +optional
+	KeepaliveStatusMsg string `json:"keepaliveStatusMsg,omitempty"`
+
 	// PeerStatus indicates the status of the vPCDomain peer-link.
 	// +optional
 	PeerStatus PeerStatus `json:"peerStatus,omitempty"`
 
+	// PeerStatusMsg provides additional information about the peer status.
+	// +optional
+	PeerStatusMsg string `json:"peerStatusMsg,omitempty"`
+
 	// PeerUptime indicates how long the vPCDomain peer has been up and reachable via keepalive.
 	// +optional
 	PeerUptime metav1.Duration `json:"peerUptime,omitempty"`
+
+	// PeerLinkIf is the name of the interface used as the vPCDomain peer-link.
+	// +optional
+	PeerLinkIf string `json:"peerLinkIf,omitempty"`
+
+	// PeerLinkIfOperStatus is the Operational status of `PeerLinkIf`.
+	// +optional
+	PeerLinkIfOperStatus string `json:"peerLinkIfOperStatus,omitempty"`
 }
 
 // The VPCDomainRole type represents the operational role of a vPCDomain peer as returned by the device.
@@ -235,6 +251,13 @@ const (
 	PeerStatusDown PeerStatus = "Down"
 )
 
+type LinkStatus string
+
+const (
+	LinkStatusUp   LinkStatus = "Up"
+	LinkStatusDown LinkStatus = "Down"
+)
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:path=vpcdomains
@@ -245,11 +268,12 @@ const (
 // +kubebuilder:printcolumn:name="Enabled",type=string,JSONPath=`.spec.adminState`
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
 // +kubebuilder:printcolumn:name="Configured",type=string,JSONPath=`.status.conditions[?(@.type=="Configured")].status`,priority=1
-// +kubebuilder:printcolumn:name="Operational",type=string,JSONPath=`.status.conditions[?(@.type=="Operational")].status`,priority=1
-// +kubebuilder:printcolumn:name="Role",type=string,JSONPath=`.status.role`,priority=1
-// +kubebuilder:printcolumn:name="KeepAliveStatus",type=string,JSONPath=`.status.keepaliveStatus`,priority=1
 // +kubebuilder:printcolumn:name="PeerStatus",type=string,JSONPath=`.status.peerStatus`,priority=1
-// +kubebuilder:printcolumn:name="PeerUptime",type="string",JSONPath=`.status.peerUptime`,priority=1
+// +kubebuilder:printcolumn:name="Role",type=string,JSONPath=`.status.role`,priority=1
+// +kubebuilder:printcolumn:name="PeerLinkIf",type="string",JSONPath=".status.peerLinkIf",priority=1
+// +kubebuilder:printcolumn:name="PeerLinkIfOperSt",type="string",JSONPath=".status.peerLinkIfOperStatus",priority=1
+// +kubebuilder:printcolumn:name="KA-PeerStatus",type=string,JSONPath=`.status.keepaliveStatus`,priority=1
+// +kubebuilder:printcolumn:name="KA-PeerUptime",type="string",JSONPath=`.status.peerUptime`,priority=1
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // VPCDomain is the Schema for the VPCDomains API

api/cisco/nx/v1alpha1/vpcdomain_types.go

@@ -33,24 +33,28 @@ spec:
       name: Configured
       priority: 1
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Operational")].status
-      name: Operational
+    - jsonPath: .status.peerStatus
+      name: PeerStatus
       priority: 1
       type: string
     - jsonPath: .status.role
       name: Role
       priority: 1
       type: string
-    - jsonPath: .status.keepaliveStatus
-      name: KeepAliveStatus
+    - jsonPath: .status.peerLinkIf
+      name: PeerLinkIf
       priority: 1
       type: string
-    - jsonPath: .status.peerStatus
-      name: PeerStatus
+    - jsonPath: .status.peerLinkIfOperStatus
+      name: PeerLinkIfOperSt
+      priority: 1
+      type: string
+    - jsonPath: .status.keepaliveStatus
+      name: KA-PeerStatus
       priority: 1
       type: string
     - jsonPath: .status.peerUptime
-      name: PeerUptime
+      name: KA-PeerUptime
       priority: 1
       type: string
     - jsonPath: .metadata.creationTimestamp
@@ -386,9 +390,24 @@ spec:
                 description: KeepaliveStatus indicates the status of the peer via
                   the keepalive link.
                 type: string
+              keepaliveStatusMsg:
+                description: KeepaliveStatusMsg provides additional information about
+                  the keepalive status.
+                type: string
+              peerLinkIf:
+                description: PeerLinkIf is the name of the interface used as the vPCDomain
+                  peer-link.
+                type: string
+              peerLinkIfOperStatus:
+                description: PeerLinkIfOperStatus is the Operational status of `PeerLinkIf`.
+                type: string
               peerStatus:
                 description: PeerStatus indicates the status of the vPCDomain peer-link.
                 type: string
+              peerStatusMsg:
+                description: PeerStatusMsg provides additional information about the
+                  peer status.
+                type: string
               peerUptime:
                 description: PeerUptime indicates how long the vPCDomain peer has
                   been up and reachable via keepalive.

api/cisco/nx/v1alpha1/zz_generated.deepcopy.go

@@ -26,7 +26,6 @@ resources:
 - bases/nx.cisco.networking.metal.ironcore.dev_systems.yaml
 - bases/nx.cisco.networking.metal.ironcore.dev_managementaccessconfigs.yaml
 - bases/nx.cisco.networking.metal.ironcore.dev_vpcdomains.yaml
-- bases/nx.cisco.networking.metal.ironcore.dev_portchannelconfigs.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patches: