Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
2f414196
Commit
2f414196
authored
Dec 30, 2013
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use new ovs bond modes (changed in pve-common)
parent
d64f5355
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Network.pm
PVE/API2/Network.pm
+4
-3
BondModeSelector.js
www/manager/form/BondModeSelector.js
+4
-3
No files found.
PVE/API2/Network.pm
View file @
2f414196
...
@@ -20,14 +20,15 @@ my $iflockfn = "/etc/network/.pve-interfaces.lock";
...
@@ -20,14 +20,15 @@ my $iflockfn = "/etc/network/.pve-interfaces.lock";
my
$bond_mode_enum
=
[
my
$bond_mode_enum
=
[
'
balance-rr
',
'
balance-rr
',
'
active-backup
',
'
active-backup
',
# OVS and Linux
'
balance-xor
',
'
balance-xor
',
'
broadcast
',
'
broadcast
',
'
802.3ad
',
'
802.3ad
',
'
balance-tlb
',
'
balance-tlb
',
'
balance-alb
',
'
balance-alb
',
'
balance-slb
',
# OVS only
'
balance-slb
',
# OVS
'
balance-tcp
',
# OVS only
'
lacp-balance-slb
',
# OVS
'
lacp-balance-tcp
',
# OVS
];
];
my
$network_type_enum
=
['
bridge
',
'
bond
',
'
eth
',
'
alias
',
my
$network_type_enum
=
['
bridge
',
'
bond
',
'
eth
',
'
alias
',
...
...
www/manager/form/BondModeSelector.js
View file @
2f414196
...
@@ -9,9 +9,10 @@ Ext.define('PVE.form.BondModeSelector', {
...
@@ -9,9 +9,10 @@ Ext.define('PVE.form.BondModeSelector', {
if
(
me
.
openvswitch
)
{
if
(
me
.
openvswitch
)
{
me
.
data
=
[
me
.
data
=
[
[
'
balance-tcp
'
,
'
balance-tc
p
'
],
[
'
active-backup
'
,
'
active-backu
p
'
],
[
'
balance-slb
'
,
'
balance-slb
'
],
[
'
balance-slb
'
,
'
balance-slb
'
],
[
'
active-backup
'
,
'
active-backup
'
]
[
'
lacp-balance-slb
'
,
'
LACP (balance-slb)
'
],
[
'
lacp-balance-tcp
'
,
'
LACP (balance-tcp)
'
]
];
];
}
else
{
}
else
{
me
.
data
=
[
me
.
data
=
[
...
@@ -19,7 +20,7 @@ Ext.define('PVE.form.BondModeSelector', {
...
@@ -19,7 +20,7 @@ Ext.define('PVE.form.BondModeSelector', {
[
'
active-backup
'
,
'
active-backup
'
],
[
'
active-backup
'
,
'
active-backup
'
],
[
'
balance-xor
'
,
'
balance-xor
'
],
[
'
balance-xor
'
,
'
balance-xor
'
],
[
'
broadcast
'
,
'
broadcast
'
],
[
'
broadcast
'
,
'
broadcast
'
],
[
'
802.3ad
'
,
'
802.3ad
'
],
[
'
802.3ad
'
,
'
LACP (layer2)
'
],
[
'
balance-tlb
'
,
'
balance-tlb
'
],
[
'
balance-tlb
'
,
'
balance-tlb
'
],
[
'
balance-alb
'
,
'
balance-alb
'
]
[
'
balance-alb
'
,
'
balance-alb
'
]
];
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment