diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-03-03 12:23:43 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-03-03 12:23:43 +0900 |
| commit | f0ae221b894fdd02f697f4fb6994623082e2175e (patch) | |
| tree | a75e87baad198d843e5201099563713886edfb28 /test/scenario_test | |
| parent | d387fd92e71a42e243cedef32f0812c72474c418 (diff) | |
update the whole code for the latest openconfig yang files
The modified openconfig yang files are available at:
https://github.com/osrg/yang/tree/gobgp
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'test/scenario_test')
| -rw-r--r-- | test/scenario_test/quagga-rsconfig.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/scenario_test/quagga-rsconfig.go b/test/scenario_test/quagga-rsconfig.go index 870c5d60..c9c92f94 100644 --- a/test/scenario_test/quagga-rsconfig.go +++ b/test/scenario_test/quagga-rsconfig.go @@ -25,12 +25,12 @@ const ( type QuaggaConfig struct { id int - config *config.NeighborType - gobgpConfig *config.GlobalType + config *config.Neighbor + gobgpConfig *config.Global serverIP net.IP } -func NewQuaggaConfig(id int, gConfig *config.GlobalType, myConfig *config.NeighborType, server net.IP) *QuaggaConfig { +func NewQuaggaConfig(id int, gConfig *config.Global, myConfig *config.Neighbor, server net.IP) *QuaggaConfig { return &QuaggaConfig{ id: id, config: myConfig, @@ -83,15 +83,15 @@ func (qt *QuaggaConfig) IPv6Config() *bytes.Buffer { func create_config_files(nr int, outputDir string, IPVersion string) { quaggaConfigList := make([]*QuaggaConfig, 0) - gobgpConf := config.BgpType{ - Global: config.GlobalType{ + gobgpConf := config.Bgp{ + Global: config.Global{ As: 65000, RouterId: net.ParseIP("192.168.255.1"), }, } for i := 1; i < nr+1; i++ { - c := config.NeighborType{ + c := config.Neighbor{ PeerAs: 65000 + uint32(i), NeighborAddress: net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], i)), AuthPassword: fmt.Sprintf("hoge%d", i), @@ -123,13 +123,13 @@ func create_config_files(nr int, outputDir string, IPVersion string) { func append_config_files(ar int, outputDir string, IPVersion string) { - gobgpConf := config.BgpType{ - Global: config.GlobalType{ + gobgpConf := config.Bgp{ + Global: config.Global{ As: 65000, RouterId: net.ParseIP("192.168.255.1"), }, } - c := config.NeighborType{ + c := config.Neighbor{ PeerAs: 65000 + uint32(ar), NeighborAddress: net.ParseIP(fmt.Sprintf("%s%d", baseNeighborAddress[IPVersion], ar)), AuthPassword: fmt.Sprintf("hoge%d", ar), @@ -145,7 +145,7 @@ func append_config_files(ar int, outputDir string, IPVersion string) { if err != nil { log.Fatal(err) } - newConf := config.BgpType{} + newConf := config.Bgp{} _, d_err := toml.DecodeFile(fmt.Sprintf("%s/gobgpd.conf", outputDir), &newConf) if d_err != nil { log.Fatal(err) |