Added BGP resource (#32)

* refactor: make netris storage as a seperate package

* feat: netris storage: add functions for ebgp additional types

* feat: ebgp: EBGPToEBGPMeta convert

* feat: ebgp: EBGPToEBGPMeta type translation

* feat: ebgp: add, update funtionality

* feat: ebgp: get prefix length from localIP

* fix: ebgp: fix fields

* refactor: rename ebgp to bgp

* feat: bgp: add comparison functionality

* fix: bgp: terminateOnSwitch value should be 'yes/no' only

* fix: bgp: compare nfvID with termSwitchID if termOnSwitch is disabled

* fix: bgp: fill switchTermID field

* fix: bgp: compare rcircuidID field

* fix: bgp: don't compare termSwitchName

* fix: bgp: don't compare prefixLimit

* update bgp sample

* feat: bgp: change terminateOnSwitch field structure

* fix: bgp: set vlanID to 1 as untagged

* feat: bgp: add additional printed columns

* fix: bgp: improve vlanID handling

* update dockerfile and increase app version

* Added bgp crds

Co-authored-by: Artashes Balabekyan <[email protected]>

Author: pogossian

Dockerfile

@@ -21,6 +21,7 @@ COPY api/ api/
 COPY controllers/ controllers/
 COPY configloader/ configloader/
 COPY lbwatcher/ lbwatcher/
+COPY netrisstorage/ netrisstorage/
 
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o manager main.go

PROJECT

@@ -10,10 +10,10 @@ resources:
   kind: VNetMeta
   version: v1alpha1
 - group: k8s
-  kind: EBGP
+  kind: BGP
   version: v1alpha1
 - group: k8s
-  kind: EBGPMeta
+  kind: BGPMeta
   version: v1alpha1
 - group: k8s
   kind: L4LB

api/v1alpha1/ebgp_types.go renamed to api/v1alpha1/bgp_types.go

@@ -23,24 +23,30 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// EBGPStatus defines the observed state of EBGP
-type EBGPStatus struct {
+// BGPStatus defines the observed state of BGP
+type BGPStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	Status  string `json:"status,omitempty"`
-	Message string `json:"message,omitempty"`
+	Status            string      `json:"status,omitempty"`
+	State             string      `json:"state,omitempty"`
+	ModifiedDate      metav1.Time `json:"modified,omitempty"`
+	Message           string      `json:"message,omitempty"`
+	BGPState          string      `json:"bgpstate,omitempty"`
+	PortState         string      `json:"portstate,omitempty"`
+	TerminateOnSwitch string      `json:"terminateOnSwitch,omitempty"`
+	VLANID            string      `json:"vlanID,omitempty"`
 }
 
-// EBGPSpec defines the desired state of EBGP
-type EBGPSpec struct {
+// BGPSpec defines the desired state of BGP
+type BGPSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	Site       string        `json:"site"`
-	Softgate   string        `json:"softgate"`
-	NeighborAS int           `json:"neighborAs"`
-	Transport  EBGPTransport `json:"transport"`
+	Site       string       `json:"site"`
+	Softgate   string       `json:"softgate,omitempty"`
+	NeighborAS int          `json:"neighborAs"`
+	Transport  BGPTransport `json:"transport"`
 
 	// +kubebuilder:validation:Pattern=`(^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\/([0-9]|[12]\d|3[0-2]))?$)|(^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?(\/([1-9]|[1-5][0-9]|6[0-4]))?$)`
 	LocalIP string `json:"localIP"`
@@ -50,26 +56,32 @@ type EBGPSpec struct {
 	Description string `json:"description,omitempty"`
 
 	// +kubebuilder:validation:Enum=enabled;disabled
-	State              string       `json:"state,omitempty"`
-	TerminateOnSwitch  bool         `json:"terminateOnSwitch,omitempty"`
-	Multihop           EBGPMultihop `json:"multihop,omitempty"`
-	BGPPassword        string       `json:"bgpPassword,omitempty"`
-	AllowAsIn          int          `json:"allowAsIn,omitempty"`
-	DefaultOriginate   bool         `json:"defaultOriginate,omitempty"`
-	PrefixInboundMax   int          `json:"prefixInboundMax,omitempty"`
-	InboundRouteMap    string       `json:"inboundRouteMap,omitempty"`
-	OutboundRouteMap   string       `json:"outboundRouteMap,omitempty"`
-	LocalPreference    int          `json:"localPreference,omitempty"`
-	Weight             int          `json:"weight,omitempty"`
-	PrependInbound     int          `json:"prependInbound,omitempty"`
-	PrependOutbound    int          `json:"prependOutbound,omitempty"`
-	PrefixListInbound  []string     `json:"prefixListInbound,omitempty"`
-	PrefixListOutbound []string     `json:"prefixListOutbound,omitempty"`
-	SendBGPCommunity   []string     `json:"sendBGPCommunity,omitempty"`
+	State              string               `json:"state,omitempty"`
+	TerminateOnSwitch  BGPTerminateOnSwitch `json:"terminateOnSwitch,omitempty"`
+	Multihop           BGPMultihop          `json:"multihop,omitempty"`
+	BGPPassword        string               `json:"bgpPassword,omitempty"`
+	AllowAsIn          int                  `json:"allowAsIn,omitempty"`
+	DefaultOriginate   bool                 `json:"defaultOriginate,omitempty"`
+	PrefixInboundMax   int                  `json:"prefixInboundMax,omitempty"`
+	InboundRouteMap    string               `json:"inboundRouteMap,omitempty"`
+	OutboundRouteMap   string               `json:"outboundRouteMap,omitempty"`
+	LocalPreference    int                  `json:"localPreference,omitempty"`
+	Weight             int                  `json:"weight,omitempty"`
+	PrependInbound     int                  `json:"prependInbound,omitempty"`
+	PrependOutbound    int                  `json:"prependOutbound,omitempty"`
+	PrefixListInbound  []string             `json:"prefixListInbound,omitempty"`
+	PrefixListOutbound []string             `json:"prefixListOutbound,omitempty"`
+	SendBGPCommunity   []string             `json:"sendBGPCommunity,omitempty"`
 }
 
-// EBGPMultihop .
-type EBGPMultihop struct {
+// BGPTerminateOnSwitch .
+type BGPTerminateOnSwitch struct {
+	Enabled    bool   `json:"enabled"`
+	SwitchName string `json:"switchName,omitempty"`
+}
+
+// BGPMultihop .
+type BGPMultihop struct {
 	// +kubebuilder:validation:Pattern=`(^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\/([0-9]|[12]\d|3[0-2]))?$)|(^((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?(\/([1-9]|[1-5][0-9]|6[0-4]))?$)`
 	NeighborAddress string `json:"neighborAddress,omitempty"`
 
@@ -78,36 +90,47 @@ type EBGPMultihop struct {
 	Hops         int    `json:"hops,omitempty"`
 }
 
-// EBGPTransport .
-type EBGPTransport struct {
+// BGPTransport .
+type BGPTransport struct {
 	// +kubebuilder:validation:Enum=port;vnet
 	Type string `json:"type,omitempty"`
-	// +kubebuilder:validation:Pattern=`(^[a-zA-Z0-9]+@[a-zA-Z0-9-]+$)|(^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$)`
+	// +kubebuilder:validation:Pattern=`(^[a-zA-Z0-9]+@[a-zA-Z0-9-]+$)|(^[a-zA-Z0-9]([-a-zA-Z0-9]*[a-z0-9])?(\.[a-zA-Z0-9]([-a-zA-Z0-9]*[a-zA-Z0-9])?)*$)`
 	Name   string `json:"name"`
 	VlanID int    `json:"vlanId,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-
-// EBGP is the Schema for the ebgps API
-type EBGP struct {
+// +kubebuilder:printcolumn:name="State",type=string,JSONPath=`.status.state`
+// +kubebuilder:printcolumn:name="BGP State",type=string,JSONPath=`.status.bgpstate`
+// +kubebuilder:printcolumn:name="Port State",type=string,JSONPath=`.status.portstate`
+// +kubebuilder:printcolumn:name="NeighborAS",type=string,JSONPath=`.spec.neighborAs`
+// +kubebuilder:printcolumn:name="Local address",type=string,JSONPath=`.spec.localIP`
+// +kubebuilder:printcolumn:name="Remote address",type=string,JSONPath=`.spec.remoteIP`
+// +kubebuilder:printcolumn:name="Port",type=string,JSONPath=`.spec.transport.name`,priority=1
+// +kubebuilder:printcolumn:name="VLANID",type=string,JSONPath=`.status.vlanID`,priority=1
+// +kubebuilder:printcolumn:name="TerminatedOn",type=string,JSONPath=`.status.terminateOnSwitch`,priority=1
+// +kubebuilder:printcolumn:name="Modified",type=date,JSONPath=`.status.modified`,priority=1
+// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
+
+// BGP is the Schema for the bgps API
+type BGP struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   EBGPSpec   `json:"spec,omitempty"`
-	Status EBGPStatus `json:"status,omitempty"`
+	Spec   BGPSpec   `json:"spec,omitempty"`
+	Status BGPStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// EBGPList contains a list of EBGP
-type EBGPList struct {
+// BGPList contains a list of BGP
+type BGPList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EBGP `json:"items"`
+	Items           []BGP `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&EBGP{}, &EBGPList{})
+	SchemeBuilder.Register(&BGP{}, &BGPList{})
 }

api/v1alpha1/ebgpmeta_types.go renamed to api/v1alpha1/bgpmeta_types.go

@@ -23,15 +23,15 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// EBGPMetaSpec defines the desired state of EBGPMeta
-type EBGPMetaSpec struct {
+// BGPMetaSpec defines the desired state of BGPMeta
+type BGPMetaSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	Imported         bool   `json:"imported"`
-	Reclaim          bool   `json:"reclaimPolicy"`
-	EBGPCRGeneration int64  `json:"ebgpGeneration"`
-	ID               int    `json:"id"`
-	EBGPName         string `json:"ebgpName"`
+	Imported        bool   `json:"imported"`
+	Reclaim         bool   `json:"reclaimPolicy"`
+	BGPCRGeneration int64  `json:"bgpGeneration"`
+	ID              int    `json:"id"`
+	BGPName         string `json:"bgpName"`
 
 	AllowasIn          int    `json:"allowas_in"`
 	BgpPassword        string `json:"bgp_password"`
@@ -71,32 +71,32 @@ type EBGPMetaSpec struct {
 	Weight             int    `json:"weight"`
 }
 
-// EBGPMetaStatus defines the observed state of EBGPMeta
-type EBGPMetaStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+// BGPMetaStatus defines the observed state of BGPMeta
+type BGPMetaStatus struct { // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 
-// EBGPMeta is the Schema for the ebgpmeta API
-type EBGPMeta struct {
+// BGPMeta is the Schema for the bgpmeta API
+type BGPMeta struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   EBGPMetaSpec   `json:"spec,omitempty"`
-	Status EBGPMetaStatus `json:"status,omitempty"`
+	Spec   BGPMetaSpec   `json:"spec,omitempty"`
+	Status BGPMetaStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// EBGPMetaList contains a list of EBGPMeta
-type EBGPMetaList struct {
+// BGPMetaList contains a list of BGPMeta
+type BGPMetaList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EBGPMeta `json:"items"`
+	Items           []BGPMeta `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&EBGPMeta{}, &EBGPMetaList{})
+	SchemeBuilder.Register(&BGPMeta{}, &BGPMetaList{})
 }