7004

Committed 06 Jan 2023 02:15PM UTC coverage: 56.783%. First build

Build # 7004

Build Type

push

travis-ci-com

Committed by

akhilamohanan

Commit Message

<a href="https://github.com/noironetworks/aci-containers/commit/<a class=hub.com/noironetworks/aci-containers/commit/b0f1d0e006979a68c8f58808acab2ae109dfd9d1">b0f1d0e00<a href="https://github.com/noironetworks/aci-containers/commit/b0f1d0e006979a68c8f58808acab2ae109dfd9d1">&quot;&gt;hpp optimization

* optimize hpp when HppOptimize flag is enabled
* networkpolicy with same spec points to same hpp Mo
* name of hpp is hash of spec of networkpolicy

(cherry picked from commit </a><a class="double-link" href="https://github.com/noironetworks/aci-containers/commit/<a class="double-link" href="https://github.com/noironetworks/aci-containers/commit/ce33883855e3944cb86961bf7b9d991d5d676dae">ce3388385</a>">ce3388385</a><a href="https://github.com/noironetworks/aci-containers/commit/b0f1d0e006979a68c8f58808acab2ae109dfd9d1">)

Run Details

170 of 170 new or added lines in 5 files covered. (100.0%)

11916 of 20985 relevant lines covered (56.78%)

0.63 hits per line

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

0.0

/pkg/controller/status.go

// Copyright 2017 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 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 controller

import (
        "encoding/json"
        "fmt"
        "net/http"

        "github.com/noironetworks/aci-containers/pkg/metadata"
)

type contStatus struct {
        PodIpPool           metadata.NetIps `json:"pod-ip-pool,omitempty"`
        ServiceIpPool       metadata.NetIps `json:"service-ip-pool,omitempty"`
        StaticServiceIpPool metadata.NetIps `json:"static-service-ip-pool,omitempty"`
        NodeServiceIpPool   metadata.NetIps `json:"node-service-ip-pool,omitempty"`
}

func (cont *AciController) RunStatus() {
        if cont.config.StatusPort <= 0 {
                return
        }

        http.HandleFunc("/config", func(w http.ResponseWriter, r *http.Request) {
                w.Header().Set("Content-Type", "application/json")
                json.NewEncoder(w).Encode(cont.config)
        })
        http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
                w.Header().Set("Content-Type", "application/json")
                cont.indexMutex.Lock()
                status := &contStatus{
                        PodIpPool: metadata.NetIps{
                                V4: cont.podNetworkIps.V4.FreeList,
                                V6: cont.podNetworkIps.V6.FreeList,
                        },
                        ServiceIpPool: metadata.NetIps{
                                V4: cont.serviceIps.CombineV4(),
                                V6: cont.serviceIps.CombineV6(),
                        },
                        StaticServiceIpPool: metadata.NetIps{
                                V4: cont.staticServiceIps.V4.FreeList,
                                V6: cont.staticServiceIps.V6.FreeList,
                        },
                        NodeServiceIpPool: metadata.NetIps{
                                V4: cont.nodeServiceIps.V4.FreeList,
                                V6: cont.nodeServiceIps.V6.FreeList,
                        },
                }
                json.NewEncoder(w).Encode(status)
                cont.indexMutex.Unlock()
        })
        http.HandleFunc("/hpp", func(w http.ResponseWriter, r *http.Request) {
                w.Header().Set("Content-Type", "application/json")
                cont.indexMutex.Lock()
                json.NewEncoder(w).Encode(&cont.hppRef)
                cont.indexMutex.Unlock()
        })

        cont.log.Info("Starting status server")
        panic(http.ListenAndServe(fmt.Sprintf(":%d", cont.config.StatusPort), nil))
}

1	// Copyright 2017 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 WARRANTIES 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	package controller
16
17	import (
18	"encoding/json"
19	"fmt"
20	"net/http"
21
22	"github.com/noironetworks/aci-containers/pkg/metadata"
23	)
24
25	type contStatus struct {
26	PodIpPool metadata.NetIps `json:"pod-ip-pool,omitempty"`
27	ServiceIpPool metadata.NetIps `json:"service-ip-pool,omitempty"`
28	StaticServiceIpPool metadata.NetIps `json:"static-service-ip-pool,omitempty"`
29	NodeServiceIpPool metadata.NetIps `json:"node-service-ip-pool,omitempty"`
30	}
31
32	func (cont *AciController) RunStatus() {	×
33	if cont.config.StatusPort <= 0 {	×
34	return	×
35	}	×
36
37	http.HandleFunc("/config", func(w http.ResponseWriter, r *http.Request) {	×
38	w.Header().Set("Content-Type", "application/json")	×
39	json.NewEncoder(w).Encode(cont.config)	×
40	})	×
41	http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {	×
42	w.Header().Set("Content-Type", "application/json")	×
43	cont.indexMutex.Lock()	×
44	status := &contStatus{	×
45	PodIpPool: metadata.NetIps{	×
46	V4: cont.podNetworkIps.V4.FreeList,	×
47	V6: cont.podNetworkIps.V6.FreeList,	×
48	},	×
49	ServiceIpPool: metadata.NetIps{	×
50	V4: cont.serviceIps.CombineV4(),	×
51	V6: cont.serviceIps.CombineV6(),	×
52	},	×
53	StaticServiceIpPool: metadata.NetIps{	×
54	V4: cont.staticServiceIps.V4.FreeList,	×
55	V6: cont.staticServiceIps.V6.FreeList,	×
56	},	×
57	NodeServiceIpPool: metadata.NetIps{	×
58	V4: cont.nodeServiceIps.V4.FreeList,	×
59	V6: cont.nodeServiceIps.V6.FreeList,	×
60	},	×
61	}	×
62	json.NewEncoder(w).Encode(status)	×
63	cont.indexMutex.Unlock()	×
64	})	×
65	http.HandleFunc("/hpp", func(w http.ResponseWriter, r *http.Request) {	×
66	w.Header().Set("Content-Type", "application/json")	×
67	cont.indexMutex.Lock()	×
68	json.NewEncoder(w).Encode(&cont.hppRef)	×
69	cont.indexMutex.Unlock()	×
70	})	×
71
72	cont.log.Info("Starting status server")	×
73	panic(http.ListenAndServe(fmt.Sprintf(":%d", cont.config.StatusPort), nil))	×
74	}

noironetworks / aci-containers / 7004

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