diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2018-10-28 20:49:10 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2018-10-28 21:41:11 +0900 |
commit | 3e950780fedccacdd1e1267343b5b9baae204566 (patch) | |
tree | 9ce9e5c038fba363b10763a23f96c08aaf8fd702 /pkg/server | |
parent | 5d7ecf5a9e68bcd1a71bc6468e0075f1f9d028ba (diff) |
move NewAPIRoutingPolicyFromConfigStruct() from server/
The config is an internal package so it should not be exported.
NewAPIPolicyAssignmentFromTableStruct() is approprate for config/.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'pkg/server')
-rw-r--r-- | pkg/server/grpc_server.go | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/pkg/server/grpc_server.go b/pkg/server/grpc_server.go index 9ecc6250..9f6b5bbb 100644 --- a/pkg/server/grpc_server.go +++ b/pkg/server/grpc_server.go @@ -297,22 +297,6 @@ func (s *Server) SetPolicies(ctx context.Context, r *api.SetPoliciesRequest) (*e return &empty.Empty{}, s.bgpServer.SetPolicies(ctx, r) } -func NewAPIRoutingPolicyFromConfigStruct(c *config.RoutingPolicy) (*api.RoutingPolicy, error) { - definedSets, err := newAPIDefinedSetsFromConfigStruct(&c.DefinedSets) - if err != nil { - return nil, err - } - policies := make([]*api.Policy, 0, len(c.PolicyDefinitions)) - for _, policy := range c.PolicyDefinitions { - policies = append(policies, table.ToPolicyApi(&policy)) - } - - return &api.RoutingPolicy{ - DefinedSets: definedSets, - Policies: policies, - }, nil -} - func NewRoutingPolicyFromApiStruct(arg *api.SetPoliciesRequest) (*config.RoutingPolicy, error) { policyDefinitions := make([]config.PolicyDefinition, 0, len(arg.Policies)) for _, p := range arg.Policies { @@ -937,81 +921,6 @@ func newConfigPrefixFromAPIStruct(a *api.Prefix) (*config.Prefix, error) { }, nil } -func newAPIPrefixFromConfigStruct(c config.Prefix) (*api.Prefix, error) { - min, max, err := config.ParseMaskLength(c.IpPrefix, c.MasklengthRange) - if err != nil { - return nil, err - } - return &api.Prefix{ - IpPrefix: c.IpPrefix, - MaskLengthMin: uint32(min), - MaskLengthMax: uint32(max), - }, nil -} - -func newAPIDefinedSetsFromConfigStruct(t *config.DefinedSets) ([]*api.DefinedSet, error) { - definedSets := make([]*api.DefinedSet, 0) - - for _, ps := range t.PrefixSets { - prefixes := make([]*api.Prefix, 0) - for _, p := range ps.PrefixList { - ap, err := newAPIPrefixFromConfigStruct(p) - if err != nil { - return nil, err - } - prefixes = append(prefixes, ap) - } - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_PREFIX, - Name: ps.PrefixSetName, - Prefixes: prefixes, - }) - } - - for _, ns := range t.NeighborSets { - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_NEIGHBOR, - Name: ns.NeighborSetName, - List: ns.NeighborInfoList, - }) - } - - bs := t.BgpDefinedSets - for _, cs := range bs.CommunitySets { - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_COMMUNITY, - Name: cs.CommunitySetName, - List: cs.CommunityList, - }) - } - - for _, es := range bs.ExtCommunitySets { - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_EXT_COMMUNITY, - Name: es.ExtCommunitySetName, - List: es.ExtCommunityList, - }) - } - - for _, ls := range bs.LargeCommunitySets { - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_LARGE_COMMUNITY, - Name: ls.LargeCommunitySetName, - List: ls.LargeCommunityList, - }) - } - - for _, as := range bs.AsPathSets { - definedSets = append(definedSets, &api.DefinedSet{ - Type: api.DefinedType_AS_PATH, - Name: as.AsPathSetName, - List: as.AsPathList, - }) - } - - return definedSets, nil -} - func newConfigDefinedSetsFromApiStruct(a []*api.DefinedSet) (*config.DefinedSets, error) { ps := make([]config.PrefixSet, 0) ns := make([]config.NeighborSet, 0) |