9693

Committed 03 Sep 2024 03:23PM UTC coverage: 70.531% (-1.1%) from 71.633%

Build # 9693

Build Type

Pull #1379

travis-pro

Committed by

smshareef

Commit Message

Handle OutOfBandPolicy CR objects updates

(cherry picked from commit 53bfee4d9)
(cherry picked from commit 7b4214b85)

Pull Request Pull Request #1379: Handle OutOfBandPolicy CR objects updates

Run Details

60 of 324 new or added lines in 8 files covered. (18.52%)

14 existing lines in 5 files now uncovered.

11280 of 15993 relevant lines covered (70.53%)

0.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

9.28

/pkg/hostagent/oobpolicy.go

// Copyright 2019 Cisco Systems, Inc.
//
// 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 WARRATIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// Handlers for outofbandpolicy updates.

package hostagent

import (
        "context"
        "encoding/json"
        "os"
        "path/filepath"

        oobv1 "github.com/noironetworks/aci-containers/pkg/oobpolicy/apis/aci.oob/v1"
        oobpolicyclientset "github.com/noironetworks/aci-containers/pkg/oobpolicy/clientset/versioned"

        metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
        "k8s.io/apimachinery/pkg/runtime"
        "k8s.io/apimachinery/pkg/watch"
        "k8s.io/client-go/tools/cache"
        "k8s.io/kubernetes/pkg/controller"
)

func (agent *HostAgent) initOOBPolicyInformerFromClient(
        oobPolicyClient *oobpolicyclientset.Clientset) {
        agent.initOOBPolicyInformerBase(
                &cache.ListWatch{
                        ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
                                return oobPolicyClient.AciV1().OutOfBandPolicies(metav1.NamespaceAll).List(context.TODO(), options)
                        },
                        WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
                                return oobPolicyClient.AciV1().OutOfBandPolicies(metav1.NamespaceAll).Watch(context.TODO(), options)
                        },
                })
}

func (agent *HostAgent) initOOBPolicyInformerBase(listWatch *cache.ListWatch) {
        agent.oobPolicyInformer = cache.NewSharedIndexInformer(
                listWatch,
                &oobv1.OutOfBandPolicy{},
                controller.NoResyncPeriodFunc(),
                cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
        )
        agent.oobPolicyInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
                AddFunc: func(obj interface{}) {
                        agent.oobPolicyAdded(obj)
                },
                UpdateFunc: func(oldobj interface{}, newobj interface{}) {
                        agent.oobPolicyUpdate(oldobj, newobj)
                },
                DeleteFunc: func(obj interface{}) {
                        agent.oobPolicyDelete(obj)
                },
        })
}

type oobData struct {
        TunnelEpAdvertisementInterval uint64 `json:"tunnel-ep-advertisement-interval"`
}

func (agent *HostAgent) oobPolicyAdded(obj interface{}) {
        policy := obj.(*oobv1.OutOfBandPolicy)
        agent.log.Infof("OutOfBandPolicy added: %s", policy.Name)
        agent.updateOOBPolicy(policy)
}

func (agent *HostAgent) oobPolicyUpdate(oldobj interface{}, newobj interface{}) {
        oldpolicy := oldobj.(*oobv1.OutOfBandPolicy)
        newpolicy := newobj.(*oobv1.OutOfBandPolicy)
        agent.log.Infof("OutOfBandPolicy updated: %s", newpolicy.Name)
        if oldpolicy.Spec.TunnelEpAdvertisementInterval == newpolicy.Spec.TunnelEpAdvertisementInterval &&
                oldpolicy.Spec.VmmEpgDeploymentImmediacy == newpolicy.Spec.VmmEpgDeploymentImmediacy {
                agent.log.Infof("OutOfBandPolicy update: No change in policy")
                return
        }
        agent.updateOOBPolicy(newpolicy)
}

func (agent *HostAgent) oobPolicyDelete(obj interface{}) {
        agent.oobPolicyMutex.Lock()
        defer agent.oobPolicyMutex.Unlock()
        policy := obj.(*oobv1.OutOfBandPolicy)
        agent.log.Infof("OutOfBandPolicy deleted: %s", policy.Name)
        agent.deleteOOBPolicy()
}

func (agent *HostAgent) updateOOBPolicy(policy *oobv1.OutOfBandPolicy) {
        agent.oobPolicyMutex.Lock()
        defer agent.oobPolicyMutex.Unlock()

        tunnelEpAdvertisementInterval := policy.Spec.TunnelEpAdvertisementInterval
        vmmEpgDeploymentImmediacy := policy.Spec.VmmEpgDeploymentImmediacy

        if vmmEpgDeploymentImmediacy == oobv1.VmmEpgDeploymentImmediacyTypeImmediate {
                oobData := oobData{
                        TunnelEpAdvertisementInterval: tunnelEpAdvertisementInterval,
                }
                filePath := filepath.Join(agent.config.OOBPolicyDir, "aci-containers-system.oob")
                agent.log.Infof("Updating OutOfBandPolicy file %s", filePath)
                err := agent.writeOOBPolicyFile(filePath, oobData)
                if err != nil {
                        agent.log.Errorf("Failed to update OutOfBandPolicy file %s: %v", filePath, err)
                }
        } else {
                agent.deleteOOBPolicy()
        }
}

