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
7643161b
Commit
7643161b
authored
Apr 22, 2015
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lxc network: use 'bridge' property instead of 'link'
parent
2c6bc57d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Parser.js
www/manager/Parser.js
+2
-2
Network.js
www/manager/lxc/Network.js
+4
-4
No files found.
www/manager/Parser.js
View file @
7643161b
...
@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: {
...
@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: {
if
(
!
p
||
p
.
match
(
/^
\s
*$/
))
{
if
(
!
p
||
p
.
match
(
/^
\s
*$/
))
{
return
;
// continue
return
;
// continue
}
}
var
match_res
=
p
.
match
(
/^
(
link
|hwaddr|mtu|name|ip|ip6|gw|gw6
)
=
(\S
+
)
$/
);
var
match_res
=
p
.
match
(
/^
(
bridge
|hwaddr|mtu|name|ip|ip6|gw|gw6
)
=
(\S
+
)
$/
);
if
(
!
match_res
)
{
if
(
!
match_res
)
{
// todo: simply ignore errors ?
// todo: simply ignore errors ?
return
;
// continue
return
;
// continue
...
@@ -246,7 +246,7 @@ Ext.define('PVE.Parser', { statics: {
...
@@ -246,7 +246,7 @@ Ext.define('PVE.Parser', { statics: {
printLxcNetwork
:
function
(
data
)
{
printLxcNetwork
:
function
(
data
)
{
var
tmparray
=
[];
var
tmparray
=
[];
Ext
.
Array
.
each
([
'
link
'
,
'
hwaddr
'
,
'
mtu
'
,
'
name
'
,
'
ip
'
,
Ext
.
Array
.
each
([
'
bridge
'
,
'
hwaddr
'
,
'
mtu
'
,
'
name
'
,
'
ip
'
,
'
gw
'
,
'
ip6
'
,
'
gw6
'
],
function
(
key
)
{
'
gw
'
,
'
ip6
'
,
'
gw6
'
],
function
(
key
)
{
var
value
=
data
[
key
];
var
value
=
data
[
key
];
if
(
value
)
{
if
(
value
)
{
...
...
www/manager/lxc/Network.js
View file @
7643161b
...
@@ -13,7 +13,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
...
@@ -13,7 +13,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
me
.
nodename
=
nodename
;
me
.
nodename
=
nodename
;
var
bridgesel
=
me
.
query
(
"
[isFormField][name=
link
]
"
)[
0
];
var
bridgesel
=
me
.
query
(
"
[isFormField][name=
bridge
]
"
)[
0
];
bridgesel
.
setNodename
(
nodename
);
bridgesel
.
setNodename
(
nodename
);
},
},
...
@@ -127,7 +127,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
...
@@ -127,7 +127,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
},
},
{
{
xtype
:
'
PVE.form.BridgeSelector
'
,
xtype
:
'
PVE.form.BridgeSelector
'
,
name
:
'
link
'
,
name
:
'
bridge
'
,
nodename
:
me
.
nodename
,
nodename
:
me
.
nodename
,
fieldLabel
:
gettext
(
'
Bridge
'
),
fieldLabel
:
gettext
(
'
Bridge
'
),
value
:
cdata
.
bridge
,
value
:
cdata
.
bridge
,
...
@@ -377,7 +377,7 @@ Ext.define('PVE.lxc.NetworkView', {
...
@@ -377,7 +377,7 @@ Ext.define('PVE.lxc.NetworkView', {
{
{
header
:
gettext
(
'
Bridge
'
),
header
:
gettext
(
'
Bridge
'
),
width
:
80
,
width
:
80
,
dataIndex
:
'
link
'
dataIndex
:
'
bridge
'
},
},
{
{
header
:
gettext
(
'
Firewall
'
),
header
:
gettext
(
'
Firewall
'
),
...
@@ -439,7 +439,7 @@ Ext.define('PVE.lxc.NetworkView', {
...
@@ -439,7 +439,7 @@ Ext.define('PVE.lxc.NetworkView', {
Ext
.
define
(
'
pve-lxc-network
'
,
{
Ext
.
define
(
'
pve-lxc-network
'
,
{
extend
:
"
Ext.data.Model
"
,
extend
:
"
Ext.data.Model
"
,
proxy
:
{
type
:
'
memory
'
},
proxy
:
{
type
:
'
memory
'
},
fields
:
[
'
id
'
,
'
name
'
,
'
hwaddr
'
,
'
link
'
,
fields
:
[
'
id
'
,
'
name
'
,
'
hwaddr
'
,
'
bridge
'
,
'
ip
'
,
'
gw
'
,
'
ip6
'
,
'
gw6
'
,
'
tag
'
,
'
firewall
'
]
'
ip
'
,
'
gw
'
,
'
ip6
'
,
'
gw6
'
,
'
tag
'
,
'
firewall
'
]
});
});
...
...
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