Skip to content

Commit 2bb19a1

Browse files
author
KC Wang
committed
CLOUDSTACK-6697: bigswitch networking plugin update
1. provide compatibility with the Big Cloud Fabric (BCF) controller L2 Connectivity Service in both VPC and non-VPC modes 2. virtual network terminology updates: VNS --> BCF_SEGMENT 3. uses HTTPS with trust-always certificate handling 4. topology sync support with BCF controller 5. support multiple (two) BCF controllers with HA 6. support VM migration 7. support Firewall, Static NAT, and Source NAT with NAT enabled option 8. add VifDriver for Indigo Virtual Switch (IVS)
1 parent cb2b9e8 commit 2bb19a1

96 files changed

Lines changed: 7164 additions & 2455 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/network/Network.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ public static class Provider {
138138
public static final Provider BrocadeVcs = new Provider("BrocadeVcs", false);
139139
// add GloboDns provider
140140
public static final Provider GloboDns = new Provider("GloboDns", true);
141+
// add Big Switch Bcf Provider
142+
public static final Provider BigSwitchBcf = new Provider("BigSwitchBcf", false);
141143

142144
private final String name;
143145
private final boolean isExternal;

‎api/src/com/cloud/network/PhysicalNetwork.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public enum State {
3333
}
3434

3535
public enum IsolationMethod {
36-
VLAN, L3, GRE, STT, VNS, MIDO, SSP, VXLAN, ODL, L3VPN, VSP, VCS;
36+
VLAN, L3, GRE, STT, BCF_SEGMENT, MIDO, SSP, VXLAN, ODL, L3VPN, VSP, VCS;
3737
}
3838

3939
public enum BroadcastDomainRange {

‎api/src/com/cloud/network/rules/StaticNat.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ public interface StaticNat {
2828

2929
String getDestIpAddress();
3030

31+
String getSourceMacAddress();
32+
3133
boolean isForRevoke();
3234
}

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ label.add.accounts.to=Add accounts to
302302
label.add.accounts=Add accounts
303303
label.add.ACL=Add ACL
304304
label.add.affinity.group=Add new affinity group
305-
label.add.BigSwitchVns.device=Add BigSwitch Vns Controller
305+
label.add.BigSwitchBcf.device=Add BigSwitch BCF Controller
306306
label.add.by.cidr=Add By CIDR
307307
label.add.by.group=Add By Group
308308
label.add.by=Add by
@@ -415,7 +415,7 @@ label.back=Back
415415
label.bandwidth=Bandwidth
416416
label.basic.mode=Basic Mode
417417
label.basic=Basic
418-
label.bigswitch.controller.address=BigSwitch Vns Controller Address
418+
label.bigswitch.controller.address=BigSwitch BCF Controller Address
419419
label.bootable=Bootable
420420
label.broadcast.domain.range=Broadcast domain range
421421
label.broadcast.domain.type=Broadcast Domain Type
@@ -509,7 +509,7 @@ label.default.use=Default Use
509509
label.default.view=Default View
510510
label.default=Default
511511
label.delete.affinity.group=Delete Affinity Group
512-
label.delete.BigSwitchVns=Remove BigSwitch Vns Controller
512+
label.delete.BigSwitchBcf=Remove BigSwitch BCF Controller
513513
label.delete.F5=Delete F5
514514
label.delete.gateway=Delete gateway
515515
label.delete.NetScaler=Delete NetScaler
@@ -1450,8 +1450,9 @@ label.added.nicira.nvp.controller=Added new Nicira NVP Controller
14501450
label.nicira.nvp.details=Nicira NVP details
14511451
label.added.brocade.vcs.switch=Added new Brocade Vcs Switch
14521452
label.brocade.vcs.details=Brocade Vcs Switch details
1453-
label.added.new.bigswitch.vns.controller=Added new BigSwitch VNS Controller
1454-
label.bigswitch.vns.details=BigSwitch VNS details
1453+
label.added.new.bigswitch.bcf.controller=Added new BigSwitch BCF Controller
1454+
label.bigswitch.bcf.details=BigSwitch BCF details
1455+
label.bigswitch.bcf.nat=BigSwitch BCF NAT Enabled
14551456
label.dedicate=Dedicate
14561457
label.dedicate.pod=Dedicate Pod
14571458
label.pod.dedicated=Pod Dedicated
@@ -1733,6 +1734,7 @@ message.configuring.public.traffic=Configuring public traffic
17331734
message.configuring.storage.traffic=Configuring storage traffic
17341735
message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
17351736
message.confirm.delete.F5=Please confirm that you would like to delete F5
1737+
message.confirm.delete.BigSwitchBcf=Please confirm that you would like to delete this BigSwitch BCF Controller
17361738
message.confirm.delete.BrocadeVcs=Please confirm that you would like to delete Brocade Vcs Switch
17371739
message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler
17381740
message.confirm.delete.NuageVsp=Please confirm that you would like to delete Nuage Virtualized Services Directory

‎client/WEB-INF/classes/resources/messages_fr_FR.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ label.add.acl.list=Ajouter Liste ACL
257257
label.add.affinity.group=Ajouter nouveau groupe d\\'affinit\u00e9
258258
label.add=Ajouter
259259
label.add.baremetal.dhcp.device=Ajouter un DHCP Baremetal
260-
label.add.BigSwitchVns.device=Ajouter contr\u00f4leur BigSwitch Vns
261260
label.add.BrocadeVcs.device=Ajouter Switch Brocade Vcs
261+
label.add.BigSwitchBcf.device=Ajouter contr\u00f4leur BigSwitch BCF
262262
label.add.by=Ajout\u00e9 par
263263
label.add.by.cidr=Ajouter par CIDR
264264
label.add.by.group=Ajouter par groupe
@@ -269,7 +269,7 @@ label.add.direct.iprange=Ajouter une plage d\\'adresse IP directe
269269
label.add.disk.offering=Ajouter Offre Disque
270270
label.add.domain=Ajouter un domaine
271271
label.added.brocade.vcs.switch=Ajout d\\'un nouveau switch Brocade Vcs
272-
label.added.new.bigswitch.vns.controller=Ajout du nouveau contr\u00f4leur BigSwitch VNS
272+
label.added.new.bigswitch.bcf.controller=Ajout du nouveau contr\u00f4leur BigSwitch BCF
273273
label.added.nicira.nvp.controller=Ajout d\\'un nouveau contr\u00f4leur Nicira NVP
274274
label.add.egress.rule=Ajouter la r\u00e8gle sortante
275275
label.addes.new.f5=Ajout d\\'un nouveau F5
@@ -403,8 +403,8 @@ label.baremetal.pxe.devices=\u00c9quipements PXE Baremetal
403403
label.baremetal.pxe.provider=Fournisseur PXE Baremetal
404404
label.basic=Basique
405405
label.basic.mode=Mode basique
406-
label.bigswitch.controller.address=Adresse du contr\u00f4leur BigSwitch Vns
407-
label.bigswitch.vns.details=D\u00e9tails BigSwitch VNS
406+
label.bigswitch.controller.address=Adresse du contr\u00f4leur BigSwitch BCF
407+
label.bigswitch.bcf.details=D\u00e9tails BigSwitch BCF
408408
label.blade.id=ID Lame
409409
label.blades=Lames
410410
label.bootable=Amor\u00e7able
@@ -527,9 +527,9 @@ label.default.view=Vue par d\u00e9faut
527527
label.delete.acl.list=Supprimer Liste ACL
528528
label.delete.affinity.group=Supprimer le groupe d\\'affinit\u00e9
529529
label.delete.alerts=Supprimer alertes
530-
label.delete.BigSwitchVns=Supprimer contr\u00f4leur BigSwitch Vns
531530
label.delete.BrocadeVcs=Supprimer Brocade Vcs Switch
532531
label.delete.ciscoASA1000v=Supprimer CiscoASA1000v
532+
label.delete.BigSwitchBcf=Supprimer contr\u00f4leur BigSwitch BCF
533533
label.delete.ciscovnmc.resource=Supprimer ressource CiscoVNMC
534534
label.delete.events=Supprimer \u00e9v\u00e9nements
535535
label.delete.F5=Supprimer F5

‎client/WEB-INF/classes/resources/messages_ja_JP.properties‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ label.add.accounts.to=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u8ffd\u52a0\u5148\:
300300
label.add.accounts=\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u8ffd\u52a0
301301
label.add.ACL=ACL \u306e\u8ffd\u52a0
302302
label.add.affinity.group=\u65b0\u3057\u3044\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u8ffd\u52a0
303-
label.add.BigSwitchVns.device=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u8ffd\u52a0
303+
label.add.BigSwitchBcf.device=Big Switch BCF \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u8ffd\u52a0
304304
label.add.by.cidr=CIDR \u3067\u8ffd\u52a0
305305
label.add.by.group=\u30b0\u30eb\u30fc\u30d7\u3067\u8ffd\u52a0
306306
label.add.by=\u8ffd\u52a0\u5358\u4f4d
@@ -309,6 +309,7 @@ label.add.compute.offering=\u30b3\u30f3\u30d4\u30e5\u30fc\u30c6\u30a3\u30f3\u30b
309309
label.add.direct.iprange=\u76f4\u63a5 IP \u30a2\u30c9\u30ec\u30b9\u306e\u7bc4\u56f2\u306e\u8ffd\u52a0
310310
label.add.disk.offering=\u30c7\u30a3\u30b9\u30af \u30aa\u30d5\u30a1\u30ea\u30f3\u30b0\u306e\u8ffd\u52a0
311311
label.add.domain=\u30c9\u30e1\u30a4\u30f3\u306e\u8ffd\u52a0
312+
label.added.new.bigswitch.bcf.controller=\u65b0\u3057\u3044 Big Switch BCF \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u3092\u8ffd\u52a0\u3057\u307e\u3057\u305f
312313
label.add.egress.rule=\u9001\u4fe1\u898f\u5247\u306e\u8ffd\u52a0
313314
label.add.F5.device=F5 \u30c7\u30d0\u30a4\u30b9\u306e\u8ffd\u52a0
314315
label.add.firewall=\u30d5\u30a1\u30a4\u30a2\u30a6\u30a9\u30fc\u30eb\u898f\u5247\u306e\u8ffd\u52a0
@@ -410,7 +411,8 @@ label.back=\u623b\u308b
410411
label.bandwidth=\u5e2f\u57df\u5e45
411412
label.basic.mode=\u57fa\u672c\u30e2\u30fc\u30c9
412413
label.basic=\u57fa\u672c
413-
label.bigswitch.controller.address=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc \u30a2\u30c9\u30ec\u30b9
414+
label.bigswitch.controller.address=Big Switch BCF \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u30a2\u30c9\u30ec\u30b9
415+
label.bigswitch.bcf.details=Big Switch BCF \u306e\u8a73\u7d30
414416
label.bootable=\u8d77\u52d5\u53ef\u80fd
415417
label.broadcast.domain.range=\u30d6\u30ed\u30fc\u30c9\u30ad\u30e3\u30b9\u30c8 \u30c9\u30e1\u30a4\u30f3\u306e\u7bc4\u56f2
416418
label.broadcast.domain.type=\u30d6\u30ed\u30fc\u30c9\u30ad\u30e3\u30b9\u30c8 \u30c9\u30e1\u30a4\u30f3\u306e\u7a2e\u985e
@@ -503,7 +505,7 @@ label.default.use=\u30c7\u30d5\u30a9\u30eb\u30c8\u4f7f\u7528
503505
label.default.view=\u30c7\u30d5\u30a9\u30eb\u30c8 \u30d3\u30e5\u30fc
504506
label.default=\u30c7\u30d5\u30a9\u30eb\u30c8
505507
label.delete.affinity.group=\u30a2\u30d5\u30a3\u30cb\u30c6\u30a3 \u30b0\u30eb\u30fc\u30d7\u306e\u524a\u9664
506-
label.delete.BigSwitchVns=Big Switch VNS \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u524a\u9664
508+
label.delete.BigSwitchBcf=Big Switch BCF \u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u524a\u9664
507509
label.delete.F5=F5 \u306e\u524a\u9664
508510
label.delete.gateway=\u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u306e\u524a\u9664
509511
label.delete.NetScaler=NetScaler \u306e\u524a\u9664

‎client/WEB-INF/classes/resources/messages_ko_KR.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ label.add.accounts=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00
241241
label.add.account.to.project=\uacc4\uc815 \uc815\ubcf4 \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd94\uac00
242242
label.add.account=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00
243243
label.add.ACL=\uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00
244-
label.add.BigSwitchVns.device=BigSwitch Vns \ucf58\ud2b8\ub864\ub7ec
244+
label.add.BigSwitchBcf.device=BigSwitch BCF \ucf58\ud2b8\ub864\ub7ec
245245
label.add.by.cidr=CIDR \ub85c \ucd94\uac00
246246
label.add.by.group=\uadf8\ub8f9\uc5d0\uc11c \ucd94\uac00
247247
label.add.by=\ucd94\uac00 \ub2e8\uc704

‎client/WEB-INF/classes/resources/messages_nl_NL.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ label.add.account=Voeg Account toe
252252
label.add.ACL=Voeg ACL toe
253253
label.add.affinity.group=Nieuwe affinity groep toevoegen
254254
label.add.baremetal.dhcp.device=Voeg Baremetal DHCP Apparaat toe
255-
label.add.BigSwitchVns.device=Voeg BigSwitch Vns Controller toe
255+
label.add.BigSwitchBcf.device=Voeg BigSwitch BCF Controller toe
256256
label.add.by.cidr=Voeg toe door middel van CIDR
257257
label.add.by.group=Voeg toe door middel van Groep
258258
label.add.by=Voeg toe door middel van
@@ -261,7 +261,7 @@ label.add.compute.offering=Voeg Compute aanbieding toe
261261
label.add.direct.iprange=Voeg Direct IP Range toe
262262
label.add.disk.offering=Voeg Schijf Aanbieding toe
263263
label.add.domain=Voeg Domein toe
264-
label.added.new.bigswitch.vns.controller=Nieuwe BigSwitch VNS Controller toegevoegd
264+
label.added.new.bigswitch.bcf.controller=Nieuwe BigSwitch BCF Controller toegevoegd
265265
label.added.nicira.nvp.controller=Nieuwe Nicira NVP Controller toegevoegd
266266
label.add.egress.rule=Voeg uitgaande regel toe
267267
label.addes.new.f5=Nieuwe F5 toegevoegd
@@ -384,8 +384,8 @@ label.baremetal.pxe.device=Voeg Baremetal PXE Apparaat toe
384384
label.baremetal.pxe.provider=Baremetal PXE Provider
385385
label.basic=Basis
386386
label.basic.mode=Basis Modus
387-
label.bigswitch.controller.address=BigSwitch Vns Controller Adres
388-
label.bigswitch.vns.details=BigSwitch VNS details
387+
label.bigswitch.controller.address=BigSwitch BCF Controller Adres
388+
label.bigswitch.bcf.details=BigSwitch BCF details
389389
label.blade.id=Blade ID
390390
label.blades=Blades
391391
label.bootable=Bootable
@@ -502,7 +502,7 @@ label.default.use=Standaard Gebruik
502502
label.default.view=Standaard Weergave
503503
label.delete.affinity.group=Verwijder Affinity Groep
504504
label.delete.alerts=Verwijder waarschuwingen
505-
label.delete.BigSwitchVns=Verwijder BigSwitch Vns Controller
505+
label.delete.BigSwitchBcf=Verwijder BigSwitch Bcf Controller
506506
label.delete.ciscovnmc.resource=CiscoVNMC resource verwijderen
507507
label.delete.events=Verwijder gebeurtenissen
508508
label.delete.F5=Verwijder F5

‎client/WEB-INF/classes/resources/messages_pt_BR.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ label.add.account.to.project=Adicionar conta ao projeto
249249
label.add.ACL=Adicionar ACL
250250
label.add=Adicionar
251251
label.add.affinity.group=Adicionar um grupo de afinidade
252-
label.add.BigSwitchVns.device=Adicionar BigSwitch Vns Controller
252+
label.add.BigSwitchBcf.device=Adicionar BigSwitch BCF Controller
253253
label.add.by=Adicionado por
254254
label.add.by.cidr=Adicionar por CIDR
255255
label.add.by.group=Adicionar por Grupo
@@ -360,7 +360,7 @@ label.back=Voltar
360360
label.bandwidth=Bandwidth
361361
label.basic=B\u00e1sico
362362
label.basic.mode=Modo B\u00e1sico
363-
label.bigswitch.controller.address=Endere\u00e7o do Controlador BigSwitch Vns
363+
label.bigswitch.controller.address=Endere\u00e7o do Controlador BigSwitch BCF
364364
label.bootable=Inicializ\u00e1vel
365365
label.broadcast.domain.range=Range do dom\u00ednio de Broadcast
366366
label.broadcast.domain.type=Tipo de Dom\u00ednio Broadcast
@@ -456,7 +456,7 @@ label.default.use=Uso padr\u00e3o
456456
label.default.view=Vis\u00e3o Padr\u00e3o
457457
label.delete.affinity.group=Deletar Grupo de Afinidade
458458
label.delete.alerts=Remover alertas
459-
label.delete.BigSwitchVns=Remover Controlador BigSwitch Vns
459+
label.delete.BigSwitchBcf=Remover Controlador BigSwitch BCF
460460
label.delete.events=Remover eventos
461461
label.delete.F5=Remover F5
462462
label.delete.gateway=delete gateway

‎client/WEB-INF/classes/resources/messages_ru_RU.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ label.add.account.to.project=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u
245245
label.add.account=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442
246246
label.add.ACL=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c ACL
247247
label.add.affinity.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u0443\u044e affinity group
248-
label.add.BigSwitchVns.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c BigSwitch Vns Controller
248+
label.add.BigSwitchBcf.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c BigSwitch BCF Controller
249249
label.add.by.cidr=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a CIDR
250250
label.add.by.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a \u0433\u0440\u0443\u043f\u043f\u0435
251251
label.add.by=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
@@ -442,7 +442,7 @@ label.default.use=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\
442442
label.default.view=\u041e\u0431\u044b\u0447\u043d\u044b\u0439 \u0432\u0438\u0434
443443
label.delete.affinity.group=\u0423\u0434\u0430\u043b\u0438\u0442\u044c affinity group
444444
label.delete.alerts=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u0432\u043e\u0433\u0438
445-
label.delete.BigSwitchVns=\u0423\u0434\u0430\u043b\u0438\u0442\u044c BigSwitch VNC \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440
445+
label.delete.BigSwitchBcf=\u0423\u0434\u0430\u043b\u0438\u0442\u044c BigSwitch BCF \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440
446446
label.delete.events=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043e\u0431\u044b\u0442\u0438\u044f
447447
label.delete.F5=\u0423\u0434\u0430\u043b\u0438\u0442\u044c F5
448448
label.delete.gateway=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0448\u043b\u044e\u0437

0 commit comments

Comments
 (0)