Skip to content

cisco-nxos-provider: refactor Trustpoint configuration #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felix-kaestner merged 1 commit into from
Sep 2, 2025
Merged

cisco-nxos-provider: refactor Trustpoint configuration #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 11 additions & 25 deletions internal/provider/cisco/nxos/crypto/trustpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,28 @@ import (
"github.com/ironcore-dev/network-operator/internal/provider/cisco/nxos/gnmiext"
)

var _ gnmiext.DeviceConf = (*Trustpoint)(nil)

type Trustpoint struct {
ID string
}

var _ gnmiext.DeviceConf = Trustpoints{}

type Trustpoints []*Trustpoint

func (t Trustpoints) ToYGOT(_ gnmiext.Client) ([]gnmiext.Update, error) {
items := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems{TPList: make(map[string]*nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList, len(t))}
for _, tp := range t {
list := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList{
Name: ygot.String(tp.ID),
}
list.PopulateDefaults()

if err := items.AppendTPList(list); err != nil {
return nil, err
}
}

func (t *Trustpoint) ToYGOT(_ gnmiext.Client) ([]gnmiext.Update, error) {
v := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList{}
v.PopulateDefaults()
v.Name = ygot.String(t.ID)
return []gnmiext.Update{
gnmiext.ReplacingUpdate{
XPath: "System/userext-items/pkiext-items/tp-items",
Value: items,
XPath: "System/userext-items/pkiext-items/tp-items/TP-list[name=" + t.ID + "]",
Value: v,
},
}, nil
}

func (t Trustpoints) Reset(_ gnmiext.Client) ([]gnmiext.Update, error) {
items := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems{}
items.PopulateDefaults()
func (t *Trustpoint) Reset(_ gnmiext.Client) ([]gnmiext.Update, error) {
return []gnmiext.Update{
gnmiext.ReplacingUpdate{
XPath: "System/userext-items/pkiext-items/tp-items",
Value: items,
gnmiext.DeletingUpdate{
XPath: "System/userext-items/pkiext-items/tp-items/TP-list[name=" + t.ID + "]",
},
}, nil
}
24 changes: 10 additions & 14 deletions internal/provider/cisco/nxos/crypto/trustpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

func Test_Trustpoint(t *testing.T) {
tp := &Trustpoints{{ID: "mytrustpoint"}}
tp := &Trustpoint{ID: "mytrustpoint"}

got, err := tp.ToYGOT(&gnmiext.ClientMock{})
if err != nil {
Expand All @@ -30,26 +30,22 @@ func Test_Trustpoint(t *testing.T) {
t.Errorf("expected value to be of type ReplacingUpdate")
}

if update.XPath != "System/userext-items/pkiext-items/tp-items" {
t.Errorf("expected key 'System/userext-items/pkiext-items/tp-items' to be present")
if update.XPath != "System/userext-items/pkiext-items/tp-items/TP-list[name=mytrustpoint]" {
t.Errorf("expected key 'System/userext-items/pkiext-items/tp-items/TP-list[name=mytrustpoint]' to be present")
}

ti, ok := update.Value.(*nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems)
ti, ok := update.Value.(*nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList)
if !ok {
t.Errorf("expected value to be of type *nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems")
}

want := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems{
TPList: map[string]*nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList{
"mytrustpoint": {
Name: ygot.String("mytrustpoint"),
KeyType: nxos.Cisco_NX_OSDevice_Pki_KeyType_Type_RSA,
RevokeCheckConf: nxos.Cisco_NX_OSDevice_Pki_CertRevokeCheck_crl,
EnrollmentType: nxos.Cisco_NX_OSDevice_Pki_CertEnrollType_none,
},
},
want := &nxos.Cisco_NX_OSDevice_System_UserextItems_PkiextItems_TpItems_TPList{
Name: ygot.String("mytrustpoint"),
KeyType: nxos.Cisco_NX_OSDevice_Pki_KeyType_Type_RSA,
RevokeCheckConf: nxos.Cisco_NX_OSDevice_Pki_CertRevokeCheck_crl,
EnrollmentType: nxos.Cisco_NX_OSDevice_Pki_CertEnrollType_none,
}
if !reflect.DeepEqual(ti, want) {
t.Errorf("unexpected value for 'System/userext-items/pkiext-items/tp-items': got=%+v, want=%+v", ti, want)
t.Errorf("unexpected value for 'System/userext-items/pkiext-items/tp-items/TP-list[name=mytrustpoint]': got=%+v, want=%+v", ti, want)
}
}
14 changes: 4 additions & 10 deletions internal/provider/cisco/nxos/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,17 +413,11 @@ func (step *Trustpoints) Exec(ctx context.Context, s *Scope) error {
if step.Spec == nil {
return nil
}
t := make(crypto.Trustpoints, 0, len(step.Spec.Certificates))
for _, trustpoint := range step.Spec.Certificates {
t = append(t, &crypto.Trustpoint{ID: trustpoint.Name})
}
if err := s.GNMI.Update(ctx, t); err != nil {
return err
}
if step.DryRun {
return nil
}
for _, trustpoint := range step.Spec.Certificates {
tp := &crypto.Trustpoint{ID: trustpoint.Name}
if err := s.GNMI.Update(ctx, tp); err != nil {
return fmt.Errorf("failed to get trustpoint %s: %w", trustpoint.Name, err)
}
cert, err := s.Client.Certificate(ctx, trustpoint.Source.SecretRef)
if err != nil {
return fmt.Errorf("failed to get trustpoint certificate from secret: %w", err)
Expand Down
Loading