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

[da...@apache.org]

Merge pull request #1209 from ustcweizhou/free-deviceid

CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count
when we restart vpc tiers, the old nics will be removed, and create a new nic.
however, the device_id was set to the nic count, which may be already used.
this commit get the first device_id not in use as the device_id of new nic.

This issue also happen when we add multiple networks to a vm and remove them.

* pr/1209:
  CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count

Signed-off-by: Daan Hoogland <da...@onecht.net>


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

Branch: refs/heads/master
Commit: 5774b965f35fcfea645c25a9cc0be9f3e603dfa1
Parents: d7b7171 acfc19d
Author: Daan Hoogland <da...@onecht.net>
Authored: Sun Dec 13 18:43:29 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sun Dec 13 18:43:30 2015 +0100

----------------------------------------------------------------------
 .../orchestration/NetworkOrchestrator.java      |  2 +-
 engine/schema/src/com/cloud/vm/dao/NicDao.java  |  2 +-
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 31 +++++++++++++-------
 3 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------