func (agent *HostAgent) deleteOOBPolicy() {
        filePath := filepath.Join(agent.config.OOBPolicyDir, "aci-containers-system.oob")
        agent.log.Infof("Deleting OutOfBandPolicy file %s", filePath)
        err := agent.deleteOOBPolicyFile(filePath)
        if err != nil {
                agent.log.Errorf("Failed to delete OutOfBandPolicy file %s: %v", filePath, err)
        }
}

func (agent *HostAgent) writeOOBPolicyFile(filePath string, oobData oobData) error {
        oobJson, err := json.MarshalIndent(oobData, "", "  ")
        if err != nil {
                return err
        }
        err = os.WriteFile(filePath, oobJson, 0644)
        if err != nil {
                agent.log.Fatalf("Failed to write oob policy data to file: %v", err)
                return err
        } else {
                agent.log.Infof("File %s updated", filePath)
        }

        return nil

}

func (agent *HostAgent) deleteOOBPolicyFile(filePath string) error {
        err := os.Remove(filePath)
        if err != nil {
                agent.log.Fatalf("Failed to delete oob policy data file: %v", err)
                return err
        } else {
                agent.log.Infof("File %s deleted", filePath)
        }
        return nil
}

1	// Copyright 2019 Cisco Systems, Inc.
2	//
3	// Licensed under the Apache License, Version 2.0 (the "License");
4	// you may not use this file except in compliance with the License.
5	// You may obtain a copy of the License at
6	//
7	// http://www.apache.org/licenses/LICENSE-2.0
8	//
9	// Unless required by applicable law or agreed to in writing, software
10	// distributed under the License is distributed on an "AS IS" BASIS,
11	// WITHOUT WARRATIES OR CONDITIONS OF ANY KIND, either express or implied.
12	// See the License for the specific language governing permissions and
13	// limitations under the License.
14
15	// Handlers for outofbandpolicy updates.
16
17	package hostagent
18
19	import (
20	"context"
21	"encoding/json"
22	"os"
23	"path/filepath"
24
25	oobv1 "github.com/noironetworks/aci-containers/pkg/oobpolicy/apis/aci.oob/v1"
26	oobpolicyclientset "github.com/noironetworks/aci-containers/pkg/oobpolicy/clientset/versioned"
27
28	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29	"k8s.io/apimachinery/pkg/runtime"
30	"k8s.io/apimachinery/pkg/watch"
31	"k8s.io/client-go/tools/cache"
32	"k8s.io/kubernetes/pkg/controller"
33	)
34
35	func (agent *HostAgent) initOOBPolicyInformerFromClient(
NEW 36	oobPolicyClient *oobpolicyclientset.Clientset) {	×
NEW 37	agent.initOOBPolicyInformerBase(	×
NEW 38	&cache.ListWatch{	×
NEW 39	ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {	×
NEW 40	return oobPolicyClient.AciV1().OutOfBandPolicies(metav1.NamespaceAll).List(context.TODO(), options)	×
NEW 41	},	×
NEW 42	WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {	×
NEW 43	return oobPolicyClient.AciV1().OutOfBandPolicies(metav1.NamespaceAll).Watch(context.TODO(), options)	×
NEW 44	},	×
45	})
46	}
47
48	func (agent HostAgent) initOOBPolicyInformerBase(listWatch cache.ListWatch) {	1✔
49	agent.oobPolicyInformer = cache.NewSharedIndexInformer(	1✔
50	listWatch,	1✔
51	&oobv1.OutOfBandPolicy{},	1✔
52	controller.NoResyncPeriodFunc(),	1✔
53	cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},	1✔
54	)	1✔
55	agent.oobPolicyInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{	1✔
56	AddFunc: func(obj interface{}) {	1✔
NEW 57	agent.oobPolicyAdded(obj)	×
NEW 58	},	×
NEW 59	UpdateFunc: func(oldobj interface{}, newobj interface{}) {	×
NEW 60	agent.oobPolicyUpdate(oldobj, newobj)	×
NEW 61	},	×
NEW 62	DeleteFunc: func(obj interface{}) {	×
NEW 63	agent.oobPolicyDelete(obj)	×
NEW 64	},	×
65	})
66	}
67
68	type oobData struct {
69	TunnelEpAdvertisementInterval uint64 `json:"tunnel-ep-advertisement-interval"`
70	}
71
NEW 72	func (agent *HostAgent) oobPolicyAdded(obj interface{}) {	×
NEW 73	policy := obj.(*oobv1.OutOfBandPolicy)	×
NEW 74	agent.log.Infof("OutOfBandPolicy added: %s", policy.Name)	×
NEW 75	agent.updateOOBPolicy(policy)	×
NEW 76	}	×
77
NEW 78	func (agent *HostAgent) oobPolicyUpdate(oldobj interface{}, newobj interface{}) {	×
NEW 79	oldpolicy := oldobj.(*oobv1.OutOfBandPolicy)	×
NEW 80	newpolicy := newobj.(*oobv1.OutOfBandPolicy)	×
NEW 81	agent.log.Infof("OutOfBandPolicy updated: %s", newpolicy.Name)	×
NEW 82	if oldpolicy.Spec.TunnelEpAdvertisementInterval == newpolicy.Spec.TunnelEpAdvertisementInterval &&	×
NEW 83	oldpolicy.Spec.VmmEpgDeploymentImmediacy == newpolicy.Spec.VmmEpgDeploymentImmediacy {	×
NEW 84	agent.log.Infof("OutOfBandPolicy update: No change in policy")	×
NEW 85	return	×
NEW 86	}	×
NEW 87	agent.updateOOBPolicy(newpolicy)	×
88	}
89
NEW 90	func (agent *HostAgent) oobPolicyDelete(obj interface{}) {	×
NEW 91	agent.oobPolicyMutex.Lock()	×
NEW 92	defer agent.oobPolicyMutex.Unlock()	×
NEW 93	policy := obj.(*oobv1.OutOfBandPolicy)	×
NEW 94	agent.log.Infof("OutOfBandPolicy deleted: %s", policy.Name)	×
NEW 95	agent.deleteOOBPolicy()	×
NEW 96	}	×
97
NEW 98	func (agent HostAgent) updateOOBPolicy(policy oobv1.OutOfBandPolicy) {	×
NEW 99	agent.oobPolicyMutex.Lock()	×
NEW 100	defer agent.oobPolicyMutex.Unlock()	×
NEW 101		×
NEW 102	tunnelEpAdvertisementInterval := policy.Spec.TunnelEpAdvertisementInterval	×
NEW 103	vmmEpgDeploymentImmediacy := policy.Spec.VmmEpgDeploymentImmediacy	×
NEW 104		×
NEW 105	if vmmEpgDeploymentImmediacy == oobv1.VmmEpgDeploymentImmediacyTypeImmediate {	×
NEW 106	oobData := oobData{	×
NEW 107	TunnelEpAdvertisementInterval: tunnelEpAdvertisementInterval,	×
NEW 108	}	×
NEW 109	filePath := filepath.Join(agent.config.OOBPolicyDir, "aci-containers-system.oob")	×
NEW 110	agent.log.Infof("Updating OutOfBandPolicy file %s", filePath)	×
NEW 111	err := agent.writeOOBPolicyFile(filePath, oobData)	×
NEW 112	if err != nil {	×
NEW 113	agent.log.Errorf("Failed to update OutOfBandPolicy file %s: %v", filePath, err)	×
NEW 114	}	×
NEW 115	} else {	×
NEW 116	agent.deleteOOBPolicy()	×
NEW 117	}	×
118	}
119
NEW 120	func (agent *HostAgent) deleteOOBPolicy() {	×
NEW 121	filePath := filepath.Join(agent.config.OOBPolicyDir, "aci-containers-system.oob")	×
NEW 122	agent.log.Infof("Deleting OutOfBandPolicy file %s", filePath)	×
NEW 123	err := agent.deleteOOBPolicyFile(filePath)	×
NEW 124	if err != nil {	×
NEW 125	agent.log.Errorf("Failed to delete OutOfBandPolicy file %s: %v", filePath, err)	×
NEW 126	}	×
127	}
128
NEW 129	func (agent *HostAgent) writeOOBPolicyFile(filePath string, oobData oobData) error {	×
NEW 130	oobJson, err := json.MarshalIndent(oobData, "", " ")	×
NEW 131	if err != nil {	×
NEW 132	return err	×
NEW 133	}	×
NEW 134	err = os.WriteFile(filePath, oobJson, 0644)	×
NEW 135	if err != nil {	×
NEW 136	agent.log.Fatalf("Failed to write oob policy data to file: %v", err)	×
NEW 137	return err	×
NEW 138	} else {	×
NEW 139	agent.log.Infof("File %s updated", filePath)	×
NEW 140	}	×
141
NEW 142	return nil	×
143
144	}
145
NEW 146	func (agent *HostAgent) deleteOOBPolicyFile(filePath string) error {	×
NEW 147	err := os.Remove(filePath)	×
NEW 148	if err != nil {	×
NEW 149	agent.log.Fatalf("Failed to delete oob policy data file: %v", err)	×
NEW 150	return err	×
NEW 151	} else {	×
NEW 152	agent.log.Infof("File %s deleted", filePath)	×
NEW 153	}	×
NEW 154	return nil	×
155	}

noironetworks / aci-containers / 9693

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous