date:20150617

git commit: updated refs/heads/master to 2e79207

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 41c1fddae -> 2e792075e


update of the findbugs lib

Signed-off-by: Daan Hoogland 

This closes #459


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e792075
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e792075
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e792075

Branch: refs/heads/master
Commit: 2e792075eef93eaed7fdc8476d6b25d68ffb5b6e
Parents: 41c1fdd
Author: Daan Hoogland 
Authored: Mon Jun 15 16:22:34 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 10:25:33 2015 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e792075/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fa019ef..8ac4268 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 4.0.0
 2.11
 2.7
-3.0.0
+3.0.1
 2.10.1
 2.6.1

[1/2] cloudstack-www git commit: Updated organization and timezone for user

2015-06-17 Thread erikw

Repository: cloudstack-www
Updated Branches:
  refs/heads/master f36d6e740 -> fdaca3420


Updated organization and timezone for user

This closes #9

Signed-off-by: Erik Weber 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/033d2e17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/033d2e17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/033d2e17

Branch: refs/heads/master
Commit: 033d2e178c77ba2eafa16db7f5448017bf06ee41
Parents: f36d6e7
Author: Jan-Arve NygÃ¥rd 
Authored: Wed Jun 17 09:22:15 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:43:15 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/033d2e17/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 2da00af..59a799d 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -83,7 +83,7 @@ Active list of committers include
 |Dave Cahill|dcahill|
 |Demetrius Tsitrelis|demetriust|
 |Devdeep Singh|devdeep|Citrix|+5.5|
-|Erik Weber|erikw|
+|Erik Weber|erikw|EVRY|+1|
 |Funs Kessen|snuf|
 |Gaurav Nandkumar Aradhye|gaurav|
 |Gavin Lee|gavinlee|

[2/2] cloudstack-www git commit: Added html files

2015-06-17 Thread erikw

Added html files


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/fdaca342
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/fdaca342
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/fdaca342

Branch: refs/heads/master
Commit: fdaca34202c991c0f70b80ac874178a45d6e6260
Parents: 033d2e1
Author: Erik Weber 
Authored: Wed Jun 17 10:46:20 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:46:20 2015 +0200

--
 content/stylesheets/bootstrap.css |   1 +
 content/who.html  | 881 +
 2 files changed, 663 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/fdaca342/content/stylesheets/bootstrap.css
