@@ -876,27 +876,29 @@ func (c LegacyClient) CreatePeerRouterPort(localRouter, remoteRouter, localRoute
876
876
ipStr := strings .Split (localRouterPortIP , "," )
877
877
if len (ipStr ) == 2 {
878
878
klog .Infof ("add vpc lrp %s" , localRouterPort )
879
- _ , err = c .ovnNbCommand (MayExist , "lrp-add" , localRouter , localRouterPort , util .GenerateMac (), ipStr [0 ], ipStr [1 ], "--" ,
880
- "set" , "logical_router_port" , localRouterPort , fmt .Sprintf ("peer=%s" , remoteRouterPort ))
879
+ _ , err = c .ovnNbCommand (MayExist , "lrp-add" , localRouter , localRouterPort , util .GenerateMac (), ipStr [0 ], ipStr [1 ],
880
+ fmt .Sprintf ("peer=%s" , remoteRouterPort ))
881
881
} else {
882
882
klog .Infof ("add vpc lrp %s" , localRouterPort )
883
- _ , err = c .ovnNbCommand (MayExist , "lrp-add" , localRouter , localRouterPort , util .GenerateMac (), ipStr [0 ], "--" ,
884
- "set" , "logical_router_port" , localRouterPort , fmt .Sprintf ("peer=%s" , remoteRouterPort ))
883
+ _ , err = c .ovnNbCommand (MayExist , "lrp-add" , localRouter , localRouterPort , util .GenerateMac (), ipStr [0 ],
884
+ fmt .Sprintf ("peer=%s" , remoteRouterPort ))
885
885
}
886
886
if err != nil {
887
887
klog .Errorf ("failed to create router port %s: %v" , localRouterPort , err )
888
888
return err
889
889
}
890
- }
891
-
892
- klog . Infof ( "set lrp %s, networks %s" , localRouterPort , localRouterPortIP )
893
- _ , err = c .ovnNbCommand ("set" , "logical_router_port" , localRouterPort ,
894
- fmt .Sprintf ("networks=\" %s \" " , strings . ReplaceAll ( localRouterPortIP , "," , " " ) ))
890
+ } else {
891
+ klog . Infof ( "set lrp %s, networks %s" , localRouterPort , localRouterPortIP )
892
+ networks := strings . ReplaceAll ( strings . Join ( strings . Split ( localRouterPortIP , "," ), " " ), ":" , " \\ :" )
893
+ _ , err = c .ovnNbCommand ("set" , "logical_router_port" , localRouterPort ,
894
+ fmt .Sprintf ("networks=%s" , networks ))
895
895
896
- if err != nil {
897
- klog .Errorf ("failed to set router port %s: %v" , localRouterPort , err )
898
- return err
896
+ if err != nil {
897
+ klog .Errorf ("failed to set router port %s: %v" , localRouterPort , err )
898
+ return err
899
+ }
899
900
}
901
+
900
902
return nil
901
903
}
902
904
0 commit comments