In MacAddress class, we start by settig macAddress String as null and go through
the output of ifconfig -a and pick the one string that is a valid mac address
but is not 0x00 and 0xff. With each loop we set the macAddress to null so that
it does not pick the last one if everything fails.
Tested on Ubuntu where I had an interface called cloud0 whose mac id was 0x00
and it was skipped to get the next one:
$ java -classpath <path-to-cloud-utils.jar> com.cloud.utils.net.MacAddress
addr in integer is 5071953436
addr in bytes is 0 1 2e 4f de 1c
addr in char is 00:01:2e:4f:de:1c
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 3b5aa42c6d)
In the "SSL Certificate" dialog we added:
- new field for the root certificate;
- a button to add intermediate certificates if necessary; when this is pressed, a new field, called "Intermediate certificate 1" is added; pressed again, "Intermediate certificate 2" field is added, and so on.
We upload the certificates in order: first the root certificate (with id=1), then the intermediate certificates (with id=2,3,..) and finally the server certificate.
When uploading a certificate, we wait for the upload to be completed successfully and only then we proceed to uploading the next one. If one fails, we report failure and don't continue with the remaining.
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
A JAVA_HOME finder method was implemented by Rajani and got into master and 4.3
but not 4.4: https://reviews.apache.org/r/22721/
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Since we've agreed to use JDK/JRE 1.7, this enforces that for Ubuntu builds
- this fix remove usage of 1.6 paths in JDK_DIR for cloud-{agent, management, usage}.
- adds oracle jdk 1.7 path (in case a user is using that)
- adds mysql-connector-java path to CLASSPATH for usage server
- adds libmysql-java pkg dependency (tested and available for precise and trusty)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
By default the getUser API picks apikey arg from HTTP request to return the
User object with that api key. We use apikey in the request, so it would return
the same user calling the API. This commit uses the USER_API_KEY in the API
annotation instead.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit modifies insert statements to use the insert on duplicate update
syntax to update configuration table name, values in case primary key already
exists
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit adds three commonly used config that developers usually set
after fresh deployment. The account cleanup timeout is set to 60s to speed up
BVT runs.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
store requires storage migration resulting in failure of VM migration. This also
improves the hostsformigration api. Firstly we were trying to list all hosts and
then finding suitable storage pools for all volumes and then we were checking
whether vm migration requires storage migration to that host. Now the process is
updated. We are checking for only those volumes which are not in zone wide primary
store. We are verifying by comparing volumes->poolid->clusterid to host clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.
(cherry picked from commit 64153a4371)
2. Add ctxDetails in the ParamGenericValidationWorker to avoid warning for api validation
3. Add some missing events.
4. Correcting mapping for ResourceObjectType.NetworkACL and ResourceObjectType.NetworkACLItem
(cherry picked from commit 8a9092c3cd)
Wei Zhou
Stephen Hoogendijk
Joris van Lieshout
Brenn Oosterbaan
Rohit Yadav
Luis Henrique Okama
Hugo Trippaers
Jessica Wang
Daan Hoogland
Murali Reddy
Erik Weber
amoghvk
Anshul Gangwar
Kishan Kavala
Wido den Hollander
Jayapal
Nitin Mehta
Ian Duffy
Ian Duffy
Alex Brett