Skip to content

Commit 4c9f4fc

Browse files
wilderrodrigueswilderrodrigues
committed
Make virtual router id unique per redundant group
Customise the messages showed during VPC restart based on redundancy Do not show "Make Redundant" option if VPC is already redundant Show on VPC details if a VPC is redundant
1 parent 7a9a356 commit 4c9f4fc

17 files changed

Lines changed: 71 additions & 10 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,7 @@ label.reboot=Reboot
998998
label.recent.errors=Recent Errors
999999
label.redundant.router.capability=Redundant router capability
10001000
label.redundant.router=Redundant Router
1001+
label.redundant.vpc=Redundant VPC
10011002
label.redundant.state=Redundant state
10021003
label.refresh=Refresh
10031004
label.region=Region
@@ -1034,6 +1035,7 @@ label.resources=Resources
10341035
label.restart.network=Restart network
10351036
label.restart.required=Restart required
10361037
label.restart.vpc=Restart VPC
1038+
message.restart.vpc.remark=Remark: making a single VPC redundant will force a clean up. The network will not be available for a couple of minutes.
10371039
label.restore=Restore
10381040
label.retry.interval=Retry Interval
10391041
label.review=Review

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ label.reset.VPN.connection=\u0625\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u06
160160
label.restart.network=\u0625\u0639\u0627\u062f\u0629 \u062a\u0634\u063a\u064a\u0644 \u0627\u0644\u0634\u0628\u0643\u0629
161161
label.restart.required=\u0645\u0637\u0644\u0648\u0628 \u0625\u0639\u0627\u062f\u0629 \u0627\u0644\u062a\u0634\u063a\u064a\u0644
162162
label.restart.vpc=\u0625\u0639\u062f\u0627\u0629 \u062a\u0634\u063a\u064a\u0644 VPC
163+
message.restart.vpc.remark=\u0645\u0644\u0627\u062d\u0638\u0629\u003a \u062c\u0639\u0644 \u0632\u0627\u0626\u062f\u0629 \u0639\u0646 \u0627\u0644\u062d\u0627\u062c\u0629 \u0056\u0050\u0043 \u0633\u064a\u062c\u0628\u0631 \u0639\u0644\u0649 \u062a\u0646\u0638\u064a\u0641\u002e \u0644\u0646 \u062a\u0643\u0648\u0646 \u0627\u0644\u0634\u0628\u0643\u0629 \u0645\u062a\u0627\u062d\u0629 \u0644\u0628\u0636\u0639 \u062f\u0642\u0627\u0626\u0642\u002e
163164
label.restore=\u0625\u0633\u062a\u0639\u0627\u062f\u0629
164165
label.review=\u0645\u0631\u0627\u062c\u0639\u0629
165166
label.revoke.project.invite=\u0625\u0644\u063a\u0627\u0621 \u0627\u0644\u062f\u0639\u0648\u0629

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ label.rbd=RBD
752752
label.reboot=Neustart
753753
label.recent.errors=Aktuelle Fehler
754754
label.redundant.router=Redundanter Router
755+
label.redundant.vpc=Redundanter VPC
755756
label.refresh=Aktualisieren
756757
label.region=Region
757758
label.reinstall.vm=VM neu installieren

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,7 @@ label.quickview=Vista R\u00e1pida
735735
label.reboot=Reiniciar
736736
label.recent.errors=recientes errores
737737
label.redundant.router=enrutador redundante
738+
label.redundant.vpc=VPC redundante
738739
label.refresh=Actualizar
739740
label.related=relacionados
740741
label.remind.later=Recordar mas tarde
@@ -758,6 +759,7 @@ label.resource.state=Estado del recurso
758759
label.restart.network=Reiniciar red
759760
label.restart.required=Reiniciado requerido
760761
label.restart.vpc=Reiniciar VPC
762+
message.restart.vpc.remark=\u004f\u0062\u0073\u0065\u0072\u0076\u0061\u0063\u0069\u00f3\u006e\u003a \u0068\u0061\u0063\u0065\u0072 \u0075\u006e\u0061 \u0072\u0065\u0064\u0075\u006e\u0064\u0061\u006e\u0074\u0065 \u0056\u0050\u0043 \u006f\u0062\u006c\u0069\u0067\u0061\u0072\u00e1 \u0061 \u0075\u006e\u0061 \u006c\u0069\u006d\u0070\u0069\u0065\u007a\u0061\u002e \u004c\u0061 \u0072\u0065\u0064 \u006e\u006f \u0065\u0073\u0074\u0061\u0072\u00e1 \u0064\u0069\u0073\u0070\u006f\u006e\u0069\u0062\u006c\u0065 \u0064\u0075\u0072\u0061\u006e\u0074\u0065 \u0075\u006e \u0070\u0061\u0072 \u0064\u0065 \u006d\u0069\u006e\u0075\u0074\u006f\u0073\u002e
761763
label.restore=Restaurar
762764
label.role=Papel
763765
label.root.disk.offering=Root Disco Offering

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,7 @@ label.recent.errors=Erreurs r\u00e9centes
11631163
label.recover.vm=Restaurer VM
11641164
label.redundant.router.capability=Router redondant
11651165
label.redundant.router=Routeur redondant
1166+
label.redundant.vpc=VPC redondant
11661167
label.redundant.state=\u00c9tat de la redondance
11671168
label.refresh=Actualiser
11681169
label.refresh.blades=Rafra\u00eechir Lames
@@ -1223,6 +1224,7 @@ label.response.timeout.in.sec=D\u00e9lai d\\'attente de r\u00e9ponse (sec)
12231224
label.restart.network=Red\u00e9marrage du r\u00e9seau
12241225
label.restart.required=Red\u00e9marrage n\u00e9cessaire
12251226
label.restart.vpc=Red\u00e9marrer le VPC
1227+
message.restart.vpc.remark=\u0052\u0065\u006d\u0061\u0072\u0071\u0075\u0065\u003a \u0066\u0061\u0069\u0072\u0065 \u0075\u006e\u0065 \u0072\u0065\u0064\u006f\u006e\u0064\u0061\u006e\u0074\u0065 \u0056\u0050\u0043 \u0076\u0061 \u0066\u006f\u0072\u0063\u0065\u0072 \u0075\u006e \u006e\u0065\u0074\u0074\u006f\u0079\u0061\u0067\u0065\u002e \u0052\u00e9\u0073\u0065\u0061\u0075 \u006e\u0065 \u0073\u0065\u0072\u0061 \u0070\u0061\u0073 \u0064\u0069\u0073\u0070\u006f\u006e\u0069\u0062\u006c\u0065 \u0070\u006f\u0075\u0072 \u0075\u006e \u0063\u006f\u0075\u0070\u006c\u0065 \u0064\u0065 \u006d\u0069\u006e\u0075\u0074\u0065\u0073\u002e
12261228
label.restore=Restaurer
12271229
label.retry.interval=Interval du nouvel essai
12281230
label.review=Revoir

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ label.CIDR.list=Lista CIDR
276276
label.CIDR.of.destination.network=Valore CIDR della rete di destinazione
277277
label.clear.list=Pulizia dell\\'elenco
278278
label.cloud.console=Console di Gestione Cloud
279+
label.clean.up=Ripulire
280+
label.make.redundant=\u004e\u006f\u0074\u0061\u003a \u0066\u0061\u0063\u0065\u006e\u0064\u006f \u0075\u006e \u0072\u0069\u0064\u006f\u006e\u0064\u0061\u006e\u0074\u0065 \u0056\u0050\u0043 \u0066\u006f\u0072\u007a\u0065\u0072\u00e0 \u0075\u006e\u0061 \u0070\u0075\u006c\u0069\u007a\u0069\u0061\u002e \u004e\u0065\u0074\u0077\u006f\u0072\u006b \u006e\u006f\u006e \u0073\u0061\u0072\u00e0 \u0064\u0069\u0073\u0070\u006f\u006e\u0069\u0062\u0069\u006c\u0065 \u0070\u0065\u0072 \u0075\u006e \u0070\u0061\u0069\u006f \u0064\u0069 \u006d\u0069\u006e\u0075\u0074\u0069\u002e
279281
label.cluster=Cluster
280282
label.cluster.name=Nome del Cluster
281283
label.clusters=Cluster
@@ -517,6 +519,7 @@ label.resource.state=Stato della risorsa
517519
label.restart.network=Riavviare il servizio di rete
518520
label.restart.required=E\\' necessario un riavvio
519521
label.restart.vpc=Riavviare VPC
522+
message.restart.vpc.remark=
520523
label.restore=Restore
521524
label.review=Riesaminare
522525
label.revoke.project.invite=Revocare un invit

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,7 @@ label.reboot=\u518d\u8d77\u52d5
988988
label.recent.errors=\u6700\u8fd1\u306e\u30a8\u30e9\u30fc
989989
label.redundant.router.capability=\u5197\u9577\u30eb\u30fc\u30bf\u30fc\u6a5f\u80fd
990990
label.redundant.router=\u5197\u9577\u30eb\u30fc\u30bf\u30fc
991+
label.redundant.vpc=\u5197\u9577 VPC
991992
label.redundant.state=\u5197\u9577\u72b6\u614b
992993
label.refresh=\u66f4\u65b0
993994
label.region=\u9818\u57df
@@ -1024,6 +1025,7 @@ label.resources=\u30ea\u30bd\u30fc\u30b9
10241025
label.restart.network=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u306e\u518d\u8d77\u52d5
10251026
label.restart.required=\u518d\u8d77\u52d5\u304c\u5fc5\u8981
10261027
label.restart.vpc=VPC \u306e\u518d\u8d77\u52d5
1028+
message.restart.vpc.remark=\u5099\u8003\uff1a\u30af\u30ea\u30fc\u30f3\u30a2\u30c3\u30d7\u3092\u5f37\u5236\u7684\u306b\u0056\u0050\u0043\u306e\u5197\u9577\u5316\u3092\u884c\u3046\u3002\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304c\u6570\u5206\u9593\u4f7f\u7528\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059\u3002
10271029
label.restore=\u5fa9\u5143
10281030
label.retry.interval=\u518d\u8a66\u884c\u9593\u9694
10291031
label.review=\u78ba\u8a8d

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,7 @@ label.reboot=\uc7ac\uc2dc\uc791
861861
label.recent.errors=\ucd5c\uadfc \uc624\ub958
862862
label.redundant.router.capability=\uc911\ubcf5 \ub77c\uc6b0\ud130 \uae30\ub2a5
863863
label.redundant.router=\uc911\ubcf5 \ub77c\uc6b0\ud130
864+
label.redundant.vpc=\uc911\ubcf5 VPC
864865
label.redundant.state=\uc911\ubcf5 \uc0c1\ud0dc
865866
label.refresh=\uc5c5\ub370\uc774\ud2b8
866867
label.reinstall.vm=VM \uc7ac\uc124\uce58
@@ -896,6 +897,7 @@ label.resource=\uc790\uc6d0
896897
label.restart.network=\ub124\ud2b8\uc6cc\ud06c \uc7ac\uc2dc\uc791
897898
label.restart.required=\uc7ac\uc2dc\uc791 \ud544\uc694
898899
label.restart.vpc=VPC \uc7ac\uc2dc\uc791
900+
message.restart.vpc.remark=\ube44\uace0 \u003a \uc815\ub9ac\ub97c \uac15\uc81c \u0056\u0050\u0043\uc758 \uc911\ubcf5\uc744\u002e \ub124\ud2b8\uc6cc\ud06c\ub294 \uba87 \ubd84\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4\u002e
899901
label.review=\ud655\uc778
900902
label.revoke.project.invite=\ucd08\ub300 \ucde8\uc18c
901903
label.role=\uc5ed\ud560

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,7 @@ label.rbd=RBD
717717
label.reboot=Restart
718718
label.redundant.router.capability=Redundant ruter
719719
label.redundant.router=Redundant ruter
720+
label.redundant.vpc=Redundant VPC
720721
label.redundant.state=Redundant tilstand
721722
label.refresh=Oppfrisk
722723
label.region=Region
@@ -742,6 +743,7 @@ label.resources=Ressurser
742743
label.restart.network=Nettverksomstart
743744
label.restart.required=Omstart p\u00e5krevd
744745
label.restart.vpc=Omstart VPC
746+
label.restart.vpc.remrak=\u0042\u0065\u006d\u0065\u0072\u006b\u006e\u0069\u006e\u0067\u003a \u00e5 \u006c\u0061\u0067\u0065 \u0065\u006e \u0056\u0050\u0043 \u006f\u0076\u0065\u0072\u0066\u006c\u00f8\u0064\u0069\u0067 \u0076\u0069\u006c \u0074\u0076\u0069\u006e\u0067\u0065 \u0065\u006e \u0072\u0065\u006e \u006f\u0070\u0070\u002e \u004e\u0065\u0074\u0074\u0076\u0065\u0072\u006b \u0076\u0069\u006c \u0069\u006b\u006b\u0065 \u0076\u00e6\u0072\u0065 \u0074\u0069\u006c\u0067\u006a\u0065\u006e\u0067\u0065\u006c\u0069\u0067 \u0066\u006f\u0072 \u0065\u0074 \u0070\u0061\u0072 \u006d\u0069\u006e\u0075\u0074\u0074\u0065\u0072\u002e
745747
label.restore=Gjenopprett
746748
label.review=Gjennomg\u00e5
747749
label.revoke.project.invite=Tilbakekall invitasjonen

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,7 @@ label.recent.errors=Recente Fouten
11011101
label.recover.vm=Herstel VM
11021102
label.redundant.router.capability=Redundante router mogelijkheden
11031103
label.redundant.router=Redundante Router
1104+
label.redundant.vpc=Redundante VPC
11041105
label.redundant.state=Redundante staat
11051106
label.refresh.blades=Ververs Blades
11061107
label.refresh=Ververs
@@ -1155,7 +1156,8 @@ label.resources=Verbruiken
11551156
label.resource=Verbruik
11561157
label.restart.network=Herstart netwerk
11571158
label.restart.required=Herstart benodigd
1158-
label.restart.vpc=herstart VPC
1159+
label.restart.vpc=Herstart VPC
1160+
label.restart.vpc.remrak=\u004f\u0070\u006d\u0065\u0072\u006b\u0069\u006e\u0067\u003a \u0068\u0065\u0074 \u006d\u0061\u006b\u0065\u006e \u0076\u0061\u006e \u0065\u0065\u006e \u0056\u0050\u0043 \u006f\u0076\u0065\u0072\u0062\u006f\u0064\u0069\u0067 \u007a\u0061\u006c \u0065\u0065\u006e \u0073\u0063\u0068\u006f\u006f\u006e \u0064\u0077\u0069\u006e\u0067\u0065\u006e\u002e \u004e\u0065\u0074\u0077\u0065\u0072\u006b \u007a\u0061\u006c \u006e\u0069\u0065\u0074 \u0062\u0065\u0073\u0063\u0068\u0069\u006b\u0062\u0061\u0061\u0072 \u007a\u0069\u006a\u006e \u0076\u006f\u006f\u0072 \u0065\u0065\u006e \u0070\u0061\u0061\u0072 \u006d\u0069\u006e\u0075\u0074\u0065\u006e\u002e
11591161
label.restore=Herstel
11601162
label.review=Beoordeel
11611163
label.revoke.project.invite=Trek uitnodiging in

0 commit comments

Comments
 (0)