--
diff --git a/content/stylesheets/bootstrap.css 
b/content/stylesheets/bootstrap.css
index b5c03fa..57d795f 100644
--- a/content/stylesheets/bootstrap.css
+++ b/content/stylesheets/bootstrap.css
@@ -1538,6 +1538,7 @@ th {
 
 .table-bordered {
   border: 1px solid #ecf0f1;
+  width: 100%;
 }
 
 .table-bordered > thead > tr > th,

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/fdaca342/content/who.html
--
diff --git a/content/who.html b/content/who.html
index 1744edf..260c39d 100644
--- a/content/who.html
+++ b/content/who.html
@@ -125,17 +125,13 @@
 
 
 
-
-
-
+
 
 
 
 
 
-Apache CloudStack: Project Membership
+Apache CloudStack Project Members
 
 
 
@@ -143,223 +139,670 @@ PMC members are listed in both the PMC member section 
and the Committer section
 
 
 
-This page includes all of the Apache CloudStack Project Management 
Committee (PMC) members and committers, and their ASF usernames.
+This page includes the Apache CloudStack Project Management Committee (PMC) 
members and committers.
 
 PMC
-
-Alena Prokharchyk (alena1108)
-
-Alex Huang (ahuang)
-
-Alex Karasulu (akarasulu)
-
-Animesh (animesh)
-
-Bruno Demion (milamber)
-
-Chip Childers (chipchilders)
-
-Chiradeep Vittal (chiradeep)
-
-Daan (dahn)
-
-David Nalley (ke4qqq)
-
-Disheng Su (edison)
-
-Giles Sirett (giles)
-
-Go Chiba (gochiba)
-
-Hugo Trippaers (hugo)
-
-Ian Duffy (duffy)
-
-Ilya Musayev (ilya)
-
-Jim Jagielski (jim)
-
-Joe Brockmeier (jzb)
-
-John Burwell (jburwell)
-
-John Kinsella (jlk)
-
-Kevin Kluge (kluge)
-
-Marcus Sorensen (mlsorensen)
-
-Mark R. Hinkle (mrhinkle)
-
-Matt Richard Hogstrom (hogstrom)
-
-Mike Tutkowski (mtutkowski)
-
-Mohammad Nour El-Din (mnour)
-
-Noah Slater (nslater)
-
-Olivier Lamy (olamy)
-
-Pierre-Luc Dion (pdion891)
-
-Prasanna (tsp)
-
-Rajani Karuturi (rajani)
-
-Sebastien Goasguen (sebgoa)
-
-Wido den Hollander (widodh)
-
-William Chan (willchan)
+Active Project Management Committee contains (in alphabetical order):
+
+
+  
+
+  Name
+  username
+  organization
+  timezone
+
+  
+  
+
+  Alena Prokharchyk
+  alena1108
+  Â 
+  Â 
+
+
+  Alex Karasulu
+  akarasulu
+  Â 
+  Â 
+
+
+  Animesh
+  animesh
+  Â 
+  Â 
+
+
+  Chip Childers
+  chipchilders
+  Â 
+  Â 
+
+
+  Chiradeep Vittal
+  chiradeep
+  Citrix
+  Â 
+
+
+  Bruno Demion
+  milamber
+  Â 
+  Â 
+
+
+  Daan
+  dahn
+  Schuberg Philis
+  Â 
+
+
+  David Nalley
+  ke4qqq
+  Citrix
+  Â 
+
+
+  Giles Sirett
+  giles
+  ShapeBlue
+  Â 
+
+
+  Go Chiba
+  gochiba
+  Â 
+  Â 
+
+
+  Hugo Trippaers
+  hugo
+  Schuberg Philis
+  Â 
+
+
+  Ilya Musayev
+  ilya
+  Â 
+  Â 
+
+
+  Jim Jagielski
+  jim
+  Â 
+  Â 
+
+
+  Joe Brockmeier
+  jzb
+  Â 
+  Â 
+
+
+  John Burwell
+  jburwell
+  Â 
+  Â 
+
+
+  John Kinsella
+  jlk
+  Â 
+  Â 
+
+
+  Kevin Kluge
+  kluge
+  Â 
+  Â 
+
+
+  Marcus Sorensen
+  mlsorensen
+  Â 
+  Â 
+
+
+  Mark R. Hinkle
+  mrhinkle
+  Citrix
+  Â 
+
+
+  Matt Richard Hogstrom
+  hogstrom
+  Â 
+  Â 
+
+
+  Mike Tutkowski
+  mtutkowski
+  Â 
+  Â 
+
+
+  Mohammad Nour El-Din
+  mnour
+  Â 
+  Â 
+
+
+  Noah Slater
+  nslater
+  Â 
+  Â 
+
+
+  Pierre-Luc Dion
+  pdion891
+  Â 
+  Â 
+
+
+  Prasanna
+  tsp
+  Â 
+  Â 
+
+
+  Rajani Karuturi
+  rajani
+  Citrix
+  +5.5
+
+
+

[2/3] cloudstack-www git commit: Added html files

2015-06-17 Thread erikw

Added html files


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/fdaca342
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/fdaca342
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/fdaca342

Branch: refs/heads/asf-site
Commit: fdaca34202c991c0f70b80ac874178a45d6e6260
Parents: 033d2e1
Author: Erik Weber 
Authored: Wed Jun 17 10:46:20 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:46:20 2015 +0200

--
 content/stylesheets/bootstrap.css |   1 +
 content/who.html  | 881 +
 2 files changed, 663 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/fdaca342/content/stylesheets/bootstrap.css
--
diff --git a/content/stylesheets/bootstrap.css 
b/content/stylesheets/bootstrap.css
index b5c03fa..57d795f 100644
--- a/content/stylesheets/bootstrap.css
+++ b/content/stylesheets/bootstrap.css
@@ -1538,6 +1538,7 @@ th {
 
 .table-bordered {
   border: 1px solid #ecf0f1;
+  width: 100%;
 }
 
 .table-bordered > thead > tr > th,

http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/fdaca342/content/who.html
--
diff --git a/content/who.html b/content/who.html
index 1744edf..260c39d 100644
--- a/content/who.html
+++ b/content/who.html
@@ -125,17 +125,13 @@
 
 
 
-
-
-
+
 
 
 
 
 
-Apache CloudStack: Project Membership
+Apache CloudStack Project Members
 
 
 
@@ -143,223 +139,670 @@ PMC members are listed in both the PMC member section 
and the Committer section
 
 
 
-This page includes all of the Apache CloudStack Project Management 
Committee (PMC) members and committers, and their ASF usernames.
+This page includes the Apache CloudStack Project Management Committee (PMC) 
members and committers.
 
 PMC
-
-Alena Prokharchyk (alena1108)
-
-Alex Huang (ahuang)
-
-Alex Karasulu (akarasulu)
-
-Animesh (animesh)
-
-Bruno Demion (milamber)
-
-Chip Childers (chipchilders)
-
-Chiradeep Vittal (chiradeep)
-
-Daan (dahn)
-
-David Nalley (ke4qqq)
-
-Disheng Su (edison)
-
-Giles Sirett (giles)
-
-Go Chiba (gochiba)
-
-Hugo Trippaers (hugo)
-
-Ian Duffy (duffy)
-
-Ilya Musayev (ilya)
-
-Jim Jagielski (jim)
-
-Joe Brockmeier (jzb)
-
-John Burwell (jburwell)
-
-John Kinsella (jlk)
-
-Kevin Kluge (kluge)
-
-Marcus Sorensen (mlsorensen)
-
-Mark R. Hinkle (mrhinkle)
-
-Matt Richard Hogstrom (hogstrom)
-
-Mike Tutkowski (mtutkowski)
-
-Mohammad Nour El-Din (mnour)
-
-Noah Slater (nslater)
-
-Olivier Lamy (olamy)
-
-Pierre-Luc Dion (pdion891)
-
-Prasanna (tsp)
-
-Rajani Karuturi (rajani)
-
-Sebastien Goasguen (sebgoa)
-
-Wido den Hollander (widodh)
-
-William Chan (willchan)
+Active Project Management Committee contains (in alphabetical order):
+
+
+  
+
+  Name
+  username
+  organization
+  timezone
+
+  
+  
+
+  Alena Prokharchyk
+  alena1108
+  Â 
+  Â 
+
+
+  Alex Karasulu
+  akarasulu
+  Â 
+  Â 
+
+
+  Animesh
+  animesh
+  Â 
+  Â 
+
+
+  Chip Childers
+  chipchilders
+  Â 
+  Â 
+
+
+  Chiradeep Vittal
+  chiradeep
+  Citrix
+  Â 
+
+
+  Bruno Demion
+  milamber
+  Â 
+  Â 
+
+
+  Daan
+  dahn
+  Schuberg Philis
+  Â 
+
+
+  David Nalley
+  ke4qqq
+  Citrix
+  Â 
+
+
+  Giles Sirett
+  giles
+  ShapeBlue
+  Â 
+
+
+  Go Chiba
+  gochiba
+  Â 
+  Â 
+
+
+  Hugo Trippaers
+  hugo
+  Schuberg Philis
+  Â 
+
+
+  Ilya Musayev
+  ilya
+  Â 
+  Â 
+
+
+  Jim Jagielski
+  jim
+  Â 
+  Â 
+
+
+  Joe Brockmeier
+  jzb
+  Â 
+  Â 
+
+
+  John Burwell
+  jburwell
+  Â 
+  Â 
+
+
+  John Kinsella
+  jlk
+  Â 
+  Â 
+
+
+  Kevin Kluge
+  kluge
+  Â 
+  Â 
+
+
+  Marcus Sorensen
+  mlsorensen
+  Â 
+  Â 
+
+
+  Mark R. Hinkle
+  mrhinkle
+  Citrix
+  Â 
+
+
+  Matt Richard Hogstrom
+  hogstrom
+  Â 
+  Â 
+
+
+  Mike Tutkowski
+  mtutkowski
+  Â 
+  Â 
+
+
+  Mohammad Nour El-Din
+  mnour
+  Â 
+  Â 
+
+
+  Noah Slater
+  nslater
+  Â 
+  Â 
+
+
+  Pierre-Luc Dion
+  pdion891
+  Â 
+  Â 
+
+
+  Prasanna
+  tsp
+  Â 
+  Â 
+
+
+  Rajani Karuturi
+  rajani
+  Citrix
+  +5.5
+
+

[3/3] cloudstack-www git commit: Merge branch 'master' into asf-site

2015-06-17 Thread erikw

Merge branch 'master' into asf-site

* master:
  Added html files
  Updated organization and timezone for user


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/8771d66e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/8771d66e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/8771d66e

Branch: refs/heads/asf-site
Commit: 8771d66e1a839d8cd2a0a3840677a1307d93063e
Parents: 4e4d68e fdaca34
Author: Erik Weber 
Authored: Wed Jun 17 10:47:24 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:47:24 2015 +0200

--
 content/who.html| 4 ++--
 source/who.markdown | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--

[1/3] cloudstack-www git commit: Updated organization and timezone for user

2015-06-17 Thread erikw

Repository: cloudstack-www
Updated Branches:
  refs/heads/asf-site 4e4d68e50 -> 8771d66e1


Updated organization and timezone for user

This closes #9

Signed-off-by: Erik Weber 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/033d2e17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/033d2e17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/033d2e17

Branch: refs/heads/asf-site
Commit: 033d2e178c77ba2eafa16db7f5448017bf06ee41
Parents: f36d6e7
Author: Jan-Arve NygÃ¥rd 
Authored: Wed Jun 17 09:22:15 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:43:15 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/033d2e17/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 2da00af..59a799d 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -83,7 +83,7 @@ Active list of committers include
 |Dave Cahill|dcahill|
 |Demetrius Tsitrelis|demetriust|
 |Devdeep Singh|devdeep|Citrix|+5.5|
-|Erik Weber|erikw|
+|Erik Weber|erikw|EVRY|+1|
 |Funs Kessen|snuf|
 |Gaurav Nandkumar Aradhye|gaurav|
 |Gavin Lee|gavinlee|

[4/9] cloudstack-www git commit: Removed Bruno (milamber) from Commiters as he is PMC

2015-06-17 Thread erikw

Removed Bruno (milamber) from Commiters as he is PMC


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/55ff9882
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/55ff9882
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/55ff9882

Branch: refs/heads/master
Commit: 55ff98821b919344f260654e86fdeda6c928941f
Parents: 5267701
Author: Erik Weber 
Authored: Wed Jun 17 10:49:20 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:49:20 2015 +0200

--
 source/who.markdown | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/55ff9882/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 6cf02d2..21facb4 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -76,7 +76,6 @@ Active list of committers include
 |Anthony Xu|anthonyxu|
 |Brett Porter|brett|
 |Brian Federle|bfederle|
-|Bruno Demion|milamber|
 |Chris Suich|csuich2|
 |Clayton Weise|claytonweise|
 |Darren Shepherd|darren|

[9/9] cloudstack-www git commit: Merge branch 'master' into asf-site

2015-06-17 Thread erikw

Merge branch 'master' into asf-site

* master:
  Added built file
  Moved Rohit from Committers to PMC
  Removed Bruno (milamber) from Commiters as he is PMC
  Added last name for Daan


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/fd89ec02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/fd89ec02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/fd89ec02

Branch: refs/heads/asf-site
Commit: fd89ec02dbefc5b20b0b5669fd8531b650424d1a
Parents: 8771d66 965d824
Author: Erik Weber 
Authored: Wed Jun 17 10:52:08 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:52:08 2015 +0200

--
 content/who.html| 20 +++-
 source/who.markdown |  5 ++---
 2 files changed, 9 insertions(+), 16 deletions(-)
--

[7/9] cloudstack-www git commit: Added built file

2015-06-17 Thread erikw

Added built file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/965d8249
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/965d8249
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/965d8249

Branch: refs/heads/master
Commit: 965d8249626af4fe968275266891f627287674c2
Parents: 1982905
Author: Erik Weber 
Authored: Wed Jun 17 10:51:48 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:51:48 2015 +0200

--
 content/who.html | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/965d8249/content/who.html
--
diff --git a/content/who.html b/content/who.html
index 260c39d..ca92424 100644
--- a/content/who.html
+++ b/content/who.html
@@ -191,7 +191,7 @@
   Â 
 
 
-  Daan
+  Daan Hoogland
   dahn
   Schuberg Philis
   Â 
@@ -311,6 +311,12 @@
   +5.5
 
 
+  Rohit Yadav
+  bhaisaab
+  ShapeBlue
+  Â 
+
+
   Sebastien Goasguen
   sebgoa
   Citrix
@@ -397,12 +403,6 @@
   Â 
 
 
-  Bruno Demion
-  milamber
-  Â 
-  Â 
-
-
   Chris Suich
   csuich2
   Â 
@@ -667,12 +667,6 @@
   Â 
 
 
-  Rohit Yadav
-  bhaisaab
-  ShapeBlue
-  Â 
-
-
   Sailaja Mada
   sailajamada
   Citrix

[2/9] cloudstack-www git commit: Added last name for Daan

2015-06-17 Thread erikw

Added last name for Daan


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/52677018
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/52677018
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/52677018

Branch: refs/heads/master
Commit: 5267701874696ea71ff24198171540eb838da6cd
Parents: fdaca34
Author: Erik Weber 
Authored: Wed Jun 17 10:48:50 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:48:50 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/52677018/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 59a799d..6cf02d2 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -31,7 +31,7 @@ Active Project Management Committee contains (in alphabetical 
order):
 |Chip Childers|chipchilders|
 |Chiradeep Vittal|chiradeep|Citrix|
 |Bruno Demion|milamber|
-|Daan|dahn|Schuberg Philis|
+|Daan Hoogland|dahn|Schuberg Philis|
 |David Nalley|ke4qqq|Citrix|
 |Giles Sirett|giles|ShapeBlue|
 |Go Chiba|gochiba|

[5/9] cloudstack-www git commit: Moved Rohit from Committers to PMC

2015-06-17 Thread erikw

Moved Rohit from Committers to PMC


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/19829057
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/19829057
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/19829057

Branch: refs/heads/master
Commit: 19829057388eb6a5651f144d13ae699a9f265bd0
Parents: 55ff988
Author: Erik Weber 
Authored: Wed Jun 17 10:49:48 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:49:48 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/19829057/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 21facb4..e7499c8 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -51,6 +51,7 @@ Active Project Management Committee contains (in alphabetical 
order):
 |Pierre-Luc Dion|pdion891|
 |Prasanna|tsp|
 |Rajani Karuturi|rajani|Citrix|+5.5|
+|Rohit Yadav|bhaisaab|ShapeBlue|
 |Sebastien Goasguen|sebgoa|Citrix|
 |Wido den Hollander|widodh|
 |William Chan|willchan|
@@ -120,7 +121,6 @@ Active list of committers include
 |Rajesh Battala|rajeshbattala|Citrix|+5.5|
 |Remi Bergsma|remi|
 |Rene Moser|resmo|
-|Rohit Yadav|bhaisaab|ShapeBlue|
 |Sailaja Mada|sailajamada|Citrix|+5.5|
 |Saksham Srivastava|saksham|Citrix|+5.5|
 |Sam Robertson|slriv|

[6/9] cloudstack-www git commit: Moved Rohit from Committers to PMC

2015-06-17 Thread erikw

Moved Rohit from Committers to PMC


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/19829057
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/19829057
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/19829057

Branch: refs/heads/asf-site
Commit: 19829057388eb6a5651f144d13ae699a9f265bd0
Parents: 55ff988
Author: Erik Weber 
Authored: Wed Jun 17 10:49:48 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:49:48 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/19829057/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 21facb4..e7499c8 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -51,6 +51,7 @@ Active Project Management Committee contains (in alphabetical 
order):
 |Pierre-Luc Dion|pdion891|
 |Prasanna|tsp|
 |Rajani Karuturi|rajani|Citrix|+5.5|
+|Rohit Yadav|bhaisaab|ShapeBlue|
 |Sebastien Goasguen|sebgoa|Citrix|
 |Wido den Hollander|widodh|
 |William Chan|willchan|
@@ -120,7 +121,6 @@ Active list of committers include
 |Rajesh Battala|rajeshbattala|Citrix|+5.5|
 |Remi Bergsma|remi|
 |Rene Moser|resmo|
-|Rohit Yadav|bhaisaab|ShapeBlue|
 |Sailaja Mada|sailajamada|Citrix|+5.5|
 |Saksham Srivastava|saksham|Citrix|+5.5|
 |Sam Robertson|slriv|

[3/9] cloudstack-www git commit: Removed Bruno (milamber) from Commiters as he is PMC

2015-06-17 Thread erikw

Removed Bruno (milamber) from Commiters as he is PMC


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/55ff9882
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/55ff9882
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/55ff9882

Branch: refs/heads/asf-site
Commit: 55ff98821b919344f260654e86fdeda6c928941f
Parents: 5267701
Author: Erik Weber 
Authored: Wed Jun 17 10:49:20 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:49:20 2015 +0200

--
 source/who.markdown | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/55ff9882/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 6cf02d2..21facb4 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -76,7 +76,6 @@ Active list of committers include
 |Anthony Xu|anthonyxu|
 |Brett Porter|brett|
 |Brian Federle|bfederle|
-|Bruno Demion|milamber|
 |Chris Suich|csuich2|
 |Clayton Weise|claytonweise|
 |Darren Shepherd|darren|

[1/9] cloudstack-www git commit: Added last name for Daan

2015-06-17 Thread erikw

Repository: cloudstack-www
Updated Branches:
  refs/heads/asf-site 8771d66e1 -> fd89ec02d
  refs/heads/master fdaca3420 -> 965d82496


Added last name for Daan


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/52677018
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/52677018
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/52677018

Branch: refs/heads/asf-site
Commit: 5267701874696ea71ff24198171540eb838da6cd
Parents: fdaca34
Author: Erik Weber 
Authored: Wed Jun 17 10:48:50 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:48:50 2015 +0200

--
 source/who.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/52677018/source/who.markdown
--
diff --git a/source/who.markdown b/source/who.markdown
index 59a799d..6cf02d2 100644
--- a/source/who.markdown
+++ b/source/who.markdown
@@ -31,7 +31,7 @@ Active Project Management Committee contains (in alphabetical 
order):
 |Chip Childers|chipchilders|
 |Chiradeep Vittal|chiradeep|Citrix|
 |Bruno Demion|milamber|
-|Daan|dahn|Schuberg Philis|
+|Daan Hoogland|dahn|Schuberg Philis|
 |David Nalley|ke4qqq|Citrix|
 |Giles Sirett|giles|ShapeBlue|
 |Go Chiba|gochiba|

[8/9] cloudstack-www git commit: Added built file

2015-06-17 Thread erikw

Added built file


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-www/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-www/commit/965d8249
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-www/tree/965d8249
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-www/diff/965d8249

Branch: refs/heads/asf-site
Commit: 965d8249626af4fe968275266891f627287674c2
Parents: 1982905
Author: Erik Weber 
Authored: Wed Jun 17 10:51:48 2015 +0200
Committer: Erik Weber 
Committed: Wed Jun 17 10:51:48 2015 +0200

--
 content/who.html | 20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/965d8249/content/who.html
--
diff --git a/content/who.html b/content/who.html
index 260c39d..ca92424 100644
--- a/content/who.html
+++ b/content/who.html
@@ -191,7 +191,7 @@
   Â 
 
 
-  Daan
+  Daan Hoogland
   dahn
   Schuberg Philis
   Â 
@@ -311,6 +311,12 @@
   +5.5
 
 
+  Rohit Yadav
+  bhaisaab
+  ShapeBlue
+  Â 
+
+
   Sebastien Goasguen
   sebgoa
   Citrix
@@ -397,12 +403,6 @@
   Â 
 
 
-  Bruno Demion
-  milamber
-  Â 
-  Â 
-
-
   Chris Suich
   csuich2
   Â 
@@ -667,12 +667,6 @@
   Â 
 
 
-  Rohit Yadav
-  bhaisaab
-  ShapeBlue
-  Â 
-
-
   Sailaja Mada
   sailajamada
   Citrix

git commit: updated refs/heads/master to 4727855

2015-06-17 Thread sanjaytripathi

Repository: cloudstack
Updated Branches:
  refs/heads/master 2e792075e -> 47278556f


CLOUDSTACK-8567 Migrating primary storage causes name_label field to blank.
This closes #468


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47278556
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47278556
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47278556

Branch: refs/heads/master
Commit: 47278556f53bf0ed92e52894bea5d2e2af28b773
Parents: 2e79207
Author: Sanjay Tripathi 
Authored: Fri Apr 17 13:42:26 2015 +0530
Committer: Sanjay Tripathi 
Committed: Wed Jun 17 14:46:51 2015 +0530

--
 .../hypervisor/xenserver/resource/Xenserver625StorageProcessor.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47278556/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
index 37c311a..ae1b729 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
@@ -850,6 +850,7 @@ public class Xenserver625StorageProcessor extends 
XenServerStorageProcessor {
 hypervisorResource.checkForSuccess(conn, task);
 final VDI destVdi = Types.toVDI(task, conn);
 final VolumeObjectTO newVol = new VolumeObjectTO();
+destVdi.setNameLabel(conn, srcVolume.getName());
 newVol.setPath(destVdi.getUuid(conn));
 newVol.setSize(srcVolume.getSize());

git commit: updated refs/heads/dhcpoffload to b641231

2015-06-17 Thread jayapal

Repository: cloudstack
Updated Branches:
  refs/heads/dhcpoffload [created] b641231ab


Fixed issue in adding vm SG rules on vm reboot for xenserver 6.5


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b641231a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b641231a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b641231a

Branch: refs/heads/dhcpoffload
Commit: b641231ab01f13685b8a237abceebf446a532169
Parents: 4727855
Author: Jayapal 
Authored: Wed Jun 17 15:16:54 2015 +0530
Committer: Jayapal 
Committed: Wed Jun 17 15:17:17 2015 +0530

--
 scripts/vm/hypervisor/xenserver/vmops | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b641231a/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index d195f53..0dfa6da 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -927,10 +927,9 @@ def network_rules_for_rebooted_vm(session, vmName):
 for cmd in [delcmd, delcmd2, inscmd, inscmd2, inscmd3, inscmd4]:
 cmds = util.pread2(['/bin/bash', '-c', cmd]).split('\n')
 cmds.pop()
-for c in cmds:
+for c in filter(None,cmds):
 ipt = c.split(' ')
 ipt.insert(0, 'iptables')
-ipt.pop()
 ipts.append(ipt)
 
 for ipt in ipts:

git commit: updated refs/heads/master to d702b63

2015-06-17 Thread sanjaytripathi

Repository: cloudstack
Updated Branches:
  refs/heads/master 47278556f -> d702b63bf


CLOUDSTACK-8569: The latter snapshot export for the same volume will fail is 2 
snapshot exports are queued
This closes #469


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d702b63b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d702b63b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d702b63b

Branch: refs/heads/master
Commit: d702b63bfb91f744d838ae081430308b5190fff6
Parents: 4727855
Author: Sanjay Tripathi 
Authored: Wed Jun 17 15:16:43 2015 +0530
Committer: Sanjay Tripathi 
Committed: Wed Jun 17 15:27:03 2015 +0530

--
 .../xenserver/resource/XenServerStorageProcessor.java | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d702b63b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
index 0cf40f5..f489e5c 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
@@ -1157,10 +1157,15 @@ public class XenServerStorageProcessor implements 
StorageProcessor {
 if (volume == null) {
 throw new InternalErrorException("Could not destroy snapshot 
on volume " + volumeUuid + " due to can not find it");
 }
+// To avoid deleting snapshots which are still waiting in queue to 
get backed up.
+VDI avoidSnapshot = getVDIbyUuid(conn, avoidSnapshotUuid);
+if (avoidSnapshot == null) {
+throw new InternalErrorException("Could not find current 
snapshot " + avoidSnapshotUuid);
+}
 final Set snapshots = volume.getSnapshots(conn);
 for (final VDI snapshot : snapshots) {
 try {
-if (!snapshot.getUuid(conn).equals(avoidSnapshotUuid)) {
+if (!snapshot.getUuid(conn).equals(avoidSnapshotUuid) && 
snapshot.getSnapshotTime(conn).before(avoidSnapshot.getSnapshotTime(conn))) {
 snapshot.destroy(conn);
 }
 } catch (final Exception e) {

git commit: updated refs/heads/master to d056c3d

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master d702b63bf -> d056c3d27


Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in 
VirtualMachineManagerImpl.java Removed two unnecessary null checks as this 
piece of code will only run if answer is not null, as satified in condition 
stated in line #1253

Signed-off-by: Daan Hoogland 

This closes #445


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d056c3d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d056c3d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d056c3d2

Branch: refs/heads/master
Commit: d056c3d279823e321b0be2bde83946cbf51d0e41
Parents: d702b63
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:21:51 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:07:54 2015 +0200

--
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d056c3d2/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index ad31fdd..057c9e2 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1266,8 +1266,8 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 if (gpuDevice != null) {
 _resourceMgr.updateGPUDetails(vm.getHostId(), 
gpuDevice.getGroupDetails());
 }
-if (answer == null || !answer.getResult()) {
-final String details = answer != null ? 
answer.getDetails() : "null answer returned";
+if (!answer.getResult()) {
+final String details = answer.getDetails();
 s_logger.debug("Unable to stop VM due to " + details);
 return false;
 }

git commit: updated refs/heads/master to a2129b2

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master d056c3d27 -> a2129b294


Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in 
VmWorkJobDispatcher.java Assert isn't used in prod runtime, null is properly 
checked in method

Signed-off-by: Daan Hoogland 

This closes #446


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2129b29
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2129b29
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2129b29

Branch: refs/heads/master
Commit: a2129b29409faaa8609a40784d83cea97e1302ff
Parents: d056c3d
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:25:35 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:08:19 2015 +0200

--
 engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2129b29/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
--
diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java 
b/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
index bbbf7fd..9f1eca6 100644
--- a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
+++ b/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java
@@ -71,7 +71,6 @@ public class VmWorkJobDispatcher extends AdapterBase 
implements AsyncJobDispatch
 }
 
 work = VmWorkSerializer.deserialize(workClz, job.getCmdInfo());
-assert(work != null);
 if(work == null) {
 s_logger.error("Unable to deserialize VM work " + job.getCmd() 
+ ", job info: " + job.getCmdInfo() + ", job origin: " + job.getRelated());
 _asyncJobMgr.completeAsyncJob(job.getId(), 
JobInfo.Status.FAILED, 0, "Unable to deserialize VM work");

git commit: updated refs/heads/master to eaa4eba

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master a2129b294 -> eaa4eba74


Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in EngineHostVO.java 
Assert isn't used in prod runtime, null is checked in method

Signed-off-by: Daan Hoogland 

This closes #448


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eaa4eba7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eaa4eba7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eaa4eba7

Branch: refs/heads/master
Commit: eaa4eba74df75ff87fb755bc1ba5c982f8c49bee
Parents: a2129b2
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:30:54 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:10:45 2015 +0200

--
 .../cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java   | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eaa4eba7/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
index b064a35..efa34df 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostVO.java
@@ -296,8 +296,6 @@ public class EngineHostVO implements EngineHost, Identity {
 }
 
 public String getDetail(String name) {
-assert (details != null) : "Did you forget to load the details?";
-
 return details != null ? details.get(name) : null;
 }

[1/2] git commit: updated refs/heads/master to 5a3e57e

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master eaa4eba74 -> 5a3e57e6b


Re-run travis

Signed-off-by: Daan Hoogland 

This closes #450


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a3e57e6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a3e57e6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a3e57e6

Branch: refs/heads/master
Commit: 5a3e57e6b2579808714ea7bccabc72451e2b6ed0
Parents: b3d49d9
Author: Rafael da Fonseca 
Authored: Mon Jun 15 17:36:46 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:12:41 2015 +0200

--
 engine/schema/src/com/cloud/dc/DataCenterVO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a3e57e6/engine/schema/src/com/cloud/dc/DataCenterVO.java
--
diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java 
b/engine/schema/src/com/cloud/dc/DataCenterVO.java
index 089a660..42ea34a 100644
--- a/engine/schema/src/com/cloud/dc/DataCenterVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterVO.java
@@ -375,7 +375,7 @@ public class DataCenterVO implements DataCenter {
 }
 
 public String getDetail(String name) {
-return details != null ? details.get(name) : null;
+return details != null ? details.get(name) : null ;
 }
 
 public void setDetail(String name, String value) {

[2/2] git commit: updated refs/heads/master to 5a3e57e

2015-06-17 Thread dahn

Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in DataCenterVO.java 
Assert isn't used in prod runtime

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3d49d91
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3d49d91
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3d49d91

Branch: refs/heads/master
Commit: b3d49d91354eef3e545fe21929b7d933ca48aad4
Parents: eaa4eba
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:39:47 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:12:41 2015 +0200

--
 engine/schema/src/com/cloud/dc/DataCenterVO.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3d49d91/engine/schema/src/com/cloud/dc/DataCenterVO.java
--
diff --git a/engine/schema/src/com/cloud/dc/DataCenterVO.java 
b/engine/schema/src/com/cloud/dc/DataCenterVO.java
index 02aa988..089a660 100644
--- a/engine/schema/src/com/cloud/dc/DataCenterVO.java
+++ b/engine/schema/src/com/cloud/dc/DataCenterVO.java
@@ -375,8 +375,6 @@ public class DataCenterVO implements DataCenter {
 }
 
 public String getDetail(String name) {
-assert (details != null) : "Did you forget to load the details?";
-
 return details != null ? details.get(name) : null;
 }

[1/2] git commit: updated refs/heads/master to acab743

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 5a3e57e6b -> acab743aa


Re-run travis

Signed-off-by: Daan Hoogland 

This closes #452


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acab743a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acab743a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acab743a

Branch: refs/heads/master
Commit: acab743aa1faa6e973a20642bb38028154dd196e
Parents: 380ac0c
Author: Rafael da Fonseca 
Authored: Mon Jun 15 17:35:39 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:13:46 2015 +0200

--
 engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acab743a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
--
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java 
b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index b93f81a..9c755df 100644
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -310,7 +310,7 @@ public class ServiceOfferingVO extends DiskOfferingVO 
implements ServiceOffering
 }
 
 public String getDetail(String name) {
-return details != null ? details.get(name) : null;
+return details != null ? details.get(name) : null ;
 }
 
 public void setDetail(String name, String value) {

[1/2] git commit: updated refs/heads/master to ce50600

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master acab743aa -> ce506000c


Re-run travis

Signed-off-by: Daan Hoogland 

This closes #453


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce506000
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce506000
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce506000

Branch: refs/heads/master
Commit: ce506000cd5ab1959a52032a063224c7c9616d06
Parents: 4a333e4
Author: Rafael da Fonseca 
Authored: Mon Jun 15 17:33:54 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:14:31 2015 +0200

--
 engine/schema/src/com/cloud/vm/UserVmVO.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce506000/engine/schema/src/com/cloud/vm/UserVmVO.java
--
diff --git a/engine/schema/src/com/cloud/vm/UserVmVO.java 
b/engine/schema/src/com/cloud/vm/UserVmVO.java
index 890c6373..e395034 100644
--- a/engine/schema/src/com/cloud/vm/UserVmVO.java
+++ b/engine/schema/src/com/cloud/vm/UserVmVO.java
@@ -106,7 +106,7 @@ public class UserVmVO extends VMInstanceVO implements 
UserVm {
 
 @Override
 public String getDetail(String name) {
-return details != null ? details.get(name) : null;
+return details != null ? details.get(name) : null ;
 }
 
 @Override

[2/2] git commit: updated refs/heads/master to acab743

2015-06-17 Thread dahn

Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in ServiceOfferingVO.java 
Assert isn't used in prod runtime

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/380ac0cf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/380ac0cf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/380ac0cf

Branch: refs/heads/master
Commit: 380ac0cf24c81ea04bca5895c9512fc97fca745e
Parents: 5a3e57e
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:43:38 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:13:46 2015 +0200

--
 engine/schema/src/com/cloud/service/ServiceOfferingVO.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/380ac0cf/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
--
diff --git a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java 
b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
index 805765b..b93f81a 100644
--- a/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
+++ b/engine/schema/src/com/cloud/service/ServiceOfferingVO.java
@@ -310,8 +310,6 @@ public class ServiceOfferingVO extends DiskOfferingVO 
implements ServiceOffering
 }
 
 public String getDetail(String name) {
-assert (details != null) : "Did you forget to load the details?";
-
 return details != null ? details.get(name) : null;
 }

[2/2] git commit: updated refs/heads/master to ce50600

2015-06-17 Thread dahn

Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in AgentManagerImpl.java 
Assert isn't used in prod runtime

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a333e45
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a333e45
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a333e45

Branch: refs/heads/master
Commit: 4a333e452a4fedd5825ab045b74b04bb0b5bd24a
Parents: acab743
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:45:11 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:14:31 2015 +0200

--
 engine/schema/src/com/cloud/vm/UserVmVO.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a333e45/engine/schema/src/com/cloud/vm/UserVmVO.java
--
diff --git a/engine/schema/src/com/cloud/vm/UserVmVO.java 
b/engine/schema/src/com/cloud/vm/UserVmVO.java
index f6740f8..890c6373 100644
--- a/engine/schema/src/com/cloud/vm/UserVmVO.java
+++ b/engine/schema/src/com/cloud/vm/UserVmVO.java
@@ -106,8 +106,6 @@ public class UserVmVO extends VMInstanceVO implements 
UserVm {
 
 @Override
 public String getDetail(String name) {
-assert (details != null) : "Did you forget to load the details?";
-
 return details != null ? details.get(name) : null;
 }

[1/2] git commit: updated refs/heads/master to 441a132

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master ce506000c -> 441a13252


Re-run travis

Signed-off-by: Daan Hoogland 

This closes #454


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/441a1325
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/441a1325
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/441a1325

Branch: refs/heads/master
Commit: 441a13252a40736946e2b08833690d766b1d01d2
Parents: 9f7c379
Author: Rafael da Fonseca 
Authored: Mon Jun 15 17:32:00 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:15:23 2015 +0200

--
 .../src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/441a1325/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
--
diff --git 
a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java 
b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
index 89308e5..9a5e8c2 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
@@ -87,7 +87,6 @@ public class RpcProviderImpl implements RpcProvider {
 public boolean initialize() {
 if (_transportProvider == null)
 return false;
-
 TransportEndpointSite endpointSite = 
_transportProvider.attach(_transportEndpoint, "RpcProvider");
 endpointSite.registerMultiplexier(RPC_MULTIPLEXIER, this);
 return true;

[2/2] git commit: updated refs/heads/master to 441a132

2015-06-17 Thread dahn

Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in RpcProviderImpl.java 
Assert isn't used in prod runtime

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f7c379a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f7c379a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f7c379a

Branch: refs/heads/master
Commit: 9f7c379a88d0c770c8acdd6eb8391bcff0f9bceb
Parents: ce50600
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:46:35 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:15:23 2015 +0200

--
 .../src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f7c379a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
--
diff --git 
a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java 
b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
index cc0b8f5..89308e5 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcProviderImpl.java
@@ -85,7 +85,6 @@ public class RpcProviderImpl implements RpcProvider {
 
 @Override
 public boolean initialize() {
-assert (_transportProvider != null);
 if (_transportProvider == null)
 return false;

[1/2] git commit: updated refs/heads/master to 85afa63

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 441a13252 -> 85afa63f2


Fix findbugs RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE in 
IpAddressManagerImpl.java Assert isn't used in prod runtime

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b34ad4a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b34ad4a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b34ad4a2

Branch: refs/heads/master
Commit: b34ad4a22cd660bb3e99a9647d873c72b84235d3
Parents: 441a132
Author: Rafael da Fonseca 
Authored: Sun Jun 14 21:50:16 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:18:00 2015 +0200

--
 server/src/com/cloud/network/IpAddressManagerImpl.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b34ad4a2/server/src/com/cloud/network/IpAddressManagerImpl.java
--
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java 
b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 7ca06a2..f73a549 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -580,7 +580,6 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 
 IPAddressVO ip = markIpAsUnavailable(addrId);
 
-assert (ip != null) : "Unable to mark the ip address id=" + addrId + " 
as unavailable.";
 if (ip == null) {
 return true;
 }

[2/2] git commit: updated refs/heads/master to 85afa63

2015-06-17 Thread dahn

Re-run travis

Signed-off-by: Daan Hoogland 

This closes #456


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85afa63f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85afa63f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85afa63f

Branch: refs/heads/master
Commit: 85afa63f24e2058e6c3bb7db1751444f1b2aa7c6
Parents: b34ad4a
Author: Rafael da Fonseca 
Authored: Mon Jun 15 17:30:14 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:18:01 2015 +0200

--
 server/src/com/cloud/network/IpAddressManagerImpl.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85afa63f/server/src/com/cloud/network/IpAddressManagerImpl.java
--
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java 
b/server/src/com/cloud/network/IpAddressManagerImpl.java
index f73a549..552e56b 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -579,7 +579,6 @@ public class IpAddressManagerImpl extends ManagerBase 
implements IpAddressManage
 }
 
 IPAddressVO ip = markIpAsUnavailable(addrId);
-
 if (ip == null) {
 return true;
 }

git commit: updated refs/heads/master to 17ddb4b

2015-06-17 Thread sanjeev

Repository: cloudstack
Updated Branches:
  refs/heads/master 85afa63f2 -> 17ddb4b10


Skip VPC tests on LXC
This closes #470


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17ddb4b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17ddb4b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17ddb4b1

Branch: refs/heads/master
Commit: 17ddb4b1006a872838d299edced596055760fd73
Parents: 85afa63
Author: Sanjeev Neelarapu 
Authored: Wed Jun 17 14:54:59 2015 +0530
Committer: sanjeev 
Committed: Wed Jun 17 15:51:44 2015 +0530

--
 test/integration/testpaths/testpath_vmlc.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17ddb4b1/test/integration/testpaths/testpath_vmlc.py
--
diff --git a/test/integration/testpaths/testpath_vmlc.py 
b/test/integration/testpaths/testpath_vmlc.py
old mode 100644
new mode 100755
index f6c8640..c8b52fa
--- a/test/integration/testpaths/testpath_vmlc.py
+++ b/test/integration/testpaths/testpath_vmlc.py
@@ -307,6 +307,7 @@ class TestPathVMLC(cloudstackTestCase):
 # cleaned up properly, continue if VM deletion fails,
 # because in that case VM is already deleted from the test case
 try:
+
 self.virtual_machine.delete(self.apiclient, expunge=True)
 except Exception:
 self.debug("Exception while destroying VM")
@@ -337,7 +338,7 @@ class TestPathVMLC(cloudstackTestCase):
 # 13. Find suitable host for VM to migrate and migrate the VM
 # 14. Verify VM accessibility on new host
 """
-if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK:
+if self.hypervisor.lower() in ['hyperv', 'lxc']  and value == 
VPC_NETWORK:
 self.skipTest("cann't be run for {} 
hypervisor".format(self.hypervisor))
 
 # List created service offering in setUpClass by name
@@ -737,7 +738,7 @@ class TestPathVMLC(cloudstackTestCase):
 # 4. Try to stop the VM in destroyed state, operation should fail
 # 5. Try to reboot the VM in destroyed state, operation should fail
 """
-if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK:
+if self.hypervisor.lower() in ['hyperv', 'lxc'] and value == 
VPC_NETWORK:
 self.skipTest("cann't be run for {} 
hypervisor".format(self.hypervisor))
 network = CreateNetwork(self, value)
 networkid = network.id
@@ -834,7 +835,7 @@ class TestPathVMLC(cloudstackTestCase):
 # 7. Try to recover the VM in expunging state, operation should fail
 """
 
-if self.hypervisor.lower() == 'hyperv' and value == VPC_NETWORK:
+if self.hypervisor.lower() in ['hyperv', 'lxc'] and value == 
VPC_NETWORK:
 self.skipTest("cann't be run for {} 
hypervisor".format(self.hypervisor))
 network = CreateNetwork(self, value)
 networkid = network.id

git commit: updated refs/heads/master to 6da6c5f

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 17ddb4b10 -> 6da6c5f76


findbugs: log unhandled exception as warning

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6da6c5f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6da6c5f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6da6c5f7

Branch: refs/heads/master
Commit: 6da6c5f76247093e052021f99a0eb0d0ed43a84d
Parents: 17ddb4b
Author: Daan Hoogland 
Authored: Wed Jun 17 12:35:39 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:35:39 2015 +0200

--
 .../vmware/VmwareServerDiscoverer.java  | 35 +++-
 1 file changed, 20 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6da6c5f7/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index ca98c4f..20eb659 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -16,6 +16,25 @@
 // under the License.
 package com.cloud.hypervisor.vmware;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+
+import org.apache.log4j.Logger;
+
+import com.vmware.vim25.ClusterDasConfigInfo;
+import com.vmware.vim25.ManagedObjectReference;
+
+import org.apache.cloudstack.api.ApiConstants;
+
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
 import com.cloud.alert.AlertManager;
@@ -60,21 +79,6 @@ import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
 import com.cloud.utils.UriUtils;
-import com.vmware.vim25.ClusterDasConfigInfo;
-import com.vmware.vim25.ManagedObjectReference;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.log4j.Logger;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-import javax.naming.ConfigurationException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 
 @Local(value = Discoverer.class)
 public class VmwareServerDiscoverer extends DiscovererBase implements 
Discoverer, ResourceStateAdapter {
@@ -420,6 +424,7 @@ public class VmwareServerDiscoverer extends DiscovererBase 
implements Discoverer
 s_logger.debug("Deleting Nexus 1000v VSM " + vsmIp + " 
because cluster discovery and addition to zone has failed.");
 
_nexusElement.deleteCiscoNexusVSM(vsmInfo.second().longValue());
 } catch (Exception e) {
+s_logger.warn("Deleting Nexus 1000v VSM " + vsmIp + " 
failed.");
 }
 }
 }

git commit: updated refs/heads/dhcpoffload to c3304c5

2015-06-17 Thread jayapal

Repository: cloudstack
Updated Branches:
  refs/heads/dhcpoffload b641231ab -> c3304c5d3


CLOUDSTACK-8324: Added migration changes for config drive


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3304c5d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3304c5d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3304c5d

Branch: refs/heads/dhcpoffload
Commit: c3304c5d38759a4f0f304c378886c274662c4815
Parents: b641231
Author: Jayapal 
Authored: Tue Jun 9 16:13:21 2015 +0530
Committer: Jayapal 
Committed: Wed Jun 17 16:06:51 2015 +0530

--
 .../api/AttachOrDettachConfigDriveCommand.java  |  58 +++
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  59 ++-
 .../xenserver/resource/CitrixResourceBase.java  | 102 ++-
 ...rver610MigrateWithStorageCommandWrapper.java |   2 +-
 ...ttachOrDettachConfigDriveCommandWrapper.java |  95 +
 .../xenbase/CitrixMigrateCommandWrapper.java|  22 +++-
 ...CitrixPrepareForMigrationCommandWrapper.java |  11 +-
 .../xenbase/XenServer610WrapperTest.java|   2 +-
 8 files changed, 339 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3304c5d/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
--
diff --git 
a/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java 
b/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
new file mode 100644
index 000..ebf5d0b
--- /dev/null
+++ b/core/src/com/cloud/agent/api/AttachOrDettachConfigDriveCommand.java
@@ -0,0 +1,58 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.agent.api;
+
+import java.util.List;
+
+public class AttachOrDettachConfigDriveCommand extends Command {
+
+String vmName;
+List vmData;
+String configDriveLabel;
+boolean isAttach = false;
+
+public AttachOrDettachConfigDriveCommand(String vmName, List 
vmData, String label, boolean attach) {
+this.vmName = vmName;
+this.vmData = vmData;
+this.configDriveLabel = label;
+this.isAttach = attach;
+}
+
+@Override
+public boolean executeInSequence() {
+return false;
+}
+
+public String getVmName() {
+return vmName;
+}
+
+public List getVmData() {
+return vmData;
+}
+
+public boolean isAttach() {
+return isAttach;
+}
+
+public String getConfigDriveLabel() {
+return configDriveLabel;
+}
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3304c5d/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index ad31fdd..42d1bf3 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -38,6 +38,7 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.agent.api.AttachOrDettachConfigDriveCommand;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
 import org.apache.cloudstack.context.CallContext;
 import 
org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
@@ -273,6 +274,14 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
 protected VGPUTypesDao _vgpuTypesDao;
 @Inject
 protected EntityManager _entityMgr;
+@Inject
+protected GuestOSCategoryDao _guestOSCategoryDao;
+@Inject
+protected GuestOSDao _guestOSDao = null;
+@Inject
+protected UserVmDetailsDao _vmDetailsDao;
+@Inject
+ServiceOfferingDao _serviceOfferingDao = null;
 
 @Inject
 ConfigDepot _configDepot;
@@ -315,6 +324,8 @@ public cla

git commit: updated refs/heads/master to 0952580

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 6da6c5f76 -> 095258009


findbugs: try-with-resource to circumvent not handling an exception on
close

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09525800
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09525800
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09525800

Branch: refs/heads/master
Commit: 095258009685442cfe096a7c029259b0b9ee822c
Parents: 6da6c5f
Author: Daan Hoogland 
Authored: Wed Jun 17 12:41:04 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 12:41:04 2015 +0200

--
 .../vmware/manager/VmwareStorageManagerImpl.java | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09525800/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 0bf8d99..84f7fc0 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -1040,11 +1040,9 @@ public class VmwareStorageManagerImpl implements 
VmwareStorageManager {
 private String createOVAFromMetafile(String metafileName) throws Exception 
{
 File ova_metafile = new File(metafileName);
 Properties props = null;
-FileInputStream strm = null;
 String ovaFileName = "";
 s_logger.info("Creating OVA using MetaFile: " + metafileName);
-try {
-strm = new FileInputStream(ova_metafile);
+try (FileInputStream strm = new FileInputStream(ova_metafile);) {
 
 s_logger.info("loading properties from ova meta file: " + 
metafileName);
 props = new Properties();
@@ -1094,13 +1092,6 @@ public class VmwareStorageManagerImpl implements 
VmwareStorageManager {
 } catch (Exception e) {
 s_logger.error("Exception while creating OVA using Metafile", e);
 throw e;
-} finally {
-if (strm != null) {
-try {
-strm.close();
-} catch (Exception e) {
-}
-}
 }
 
 }

git commit: updated refs/heads/master to 5e96d13

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 095258009 -> 5e96d1394


CLOUDSTACK-8455: Use the correct label to display extractable checkbox

Signed-off-by: Daan Hoogland 

This closes #471


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e96d139
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e96d139
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e96d139

Branch: refs/heads/master
Commit: 5e96d13944696b33dcc0be08233af1ac0976d4f4
Parents: 0952580
Author: Erik Weber 
Authored: Wed Jun 17 12:36:09 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 13:14:54 2015 +0200

--
 ui/scripts/templates.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e96d139/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index a535d8a..98861dd 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -435,7 +435,7 @@
 },
 
 isExtractable: {
-label: "extractable",
+label: "label.extractable",
 docID: 
'helpRegisterTemplateExtractable',
 isBoolean: true
 },
@@ -826,7 +826,7 @@
 },
 
 isExtractable: {
-label: "extractable",
+label: "label.extractable",
 docID: 
'helpRegisterTemplateExtractable',
 isBoolean: true
 },
@@ -1909,7 +1909,7 @@
 },
 
 isExtractable: {
-label: "extractable",
+label: "label.extractable",
 docID: 'helpRegisterISOExtractable',
 isBoolean: true
 },

git commit: updated refs/heads/master to 64361d2

2015-06-17 Thread sanjeev

Repository: cloudstack
Updated Branches:
  refs/heads/master 5e96d1394 -> 64361d2b7


In case of vm deployment failure vm cleanup was not handled properly Corrected 
few script issues
This closes #472


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64361d2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64361d2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64361d2b

Branch: refs/heads/master
Commit: 64361d2b7164b0a91d5de19aa972689d44f0b5ce
Parents: 5e96d13
Author: Sanjeev Neelarapu 
Authored: Wed Jun 17 17:14:12 2015 +0530
Committer: sanjeev 
Committed: Wed Jun 17 17:38:35 2015 +0530

--
 test/integration/testpaths/testpath_vmlc.py | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64361d2b/test/integration/testpaths/testpath_vmlc.py
--
diff --git a/test/integration/testpaths/testpath_vmlc.py 
b/test/integration/testpaths/testpath_vmlc.py
index c8b52fa..f637627 100755
--- a/test/integration/testpaths/testpath_vmlc.py
+++ b/test/integration/testpaths/testpath_vmlc.py
@@ -130,6 +130,7 @@ def CreateNetwork(self, networktype):
  account=self.account.name,
  domainid=self.account.domainid
  )
+self.cleanup.append(vpc)
 self.vpcid = vpc.id
 vpcs = VPC.list(self.apiclient, id=vpc.id)
 self.assertEqual(
@@ -148,7 +149,6 @@ def CreateNetwork(self, networktype):
 gateway="10.1.1.1",
 netmask="255.255.255.0")
 self.cleanup.append(network)
-self.cleanup.append(vpc)
 return network
 
 
@@ -306,12 +306,12 @@ class TestPathVMLC(cloudstackTestCase):
 # Cleanup VM before proceeding the cleanup as networks will be
 # cleaned up properly, continue if VM deletion fails,
 # because in that case VM is already deleted from the test case
+# try:
+# self.virtual_machine.delete(self.apiclient, expunge=True)
+# except Exception:
+# self.debug("Exception while destroying VM")
 try:
-
-self.virtual_machine.delete(self.apiclient, expunge=True)
-except Exception:
-self.debug("Exception while destroying VM")
-try:
+self.cleanup = self.cleanup[::-1]
 cleanup_resources(self.apiclient, self.cleanup)
 except Exception as e:
 raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -382,7 +382,7 @@ class TestPathVMLC(cloudstackTestCase):
 networkids=[network.id, ],
 zoneid=self.zone.id
 )
-
+self.cleanup.append(self.virtual_machine)
 publicip = PublicIPAddress.create(
 self.userapiclient, accountid=self.account.name,
 zoneid=self.zone.id, domainid=self.account.domainid,
@@ -560,6 +560,7 @@ class TestPathVMLC(cloudstackTestCase):
 networkids=[network.id, ],
 zoneid=self.zone.id
 )
+self.cleanup.append(self.virtual_machine)
 return
 
 @attr(tags=["basic"], required_hardware="True")
@@ -639,7 +640,7 @@ class TestPathVMLC(cloudstackTestCase):
 zoneid=self.zone.id,
 securitygroupids=[security_group.id, ]
 )
-
+self.cleanup.append(self.virtual_machine)
 # Check VM accessibility
 try:
 SshClient(host=self.virtual_machine.ssh_ip,
@@ -754,6 +755,7 @@ class TestPathVMLC(cloudstackTestCase):
 networkids=[networkid, ],
 zoneid=self.zone.id
 )
+self.cleanup.append(self.virtual_machine)
 # Stop the VM and try to reboot it, it should fail
 self.virtual_machine.stop(self.userapiclient)
 with self.assertRaises(Exception):
@@ -797,6 +799,7 @@ class TestPathVMLC(cloudstackTestCase):
 serviceofferingid=self.service_offering_1.id,
 zoneid=self.zone.id
 )
+self.cleanup.append(self.virtual_machine)
 # Stop the VM and try to reboot it, it should fail
 self.virtual_machine.stop(self.userapiclient)
 with self.assertRaises(Exception):

[2/3] git commit: updated refs/heads/master to f3afcb0

2015-06-17 Thread dahn

CLOUDSTACK-8537 refactor registerSSHKeyPair() for legibility and testability 
reasons

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/968e71ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/968e71ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/968e71ad

Branch: refs/heads/master
Commit: 968e71ad0e49088b5f2f022df29aec02b10a5ede
Parents: 9f02531
Author: Daan Hoogland 
Authored: Tue Jun 9 23:57:00 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 20:47:57 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  | 111 +--
 1 file changed, 80 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968e71ad/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 8b9f97f..948a84d 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -947,7 +947,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean archiveEvents(ArchiveEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -974,7 +974,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean deleteEvents(DeleteEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -1098,8 +1098,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Ternary, Integer>, List, 
Map> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long 
pageSize) {
-// access check - only root admin can migrate VM
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the VM");
@@ -1276,8 +1275,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Pair, List> 
listStoragePoolsForMigrationOfVolume(Long volumeId) {
-// Access check - only root administrator can migrate volumes.
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the volume");
@@ -1766,7 +1764,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 List permittedAccounts = new ArrayList();
 ListProjectResourcesCriteria listProjectResourcesCriteria = null;
 if (isAllocated) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 Ternary 
domainIdRecursiveListProject = new Ternary(
 cmd.getDomainId(), cmd.isRecursive(), null);
@@ -2259,8 +2257,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 throw new InvalidParameterValueException("ROOT domain can not be 
edited with a new name");
 }
 
-// check permissions
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 _accountMgr.checkAccess(caller, domain);
 
 // domain name is unique under the parent domain
@@ -3311,7 +3308,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public ArrayList getCloudIdentifierResponse(long userId) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 // verify that user exists
 User user = _accountMgr.getUserIncludingRemoved(userId);
@@ -3351,7 +3348,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 public Map listCapabilities(ListCapabilitiesCmd cmd) {
 Map capabilities = new HashMap();
 
-Account caller = CallContext.current().getCallingAc

[1/3] git commit: updated refs/heads/master to f3afcb0

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 64361d2b7 -> f3afcb089


CLOUDSTACK-8537 test for the sake of testing the fix seems so trivial but no 
testing is available for it at all. when bugs arise test extension should be 
the start point here.

Signed-off-by: Daan Hoogland 

This closes #357


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f3afcb08
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f3afcb08
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f3afcb08

Branch: refs/heads/master
Commit: f3afcb089fac54b3269206df1fb938451df3e995
Parents: 968e71a
Author: Daan Hoogland 
Authored: Mon Jun 15 16:11:36 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 20:47:57 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  |  8 +--
 .../cloud/server/ManagementServerImplTest.java  | 67 
 2 files changed, 71 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3afcb08/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 948a84d..85a561f 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -750,7 +750,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 @Inject
 private InstanceGroupDao _vmGroupDao;
 @Inject
-private SSHKeyPairDao _sshKeyPairDao;
+protected SSHKeyPairDao _sshKeyPairDao;
 @Inject
 private LoadBalancerDao _loadbalancerDao;
 @Inject
@@ -3650,7 +3650,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param owner
  * @throws InvalidParameterValueException
  */
-private void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
+protected void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
 SSHKeyPairVO existingPair = 
_sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), 
cmd.getName());
 if (existingPair != null) {
 throw new InvalidParameterValueException("A key pair with name '" 
+ cmd.getName() + "' already exists for this account.");
@@ -3684,7 +3684,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param cmd
  * @return
  */
-private Account getOwner(RegisterSSHKeyPairCmd cmd) {
+protected Account getOwner(RegisterSSHKeyPairCmd cmd) {
 Account caller = getCaller();
 
 Account owner = _accountMgr.finalizeOwner(caller, 
cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
@@ -3694,7 +3694,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 /**
  * @return
  */
-private Account getCaller() {
+protected Account getCaller() {
 Account caller = CallContext.current().getCallingAccount();
 return caller;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3afcb08/server/test/com/cloud/server/ManagementServerImplTest.java
--
diff --git a/server/test/com/cloud/server/ManagementServerImplTest.java 
b/server/test/com/cloud/server/ManagementServerImplTest.java
new file mode 100644
index 000..1e530e6
--- /dev/null
+++ b/server/test/com/cloud/server/ManagementServerImplTest.java
@@ -0,0 +1,67 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
+
+import com.cloud.

[3/3] git commit: updated refs/heads/master to f3afcb0

2015-06-17 Thread dahn

CLOUDSTACK-8537 add check for unique public key and account on ssh keypair 
registration

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9f025312
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9f025312
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9f025312

Branch: refs/heads/master
Commit: 9f025312129a0490f0aaef8567cd1ef36926ad1b
Parents: 64361d2
Author: Daan Hoogland 
Authored: Thu Jun 4 16:48:14 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 20:47:57 2015 +0200

--
 .../src/com/cloud/user/dao/SSHKeyPairDao.java   |  2 ++
 .../com/cloud/user/dao/SSHKeyPairDaoImpl.java   |  9 
 .../com/cloud/server/ManagementServerImpl.java  | 22 +---
 3 files changed, 25 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f025312/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
index 7a4ac40..e035e96 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
@@ -35,4 +35,6 @@ public interface SSHKeyPairDao extends 
GenericDao {
 
 public boolean deleteByName(long accountId, long domainId, String name);
 
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f025312/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
index cfaa993..51e5fbe 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
@@ -73,6 +73,15 @@ public class SSHKeyPairDaoImpl extends 
GenericDaoBase implem
 }
 
 @Override
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey) {
+SearchCriteria sc = createSearchCriteria();
+sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
+sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
+sc.addAnd("publicKey", SearchCriteria.Op.EQ, publicKey);
+return findOneBy(sc);
+}
+
+@Override
 public boolean deleteByName(long accountId, long domainId, String name) {
 SSHKeyPairVO pair = findByName(accountId, domainId, name);
 if (pair == null)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9f025312/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index a187d4e..8b9f97f 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -39,12 +39,9 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.api.command.admin.usage.RemoveRawUsageRecordsCmd;
-import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
-import 
org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd;
-import 
org.apache.cloudstack.api.command.user.volume.GetUploadParamsForVolumeCmd;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
@@ -182,8 +179,8 @@ import 
org.apache.cloudstack.api.command.admin.storage.ListImageStoresCmd;
 import org.apache.cloudstack.api.command.admin.storage.ListS3sCmd;
 import 
org.apache.cloudstack.api.command.admin.storage.ListSecondaryStagingStoresCmd;
 import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd;
-import org.apache.cloudstack.api.command.admin.storage.ListStorageTagsCmd;
 import org.apache.cloudstack.api.command.admin.storage.ListStorageProvidersCmd;
+import org.apache.cloudstack.api.command.admin.storage.ListStorageTagsCmd;
 import 
org.apache.cloudstack.api.command.admin.storage.PreparePrimaryStorageForMaintenanceCmd;
 import 
org.apache.cloudstack.api.command.admin.storage.UpdateCloudToUseObjectStoreCmd;
 import org.apache.cloudstack.api.command.admin.storage.UpdateStoragePoolCmd;
@@ -213,6 +210,7 @@ import 
org.apache.cloudstack.api.command.admin.u

[1/4] git commit: updated refs/heads/4.4 to f0cc5c5

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 e6f81dbbb -> f0cc5c510


CLOUDSTACK-8545 make reboot on out of band migration configurable


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9ced5755
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9ced5755
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9ced5755

Branch: refs/heads/4.4
Commit: 9ced57551de5e1d62f2f7eb286440931bb6de262
Parents: e6f81db
Author: Daan Hoogland 
Authored: Tue Jun 16 17:12:43 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 09:46:46 2015 +0200

--
 .../router/VirtualNetworkApplianceManager.java  |  9 +++-
 .../VirtualNetworkApplianceManagerImpl.java | 50 ++--
 2 files changed, 33 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ced5755/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
index 5cff679..ac3406d 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -52,6 +52,7 @@ public interface VirtualNetworkApplianceManager extends 
Manager, VirtualNetworkA
 static final String RouterTemplateLxcCK = "router.template.lxc";
 static final String SetServiceMonitorCK = 
"network.router.EnableServiceMonitoring";
 static final String RouterAlertsCheckIntervalCK = 
"router.alerts.check.interval";
+static final String RouterReprovisionOnOutOfBandMigrationCK = 
"router.reboot.when.outofband.migrated";
 
 static final ConfigKey RouterTemplateXen = new 
ConfigKey(String.class, RouterTemplateXenCK, "Advanced", "SystemVM 
Template (XenServer)",
 "Name of the default router template on Xenserver.", true, 
ConfigKey.Scope.Zone, null);
@@ -63,12 +64,16 @@ public interface VirtualNetworkApplianceManager extends 
Manager, VirtualNetworkA
 "Name of the default router template on Hyperv.", true, 
ConfigKey.Scope.Zone, null);
 static final ConfigKey RouterTemplateLxc = new 
ConfigKey(String.class, RouterTemplateLxcCK, "Advanced", "SystemVM 
Template (LXC)",
 "Name of the default router template on LXC.", true, 
ConfigKey.Scope.Zone, null);
-
 static final ConfigKey SetServiceMonitor = new 
ConfigKey(String.class, SetServiceMonitorCK, "Advanced", "true",
 "service monitoring in router enable/disable option, default 
true", true, ConfigKey.Scope.Zone, null);
-
 static final ConfigKey RouterAlertsCheckInterval = new 
ConfigKey(Integer.class, RouterAlertsCheckIntervalCK, "Advanced", 
"1800",
 "Interval (in seconds) to check for alerts in Virtual Router.", 
false, ConfigKey.Scope.Global, null);
+static final ConfigKey routerVersionCheckEnabled = new 
ConfigKey("Advanced", Boolean.class, "router.version.check", "true",
+"If true, router minimum required version is checked before 
sending command", false);
+static final ConfigKey UseExternalDnsServers = new 
ConfigKey(Boolean.class, "use.external.dns", "Advanced", "false",
+"Bypass internal dns, use external dns1 and dns2", true, 
ConfigKey.Scope.Zone, null);
+static final ConfigKey RouterReprovisionOnOutOfBandMigration = 
new ConfigKey(Boolean.class, RouterReprovisionOnOutOfBandMigrationCK, 
"Advanced", "false",
+"Reboot routers when they are migrated out of band in order to 
reprovision", true, ConfigKey.Scope.Zone, null);
 
 public static final int DEFAULT_ROUTER_VM_RAMSIZE = 256; // 
256M
 public static final int DEFAULT_ROUTER_CPU_MHZ = 500;// 
500 MHz

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ced5755/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 59bd4c6..4400a62 100755
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -673,13 +673,6 @@ public class VirtualNetworkApplianceManagerImpl extends 
ManagerBase implements V
 }
 }
 
-static final ConfigKey UseExternalDnsServers = new 
ConfigKey(Boolean.class, "use.external.dns", "Advanced", "false",
-"Bypass internal dns, use external dns1 and dns2", true, 
ConfigKey.Scope.Zone, null);
-
-sta

[3/4] git commit: updated refs/heads/4.4 to f0cc5c5

2015-06-17 Thread dahn

CLOUDSTACK-8537 test for the sake of testing the fix seems so trivial but no 
testing is available for it at all. when bugs arise test extension should be 
the start point here.

Signed-off-by: Daan Hoogland 

This closes #357


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0cc5c51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0cc5c51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0cc5c51

Branch: refs/heads/4.4
Commit: f0cc5c510ccaf83241b9a2ef750aad00ee355f10
Parents: c821131
Author: Daan Hoogland 
Authored: Mon Jun 15 16:11:36 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 21:14:27 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  |  8 +--
 .../cloud/server/ManagementServerImplTest.java  | 67 
 2 files changed, 71 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0cc5c51/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 050381a..05b089a 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -743,7 +743,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 @Inject
 private InstanceGroupDao _vmGroupDao;
 @Inject
-private SSHKeyPairDao _sshKeyPairDao;
+protected SSHKeyPairDao _sshKeyPairDao;
 @Inject
 private LoadBalancerDao _loadbalancerDao;
 @Inject
@@ -3623,7 +3623,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param owner
  * @throws InvalidParameterValueException
  */
-private void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
+protected void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
 SSHKeyPairVO existingPair = 
_sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), 
cmd.getName());
 if (existingPair != null) {
 throw new InvalidParameterValueException("A key pair with name '" 
+ cmd.getName() + "' already exists for this account.");
@@ -3657,7 +3657,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param cmd
  * @return
  */
-private Account getOwner(RegisterSSHKeyPairCmd cmd) {
+protected Account getOwner(RegisterSSHKeyPairCmd cmd) {
 Account caller = getCaller();
 
 Account owner = _accountMgr.finalizeOwner(caller, 
cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
@@ -3667,7 +3667,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 /**
  * @return
  */
-private Account getCaller() {
+protected Account getCaller() {
 Account caller = CallContext.current().getCallingAccount();
 return caller;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0cc5c51/server/test/com/cloud/server/ManagementServerImplTest.java
--
diff --git a/server/test/com/cloud/server/ManagementServerImplTest.java 
b/server/test/com/cloud/server/ManagementServerImplTest.java
new file mode 100644
index 000..1e530e6
--- /dev/null
+++ b/server/test/com/cloud/server/ManagementServerImplTest.java
@@ -0,0 +1,67 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.user.Account;
+import com.clo

[2/4] git commit: updated refs/heads/4.4 to f0cc5c5

2015-06-17 Thread dahn

CLOUDSTACK-8537 add check for unique public key and account on ssh keypair 
registration

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f294d319
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f294d319
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f294d319

Branch: refs/heads/4.4
Commit: f294d319c606d27935487a8222f3b24bdfb637ee
Parents: 9ced575
Author: Daan Hoogland 
Authored: Thu Jun 4 16:48:14 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 21:14:27 2015 +0200

--
 .../src/com/cloud/user/dao/SSHKeyPairDao.java |  2 ++
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java |  9 +
 .../com/cloud/server/ManagementServerImpl.java| 18 +++---
 3 files changed, 22 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f294d319/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
index 7a4ac40..e035e96 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
@@ -35,4 +35,6 @@ public interface SSHKeyPairDao extends 
GenericDao {
 
 public boolean deleteByName(long accountId, long domainId, String name);
 
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f294d319/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
index cfaa993..51e5fbe 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
@@ -73,6 +73,15 @@ public class SSHKeyPairDaoImpl extends 
GenericDaoBase implem
 }
 
 @Override
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey) {
+SearchCriteria sc = createSearchCriteria();
+sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
+sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
+sc.addAnd("publicKey", SearchCriteria.Op.EQ, publicKey);
+return findOneBy(sc);
+}
+
+@Override
 public boolean deleteByName(long accountId, long domainId, String name) {
 SSHKeyPairVO pair = findByName(accountId, domainId, name);
 if (pair == null)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f294d319/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 07ea4b4..74319a3 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -37,10 +37,6 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
@@ -407,6 +403,7 @@ import 
org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd
 import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
 import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
 import org.apache.cloudstack.api.command.user.snapshot.RevertSnapshotCmd;
+import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
 import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
@@ -510,6 +507,8 @@ import 
org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.GetVncPortAnswer;
@@ -3595,9 +3594,14 @@ public class ManagementServerImpl ext

[4/4] git commit: updated refs/heads/4.4 to f0cc5c5

2015-06-17 Thread dahn

CLOUDSTACK-8537 refactor registerSSHKeyPair() for legibility and testability 
reasons

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8211312
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8211312
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8211312

Branch: refs/heads/4.4
Commit: c8211312ab4041b1300d35926f5efa35ad765f9d
Parents: f294d31
Author: Daan Hoogland 
Authored: Tue Jun 9 23:57:00 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 21:14:27 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  | 110 ++-
 1 file changed, 83 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8211312/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 74319a3..050381a 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.server;
 
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -938,7 +940,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean archiveEvents(ArchiveEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -965,7 +967,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean deleteEvents(DeleteEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -1089,8 +1091,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Ternary, Integer>, List, 
Map> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long 
pageSize) {
-// access check - only root admin can migrate VM
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the VM");
@@ -1263,8 +1264,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Pair, List> 
listStoragePoolsForMigrationOfVolume(Long volumeId) {
-// Access check - only root administrator can migrate volumes.
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the volume");
@@ -1746,7 +1746,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 List permittedAccounts = new ArrayList();
 ListProjectResourcesCriteria listProjectResourcesCriteria = null;
 if (isAllocated) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 Ternary 
domainIdRecursiveListProject = new Ternary(
 cmd.getDomainId(), cmd.isRecursive(), null);
@@ -2234,8 +2234,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 throw new InvalidParameterValueException("ROOT domain can not be 
edited with a new name");
 }
 
-// check permissions
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 _accountMgr.checkAccess(caller, domain);
 
 // domain name is unique under the parent domain
@@ -3282,7 +3281,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public ArrayList getCloudIdentifierResponse(long userId) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 // verify that user exists
 User user = _accountMgr.getUserIncludingRemoved(userId);
@@ -3322,7

[1/3] git commit: updated refs/heads/4.5 to 4d096ea

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 ad1fbc1b7 -> 4d096ea0e


CLOUDSTACK-8537 add check for unique public key and account on ssh keypair 
registration

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/570d1626
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/570d1626
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/570d1626

Branch: refs/heads/4.5
Commit: 570d162692b74cfcfc81db548cd73ae8f0ac6f5f
Parents: ad1fbc1
Author: Daan Hoogland 
Authored: Thu Jun 4 16:48:14 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:19:23 2015 +0200

--
 .../src/com/cloud/user/dao/SSHKeyPairDao.java  |  2 ++
 .../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java  |  9 +
 .../src/com/cloud/server/ManagementServerImpl.java | 17 +++--
 3 files changed, 22 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/570d1626/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
index 7a4ac40..e035e96 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDao.java
@@ -35,4 +35,6 @@ public interface SSHKeyPairDao extends 
GenericDao {
 
 public boolean deleteByName(long accountId, long domainId, String name);
 
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/570d1626/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java 
b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
index cfaa993..51e5fbe 100644
--- a/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
+++ b/engine/schema/src/com/cloud/user/dao/SSHKeyPairDaoImpl.java
@@ -73,6 +73,15 @@ public class SSHKeyPairDaoImpl extends 
GenericDaoBase implem
 }
 
 @Override
+public SSHKeyPairVO findByPublicKey(long accountId, long domainId, String 
publicKey) {
+SearchCriteria sc = createSearchCriteria();
+sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId);
+sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId);
+sc.addAnd("publicKey", SearchCriteria.Op.EQ, publicKey);
+return findOneBy(sc);
+}
+
+@Override
 public boolean deleteByName(long accountId, long domainId, String name) {
 SSHKeyPairVO pair = findByName(accountId, domainId, name);
 if (pair == null)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/570d1626/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 33fb778..e9f2e0b 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -37,9 +37,6 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
 import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
@@ -408,6 +405,7 @@ import 
org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd
 import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
 import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
 import org.apache.cloudstack.api.command.user.snapshot.RevertSnapshotCmd;
+import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
 import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd;
 import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd;
@@ -511,6 +509,8 @@ import 
org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.utils.identity.ManagementServerNode;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
 
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.

[2/3] git commit: updated refs/heads/4.5 to 4d096ea

2015-06-17 Thread dahn

CLOUDSTACK-8537 refactor registerSSHKeyPair() for legibility and testability 
reasons

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e3c6e82
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e3c6e82
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e3c6e82

Branch: refs/heads/4.5
Commit: 6e3c6e82990cafdab8453ed56530dc619ba70338
Parents: 570d162
Author: Daan Hoogland 
Authored: Tue Jun 9 23:57:00 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:19:53 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  | 110 ++-
 1 file changed, 83 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e3c6e82/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index e9f2e0b..08fd9e9 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -16,7 +16,9 @@
 // under the License.
 package com.cloud.server;
 
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -940,7 +942,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean archiveEvents(ArchiveEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -967,7 +969,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public boolean deleteEvents(DeleteEventsCmd cmd) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 List ids = cmd.getIds();
 boolean result = true;
 List permittedAccountIds = new ArrayList();
@@ -1091,8 +1093,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Ternary, Integer>, List, 
Map> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long 
pageSize) {
-// access check - only root admin can migrate VM
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the VM");
@@ -1269,8 +1270,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public Pair, List> 
listStoragePoolsForMigrationOfVolume(Long volumeId) {
-// Access check - only root administrator can migrate volumes.
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 if (!_accountMgr.isRootAdmin(caller.getId())) {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Caller is not a root admin, permission denied 
to migrate the volume");
@@ -1762,7 +1762,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 List permittedAccounts = new ArrayList();
 ListProjectResourcesCriteria listProjectResourcesCriteria = null;
 if (isAllocated) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 Ternary 
domainIdRecursiveListProject = new Ternary(
 cmd.getDomainId(), cmd.isRecursive(), null);
@@ -2255,8 +2255,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 throw new InvalidParameterValueException("ROOT domain can not be 
edited with a new name");
 }
 
-// check permissions
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 _accountMgr.checkAccess(caller, domain);
 
 // domain name is unique under the parent domain
@@ -3304,7 +3303,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 
 @Override
 public ArrayList getCloudIdentifierResponse(long userId) {
-Account caller = CallContext.current().getCallingAccount();
+Account caller = getCaller();
 
 // verify that user exists
 User user = _accountMgr.getUserIncludingRemoved(userId);
@@ -3344,7

[3/3] git commit: updated refs/heads/4.5 to 4d096ea

2015-06-17 Thread dahn

CLOUDSTACK-8537 test for the sake of testing the fix seems so trivial but no 
testing is available for it at all. when bugs arise test extension should be 
the start point here.

Signed-off-by: Daan Hoogland 

This closes #357


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d096ea0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d096ea0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d096ea0

Branch: refs/heads/4.5
Commit: 4d096ea0e10906138747fb2643a8fa84b5f11fd1
Parents: 6e3c6e8
Author: Daan Hoogland 
Authored: Mon Jun 15 16:11:36 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:20:13 2015 +0200

--
 .../com/cloud/server/ManagementServerImpl.java  |  8 +--
 .../cloud/server/ManagementServerImplTest.java  | 67 
 2 files changed, 71 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d096ea0/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java 
b/server/src/com/cloud/server/ManagementServerImpl.java
index 08fd9e9..5946b29 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -745,7 +745,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 @Inject
 private InstanceGroupDao _vmGroupDao;
 @Inject
-private SSHKeyPairDao _sshKeyPairDao;
+protected SSHKeyPairDao _sshKeyPairDao;
 @Inject
 private LoadBalancerDao _loadbalancerDao;
 @Inject
@@ -3645,7 +3645,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param owner
  * @throws InvalidParameterValueException
  */
-private void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
+protected void checkForKeyByName(RegisterSSHKeyPairCmd cmd, Account owner) 
throws InvalidParameterValueException {
 SSHKeyPairVO existingPair = 
_sshKeyPairDao.findByName(owner.getAccountId(), owner.getDomainId(), 
cmd.getName());
 if (existingPair != null) {
 throw new InvalidParameterValueException("A key pair with name '" 
+ cmd.getName() + "' already exists for this account.");
@@ -3679,7 +3679,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
  * @param cmd
  * @return
  */
-private Account getOwner(RegisterSSHKeyPairCmd cmd) {
+protected Account getOwner(RegisterSSHKeyPairCmd cmd) {
 Account caller = getCaller();
 
 Account owner = _accountMgr.finalizeOwner(caller, 
cmd.getAccountName(), cmd.getDomainId(), cmd.getProjectId());
@@ -3689,7 +3689,7 @@ public class ManagementServerImpl extends ManagerBase 
implements ManagementServe
 /**
  * @return
  */
-private Account getCaller() {
+protected Account getCaller() {
 Account caller = CallContext.current().getCallingAccount();
 return caller;
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d096ea0/server/test/com/cloud/server/ManagementServerImplTest.java
--
diff --git a/server/test/com/cloud/server/ManagementServerImplTest.java 
b/server/test/com/cloud/server/ManagementServerImplTest.java
new file mode 100644
index 000..1e530e6
--- /dev/null
+++ b/server/test/com/cloud/server/ManagementServerImplTest.java
@@ -0,0 +1,67 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.server;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd;
+
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.user.Account;
+import com.clo

git commit: updated refs/heads/4.5 to 88fb843

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 4d096ea0e -> 88fb8431f


CLOUDSTACK-8545 make reboot on out of band migration configurable


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/88fb8431
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/88fb8431
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/88fb8431

Branch: refs/heads/4.5
Commit: 88fb8431f235b92f7de291413a6880a7ea08de1b
Parents: 4d096ea
Author: Daan Hoogland 
Authored: Tue Jun 16 17:12:43 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:31:44 2015 +0200

--
 .../router/VirtualNetworkApplianceManager.java  |  9 +++-
 .../VirtualNetworkApplianceManagerImpl.java | 56 +---
 2 files changed, 32 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88fb8431/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
index 443402e..4022b56 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
@@ -53,6 +53,7 @@ public interface VirtualNetworkApplianceManager extends 
Manager, VirtualNetworkA
 static final String RouterTemplateLxcCK = "router.template.lxc";
 static final String SetServiceMonitorCK = 
"network.router.EnableServiceMonitoring";
 static final String RouterAlertsCheckIntervalCK = 
"router.alerts.check.interval";
+static final String RouterReprovisionOnOutOfBandMigrationCK = 
"router.reboot.when.outofband.migrated";
 
 static final ConfigKey RouterTemplateXen = new 
ConfigKey(String.class, RouterTemplateXenCK, "Advanced", "SystemVM 
Template (XenServer)",
 "Name of the default router template on Xenserver.", true, 
ConfigKey.Scope.Zone, null);
@@ -64,12 +65,16 @@ public interface VirtualNetworkApplianceManager extends 
Manager, VirtualNetworkA
 "Name of the default router template on Hyperv.", true, 
ConfigKey.Scope.Zone, null);
 static final ConfigKey RouterTemplateLxc = new 
ConfigKey(String.class, RouterTemplateLxcCK, "Advanced", "SystemVM 
Template (LXC)",
 "Name of the default router template on LXC.", true, 
ConfigKey.Scope.Zone, null);
-
 static final ConfigKey SetServiceMonitor = new 
ConfigKey(String.class, SetServiceMonitorCK, "Advanced", "true",
 "service monitoring in router enable/disable option, default 
true", true, ConfigKey.Scope.Zone, null);
-
 static final ConfigKey RouterAlertsCheckInterval = new 
ConfigKey(Integer.class, RouterAlertsCheckIntervalCK, "Advanced", 
"1800",
 "Interval (in seconds) to check for alerts in Virtual Router.", 
false, ConfigKey.Scope.Global, null);
+static final ConfigKey routerVersionCheckEnabled = new 
ConfigKey("Advanced", Boolean.class, "router.version.check", "true",
+"If true, router minimum required version is checked before 
sending command", false);
+static final ConfigKey UseExternalDnsServers = new 
ConfigKey(Boolean.class, "use.external.dns", "Advanced", "false",
+"Bypass internal dns, use external dns1 and dns2", true, 
ConfigKey.Scope.Zone, null);
+static final ConfigKey RouterReprovisionOnOutOfBandMigration = 
new ConfigKey(Boolean.class, RouterReprovisionOnOutOfBandMigrationCK, 
"Advanced", "false",
+"Reboot routers when they are migrated out of band in order to 
reprovision", true, ConfigKey.Scope.Zone, null);
 
 public static final int DEFAULT_ROUTER_VM_RAMSIZE = 256;// 256M
 public static final int DEFAULT_ROUTER_CPU_MHZ = 500;// 
500 MHz

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88fb8431/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 46463cd..698f94d 100755
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -676,13 +676,6 @@ VirtualMachineGuru, Listener, Configurable, 
StateListener UseExternalDnsServers = new 
ConfigKey(Boolean.class, "use.external.dns", "Advanced", "false",
-"Bypass internal dns, use external dns1 and dns2", true, 
ConfigKey.Scope.Zone, null);
-
-static final ConfigKey routerVersionCheckEnabled = new 
ConfigKey("Advanced"

git commit: updated refs/heads/master to 1407033

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master f3afcb089 -> 1407033cc


Fix findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warning 
in UserVmDaoImpl.java detail field was vulnerable

Signed-off-by: Daan Hoogland 

This closes #473


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1407033c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1407033c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1407033c

Branch: refs/heads/master
Commit: 1407033cc2e0742653d82bb0181c041b31253693
Parents: f3afcb0
Author: Rafael da Fonseca 
Authored: Wed Jun 17 20:08:06 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:38:19 2015 +0200

--
 engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1407033c/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java 
b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
index 5fa3b06..14870e7 100644
--- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
+++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
@@ -105,9 +105,7 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use
 + "left join networks on nics.network_id=networks.id " + "left 
join user_ip_address on user_ip_address.vm_id=vm_instance.id " + "where 
vm_instance.id in (";
 
 private static final String VMS_DETAIL_BY_NAME = "select 
vm_instance.instance_name, vm_instance.vm_type, vm_instance.id , 
user_vm_details.value, user_vm_details.name from vm_instance "
-+ "left join user_vm_details on vm_instance.id = 
user_vm_details.vm_id where (user_vm_details.name is null or 
user_vm_details.name = '";
-
-private static final String VMS_DETAIL_BY_NAME2 = "') and 
vm_instance.instance_name in (";
++ "left join user_vm_details on vm_instance.id = 
user_vm_details.vm_id where (user_vm_details.name is null or 
user_vm_details.name = ? ) and vm_instance.instance_name in (";
 
 private static final int VM_DETAILS_BATCH_SIZE = 100;
 
@@ -645,8 +643,9 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use
 
 PreparedStatement pstmt = null;
 try {
-pstmt = txn.prepareStatement(VMS_DETAIL_BY_NAME + detail + 
VMS_DETAIL_BY_NAME2 + getQueryBatchAppender(vmNames.size()));
-int i = 1;
+pstmt = txn.prepareStatement(VMS_DETAIL_BY_NAME + 
getQueryBatchAppender(vmNames.size()));
+pstmt.setString(1, detail);
+int i = 2;
 for(String name : vmNames) {
 pstmt.setString(i, name);
 i++;

git commit: updated refs/heads/master to b84093f

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/master 1407033cc -> b84093f69


Fix findbugs SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING warning 
in PrimaryDataStoreDaoImpl.java

Remove trailing spaces that checkstyle complained about

Signed-off-by: Daan Hoogland 

This closes #474


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b84093f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b84093f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b84093f6

Branch: refs/heads/master
Commit: b84093f691ae0b09d2c525d50f2e2d200c709b2c
Parents: 1407033
Author: Rafael da Fonseca 
Authored: Wed Jun 17 20:25:00 2015 +0200
Committer: Daan Hoogland 
Committed: Wed Jun 17 22:46:58 2015 +0200

--
 .../datastore/db/PrimaryDataStoreDaoImpl.java| 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b84093f6/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
--
diff --git 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
index faf5291..d3c29f7 100644
--- 
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
+++ 
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
@@ -392,20 +392,21 @@ public class PrimaryDataStoreDaoImpl extends 
GenericDaoBase
 
 StringBuilder sql = new StringBuilder(ZoneWideDetailsSqlPrefix);
 
-for (Map.Entry detail : details.entrySet()) {
-sql.append("((storage_pool_details.name='")
-.append(detail.getKey())
-.append("') AND (storage_pool_details.value='")
-.append(detail.getValue())
-.append("')) OR ");
+for (int i=0;i detail : details.entrySet()) {
+pstmt.setString(++i,detail.getKey());
+pstmt.setString(++i,detail.getValue());
+}
 List pools = new ArrayList();
 if (pstmt != null) {
-int i = 1;
+i = 1;
 pstmt.setLong(i++, dcId);
 pstmt.setString(i++, ScopeType.ZONE.toString());
 pstmt.setInt(i++, details.size());

Jenkins build is back to normal : cloudstack-marvin #1856

2015-06-17 Thread Apache Jenkins Server

See

git commit: updated refs/heads/4.5 to 85e2d96

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 88fb8431f -> 85e2d9611


CLOUDSTACK-8545 alert when out of band migration is detected and not
acted upon

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/85e2d961
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/85e2d961
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/85e2d961

Branch: refs/heads/4.5
Commit: 85e2d9611f90d00e0d61b2cfd6a1779d400eb60b
Parents: 88fb843
Author: Daan Hoogland 
Authored: Thu Jun 18 08:04:50 2015 +0200
Committer: Daan Hoogland 
Committed: Thu Jun 18 08:04:50 2015 +0200

--
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/85e2d961/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 698f94d..e0d1edb 100755
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4480,7 +4480,15 @@ VirtualMachineGuru, Listener, Configurable, 
StateListener

git commit: updated refs/heads/4.4 to ef35ae7

2015-06-17 Thread dahn

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 f0cc5c510 -> ef35ae727


CLOUDSTACK-8545 alert when out of band migration is detected and not
acted upon

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef35ae72
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef35ae72
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef35ae72

Branch: refs/heads/4.4
Commit: ef35ae727d8298d2cea7890c60c2b47d376a9ea2
Parents: f0cc5c5
Author: Daan Hoogland 
Authored: Thu Jun 18 08:04:50 2015 +0200
Committer: Daan Hoogland 
Committed: Thu Jun 18 08:06:44 2015 +0200

--
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef35ae72/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 4400a62..fce1ad4 100755
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4406,7 +4406,15 @@ public class VirtualNetworkApplianceManagerImpl extends 
ManagerBase implements V
 (newState == State.Running)) {
 s_logger.info("Schedule a router reboot task as router " + 
vo.getId() + " is powered-on out-of-band. we need to reboot to refresh network 
rules");
 _executor.schedule(new RebootTask(vo.getId()), 1000, 
TimeUnit.MICROSECONDS);
+} else {
+if (isOutOfBandMigrated(opaque)) {
+final String title = "Router has been migrated out of band: " 
+ vo.getInstanceName();
+final String context =
+"An out of band migration of router " + 
vo.getInstanceName() + "(" + vo.getUuid() + ") was detected. No automated 
action was performed.";
+
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_DOMAIN_ROUTER, 
vo.getDataCenterId(), vo.getPodIdToDeployIn(), title, context);
+}
 }
+
 return true;
 }

53 matches

Mail list logo