Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-stable
Commits
aac3fc1d
Commit
aac3fc1d
authored
Sep 28, 2012
by
Matt Strum
Committed by
Gary Wong
Dec 27, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed cloning nodes with services and making apply button available when changing services
parent
35b395d1
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
17 deletions
+40
-17
protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
...ack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
+8
-2
protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml
...om/flack/geni/display/slicer/ExecuteServiceComponent.mxml
+7
-3
protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml
...om/flack/geni/display/slicer/InstallServiceComponent.mxml
+7
-3
protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as
...flack/src/com/flack/geni/resources/virtual/VirtualNode.as
+17
-8
protogeni/flack/src/com/flack/shared/SharedMain.as
protogeni/flack/src/com/flack/shared/SharedMain.as
+1
-1
No files found.
protogeni/flack/src/com/flack/geni/display/areas/VirtualNodeArea.mxml
View file @
aac3fc1d
...
...
@@ -497,25 +497,31 @@ IN THE WORK.
private
function
addInstallService
(
installService
:
InstallService
=
null
)
:
void
{
var
newInstallComponent
:
InstallServiceComponent
=
new
InstallServiceComponent
()
;
newInstallComponent
.
onChange
=
onChange
;
if
(
installService
!=
null
)
{
newInstallComponent
.
url
=
installService
.
url
;
newInstallComponent
.
path
=
installService
.
installPath
;
}
installVgroup
.
addElement
(
newInstallComponent
)
;
if
(
!
okButton
.
enabled
)
okButton
.
enabled
=
true
;
onChange
()
;
}
private
function
addExecuteService
(
executeService
:
ExecuteService
=
null
)
:
void
{
var
newExecuteComponent
:
ExecuteServiceComponent
=
new
ExecuteServiceComponent
()
;
newExecuteComponent
.
onChange
=
onChange
;
if
(
executeService
!=
null
)
{
newExecuteComponent
.
cmd
=
executeService
.
command
;
newExecuteComponent
.
shell
=
executeService
.
shell
;
}
executeVgroup
.
addElement
(
newExecuteComponent
)
;
onChange
()
;
}
private
function
onChange
()
:
void
{
if
(
!
okButton
.
enabled
)
okButton
.
enabled
=
true
;
}
...
...
protogeni/flack/src/com/flack/geni/display/slicer/ExecuteServiceComponent.mxml
View file @
aac3fc1d
...
...
@@ -45,6 +45,8 @@ IN THE WORK.
import
spark
.
components
.
Group
;
public
var
onChange
:
Function
;
[
Bindable
]
public
var
cmd
:
String
=
""
;
[
Bindable
]
...
...
@@ -64,12 +66,14 @@ IN THE WORK.
<s:TextInput
id=
"executeCommandText"
width=
"90%"
text=
"
@{
cmd
}
"
prompt=
"Command"
/>
prompt=
"Command"
change=
"if(onChange != null) onChange();"
/>
<s:Label
text=
"using"
/>
<s:TextInput
id=
"executeShellText"
width=
"10%"
text=
"
@{
shell
}
"
prompt=
"Shell? (sh, bash, etc.)"
/>
prompt=
"Shell? (sh, bash, etc.)"
change=
"if(onChange != null) onChange();"
/>
<components:ImageButton
icon=
"
{
ImageUtil
.
deleteIcon
}
"
click=
"(parent as Group).removeElement(this)"
/>
click=
"
if(onChange != null) onChange();
(parent as Group).removeElement(this)"
/>
</s:HGroup>
protogeni/flack/src/com/flack/geni/display/slicer/InstallServiceComponent.mxml
View file @
aac3fc1d
...
...
@@ -45,6 +45,8 @@ IN THE WORK.
import
spark
.
components
.
Group
;
public
var
onChange
:
Function
;
[
Bindable
]
public
var
url
:
String
=
""
;
[
Bindable
]
...
...
@@ -64,12 +66,14 @@ IN THE WORK.
<s:TextInput
id=
"installUrlText"
width=
"50%"
text=
"
@{
url
}
"
prompt=
"Archive URL"
/>
prompt=
"Archive URL"
change=
"if(onChange != null) onChange();"
/>
<s:Label
text=
"in"
/>
<s:TextInput
id=
"installPathText"
width=
"50%"
text=
"
@{
path
}
"
prompt=
"Install path"
/>
prompt=
"Install path"
change=
"if(onChange != null) onChange();"
/>
<components:ImageButton
icon=
"
{
ImageUtil
.
deleteIcon
}
"
click=
"(parent as Group).removeElement(this)"
/>
click=
"
if(onChange != null) onChange();
(parent as Group).removeElement(this)"
/>
</s:HGroup>
protogeni/flack/src/com/flack/geni/resources/virtual/VirtualNode.as
View file @
aac3fc1d
...
...
@@ -317,18 +317,27 @@ package com.flack.geni.resources.virtual
newClone
.
hardwareType
.
name
=
hardwareType
.
name
;
newClone
.
hardwareType
.
slots
=
hardwareType
.
slots
;
}
if
(
services
.
executeServices
!=
null
)
{
newClone
.
services
.
executeServices
=
new
Vector
.
<
ExecuteService
>
()
;
for
each
(
var
executeService
:
ExecuteService
in
services
.
executeServices
)
{
var
newExecute
:
ExecuteService
=
new
ExecuteService
(
executeService
.
command
,
executeService
.
shell
)
;
newExecute
.
extensions
=
executeService
.
extensions
.
Clone
;
newClone
.
services
.
executeServices
.
push
(
newExecute
)
;
}
}
if
(
services
.
installServices
!=
null
)
{
newClone
.
services
.
installServices
=
new
Vector
.
<
InstallService
>
()
;
for
each
(
var
installService
:
InstallService
in
services
.
installServices
)
{
var
newInstall
:
InstallService
=
new
InstallService
(
installService
.
url
,
installService
.
installPath
,
installService
.
fileType
)
;
newInstall
.
extensions
=
installService
.
extensions
.
Clone
;
newClone
.
services
.
installServices
.
push
(
newInstall
)
;
}
}
newClone
.
extensions
=
extensions
.
Clone
;
// Remove the emulab extensions, it's just manifest stuff
if
(
newClone
.
extensions
.
spaces
!=
null
)
...
...
protogeni/flack/src/com/flack/shared/SharedMain.as
View file @
aac3fc1d
...
...
@@ -51,7 +51,7 @@ package com.flack.shared
/**
* Flack version
*/
public
static
const
version
:
String
=
"v14.4
0
"
;
public
static
const
version
:
String
=
"v14.4
1
"
;
public
static
const
MODE_GENI
:
int
=
0
;
public
static
const
MODE_EMULAB
:
int
=
1
;
...
...
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